From 56de805f549603d66af06bb999f3d706d66f5a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 22 Oct 2020 16:54:50 +0200 Subject: [PATCH 001/876] initial commit - from neko open source repository.. --- .editorconfig | 9 + .env.development | 2 + .vscode/launch.json | 16 + .vscode/settings.json | 22 ++ README.md | 3 + build | 10 + cmd/neko/main.go | 18 + cmd/root.go | 127 +++++++ cmd/serve.go | 41 +++ go.mod | 35 ++ go.sum | 470 +++++++++++++++++++++++++ internal/broadcast/manager.go | 83 +++++ internal/gst/gst.c | 95 +++++ internal/gst/gst.go | 277 +++++++++++++++ internal/gst/gst.h | 19 + internal/http/endpoint/endpoint.go | 102 ++++++ internal/http/endpoint/error.go | 17 + internal/http/http.go | 87 +++++ internal/http/middleware/logger.go | 80 +++++ internal/http/middleware/middleware.go | 12 + internal/http/middleware/recover.go | 24 ++ internal/http/middleware/request.go | 89 +++++ internal/http/response/response.go | 32 ++ internal/remote/manager.go | 235 +++++++++++++ internal/session/manager.go | 189 ++++++++++ internal/session/session.go | 137 +++++++ internal/types/broadcast.go | 10 + internal/types/config/broadcast.go | 23 ++ internal/types/config/config.go | 8 + internal/types/config/remote.go | 136 +++++++ internal/types/config/root.go | 37 ++ internal/types/config/server.go | 44 +++ internal/types/config/webrtc.go | 79 +++++ internal/types/config/websocket.go | 37 ++ internal/types/event/events.go | 55 +++ internal/types/keys.go | 14 + internal/types/message/messages.go | 123 +++++++ internal/types/remote.go | 27 ++ internal/types/session.go | 48 +++ internal/types/webrtc.go | 18 + internal/types/webscoket.go | 15 + internal/types/xorg.go | 13 + internal/utils/array.go | 24 ++ internal/utils/color.go | 34 ++ internal/utils/ip.go | 35 ++ internal/utils/json.go | 10 + internal/utils/uid.go | 98 ++++++ internal/webrtc/handle.go | 137 +++++++ internal/webrtc/logger.go | 66 ++++ internal/webrtc/peer.go | 38 ++ internal/webrtc/webrtc.go | 201 +++++++++++ internal/websocket/admin.go | 298 ++++++++++++++++ internal/websocket/broadcast.go | 56 +++ internal/websocket/chat.go | 41 +++ internal/websocket/control.go | 163 +++++++++ internal/websocket/handler.go | 179 ++++++++++ internal/websocket/screen.go | 66 ++++ internal/websocket/session.go | 93 +++++ internal/websocket/signal.go | 38 ++ internal/websocket/socket.go | 55 +++ internal/websocket/websocket.go | 268 ++++++++++++++ internal/xorg/xorg.c | 195 ++++++++++ internal/xorg/xorg.go | 247 +++++++++++++ internal/xorg/xorg.h | 46 +++ neko.code-workspace | 8 + neko.go | 184 ++++++++++ 66 files changed, 5498 insertions(+) create mode 100644 .editorconfig create mode 100644 .env.development create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 README.md create mode 100644 build create mode 100644 cmd/neko/main.go create mode 100644 cmd/root.go create mode 100644 cmd/serve.go create mode 100644 go.mod create mode 100644 go.sum create mode 100644 internal/broadcast/manager.go create mode 100644 internal/gst/gst.c create mode 100644 internal/gst/gst.go create mode 100644 internal/gst/gst.h create mode 100644 internal/http/endpoint/endpoint.go create mode 100644 internal/http/endpoint/error.go create mode 100644 internal/http/http.go create mode 100644 internal/http/middleware/logger.go create mode 100644 internal/http/middleware/middleware.go create mode 100644 internal/http/middleware/recover.go create mode 100644 internal/http/middleware/request.go create mode 100644 internal/http/response/response.go create mode 100644 internal/remote/manager.go create mode 100644 internal/session/manager.go create mode 100644 internal/session/session.go create mode 100644 internal/types/broadcast.go create mode 100644 internal/types/config/broadcast.go create mode 100644 internal/types/config/config.go create mode 100644 internal/types/config/remote.go create mode 100644 internal/types/config/root.go create mode 100644 internal/types/config/server.go create mode 100644 internal/types/config/webrtc.go create mode 100644 internal/types/config/websocket.go create mode 100644 internal/types/event/events.go create mode 100644 internal/types/keys.go create mode 100644 internal/types/message/messages.go create mode 100644 internal/types/remote.go create mode 100644 internal/types/session.go create mode 100644 internal/types/webrtc.go create mode 100644 internal/types/webscoket.go create mode 100644 internal/types/xorg.go create mode 100644 internal/utils/array.go create mode 100644 internal/utils/color.go create mode 100644 internal/utils/ip.go create mode 100644 internal/utils/json.go create mode 100644 internal/utils/uid.go create mode 100644 internal/webrtc/handle.go create mode 100644 internal/webrtc/logger.go create mode 100644 internal/webrtc/peer.go create mode 100644 internal/webrtc/webrtc.go create mode 100644 internal/websocket/admin.go create mode 100644 internal/websocket/broadcast.go create mode 100644 internal/websocket/chat.go create mode 100644 internal/websocket/control.go create mode 100644 internal/websocket/handler.go create mode 100644 internal/websocket/screen.go create mode 100644 internal/websocket/session.go create mode 100644 internal/websocket/signal.go create mode 100644 internal/websocket/socket.go create mode 100644 internal/websocket/websocket.go create mode 100644 internal/xorg/xorg.c create mode 100644 internal/xorg/xorg.go create mode 100644 internal/xorg/xorg.h create mode 100644 neko.code-workspace create mode 100644 neko.go diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..3dce4145 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true \ No newline at end of file diff --git a/.env.development b/.env.development new file mode 100644 index 00000000..b5884926 --- /dev/null +++ b/.env.development @@ -0,0 +1,2 @@ +DISPLAY=:99.0 +PION_LOG_TRACE=all diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..02c7b7db --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "launch", + "type": "go", + "request": "launch", + "mode": "debug", + "program": "${workspaceFolder}/cmd/neko", + "envFile": "${workspaceFolder}/.env.development", + "output": "${workspaceFolder}/bin/debug/neko", + "cwd": "${workspaceFolder}/", + "args": ["serve", "-d", "--bind", ":3000", "--static", "../client/dist", "--password", "neko", "--password_admin", "admin"] + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..452ccec1 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,22 @@ + +{ + "go.formatTool": "goformat", + "go.inferGopath": false, + "go.autocompleteUnimportedPackages": true, + "go.delveConfig": { + "useApiV1": false, + "dlvLoadConfig": { + "followPointers": true, + "maxVariableRecurse": 3, + "maxStringLen": 400, + "maxArrayValues": 400, + "maxStructFields": -1 + } + }, + "[go]": { + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.organizeImports": true + } + } + } diff --git a/README.md b/README.md new file mode 100644 index 00000000..cb4b5bc1 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# n.eko core + +Virtual environment backend. diff --git a/build b/build new file mode 100644 index 00000000..895b12a7 --- /dev/null +++ b/build @@ -0,0 +1,10 @@ +#!/bin/bash + +set -ex + +BUILD_TIME=`date -u +'%Y-%m-%dT%H:%M:%SZ'` +GIT_COMMIT=`git rev-parse --short HEAD` +GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` +GIT_DIRTY=`git diff-index --quiet HEAD -- || echo "✗-"` + +go build -o bin/neko -ldflags "-s -X 'n.eko.moe/neko.buildDate=${BUILD_TIME}' -X 'n.eko.moe/neko.gitCommit=${GIT_DIRTY}${GIT_COMMIT}' -X 'n.eko.moe/neko.gitBranch=${GIT_BRANCH}'" -i cmd/neko/main.go diff --git a/cmd/neko/main.go b/cmd/neko/main.go new file mode 100644 index 00000000..d4de0bfc --- /dev/null +++ b/cmd/neko/main.go @@ -0,0 +1,18 @@ +package main + +import ( + "fmt" + + "github.com/rs/zerolog/log" + + "n.eko.moe/neko" + "n.eko.moe/neko/cmd" + "n.eko.moe/neko/internal/utils" +) + +func main() { + fmt.Print(utils.Colorf(neko.Header, "server", neko.Service.Version)) + if err := cmd.Execute(); err != nil { + log.Panic().Err(err).Msg("failed to execute command") + } +} diff --git a/cmd/root.go b/cmd/root.go new file mode 100644 index 00000000..293f3450 --- /dev/null +++ b/cmd/root.go @@ -0,0 +1,127 @@ +package cmd + +import ( + "fmt" + "io" + "os" + "path/filepath" + "runtime" + "time" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/diode" + "github.com/rs/zerolog/log" + "github.com/spf13/cobra" + "github.com/spf13/viper" + + "n.eko.moe/neko" +) + +func Execute() error { + return root.Execute() +} + +var root = &cobra.Command{ + Use: "neko", + Short: "neko streaming server", + Long: `neko streaming server`, + Version: neko.Service.Version.String(), +} + +func init() { + cobra.OnInitialize(func() { + ////// + // logs + ////// + zerolog.TimeFieldFormat = "" + zerolog.SetGlobalLevel(zerolog.InfoLevel) + + if viper.GetBool("debug") { + zerolog.SetGlobalLevel(zerolog.DebugLevel) + } + + console := zerolog.ConsoleWriter{Out: os.Stdout} + + if !viper.GetBool("logs") { + log.Logger = log.Output(console) + } else { + + logs := filepath.Join(".", "logs") + if runtime.GOOS == "linux" { + logs = "/var/log/neko" + } + + if _, err := os.Stat(logs); os.IsNotExist(err) { + os.Mkdir(logs, os.ModePerm) + } + + latest := filepath.Join(logs, "neko-latest.log") + _, err := os.Stat(latest) + if err == nil { + err = os.Rename(latest, filepath.Join(logs, "neko."+time.Now().Format("2006-01-02T15-04-05Z07-00")+".log")) + if err != nil { + log.Panic().Err(err).Msg("failed to rotate log file") + } + } + + logf, err := os.OpenFile(latest, os.O_RDWR|os.O_CREATE, 0666) + if err != nil { + log.Panic().Err(err).Msg("failed to create log file") + } + + logger := diode.NewWriter(logf, 1000, 10*time.Millisecond, func(missed int) { + fmt.Printf("logger dropped %d messages", missed) + }) + + log.Logger = log.Output(io.MultiWriter(console, logger)) + } + + ////// + // configs + ////// + config := viper.GetString("config") + if config != "" { + viper.SetConfigFile(config) // Use config file from the flag. + } else { + if runtime.GOOS == "linux" { + viper.AddConfigPath("/etc/neko/") + } + + viper.AddConfigPath(".") + viper.SetConfigName("neko") + } + + viper.SetEnvPrefix("NEKO") + viper.AutomaticEnv() // read in environment variables that match + + if err := viper.ReadInConfig(); err != nil { + if _, ok := err.(viper.ConfigFileNotFoundError); !ok { + log.Error().Err(err) + } + if config != "" { + log.Error().Err(err) + } + } + + file := viper.ConfigFileUsed() + logger := log.With(). + Bool("debug", viper.GetBool("debug")). + Str("logging", viper.GetString("logs")). + Str("config", file). + Logger() + + if file == "" { + logger.Warn().Msg("preflight complete without config file") + } else { + logger.Info().Msg("preflight complete") + } + + neko.Service.Root.Set() + }) + + if err := neko.Service.Root.Init(root); err != nil { + log.Panic().Err(err).Msg("unable to run root command") + } + + root.SetVersionTemplate(neko.Service.Version.Details()) +} diff --git a/cmd/serve.go b/cmd/serve.go new file mode 100644 index 00000000..b6a78077 --- /dev/null +++ b/cmd/serve.go @@ -0,0 +1,41 @@ +package cmd + +import ( + "github.com/rs/zerolog/log" + "github.com/spf13/cobra" + + "n.eko.moe/neko" + "n.eko.moe/neko/internal/types/config" +) + +func init() { + command := &cobra.Command{ + Use: "serve", + Short: "serve neko streaming server", + Long: `serve neko streaming server`, + Run: neko.Service.ServeCommand, + } + + configs := []config.Config{ + neko.Service.Server, + neko.Service.WebRTC, + neko.Service.Remote, + neko.Service.Broadcast, + neko.Service.WebSocket, + } + + cobra.OnInitialize(func() { + for _, cfg := range configs { + cfg.Set() + } + neko.Service.Preflight() + }) + + for _, cfg := range configs { + if err := cfg.Init(command); err != nil { + log.Panic().Err(err).Msg("unable to run serve command") + } + } + + root.AddCommand(command) +} diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..dfb14cca --- /dev/null +++ b/go.mod @@ -0,0 +1,35 @@ +module n.eko.moe/neko + +go 1.13 + +require ( + github.com/coreos/go-etcd v2.0.0+incompatible // indirect + github.com/cpuguy83/go-md2man v1.0.10 // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-chi/chi v4.1.0+incompatible + github.com/golang/protobuf v1.3.5 // indirect + github.com/gorilla/websocket v1.4.2 + github.com/kataras/go-events v0.0.2 + github.com/lucas-clemente/quic-go v0.15.2 // indirect + github.com/mitchellh/mapstructure v1.2.2 // indirect + github.com/pelletier/go-toml v1.7.0 // indirect + github.com/pion/ice v0.7.12 // indirect + github.com/pion/logging v0.2.2 + github.com/pion/rtp v1.4.0 // indirect + github.com/pion/sdp/v2 v2.3.5 // indirect + github.com/pion/turn v1.4.0 // indirect + github.com/pion/webrtc/v2 v2.2.4 + github.com/pkg/errors v0.9.1 + github.com/rs/zerolog v1.18.0 + github.com/spf13/afero v1.2.2 // indirect + github.com/spf13/cast v1.3.1 // indirect + github.com/spf13/cobra v0.0.7 + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.6.2 + github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect + golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 // indirect + golang.org/x/sys v0.0.0-20200331124033-c3d80250170d // indirect + golang.org/x/text v0.3.2 // indirect + gopkg.in/ini.v1 v1.55.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..67ae498c --- /dev/null +++ b/go.sum @@ -0,0 +1,470 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= +dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= +dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= +dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= +dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= +git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= +github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= +github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= +github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-chi/chi v4.0.3+incompatible h1:gakN3pDJnzZN5jqFV2TEdF66rTfKeITyR8qu6ekICEY= +github.com/go-chi/chi v4.0.3+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/go-chi/chi v4.1.0+incompatible h1:ETj3cggsVIY2Xao5ExCu6YhEh5MD6JTfcBzS37R260w= +github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= +github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9 h1:tbuodUh2vuhOVZAdW3NEUvosFHUMJwUNl7jk/VSEiwc= +github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9/go.mod h1:PpMmPfPKO9nKJ/psF49ESTAGQSdfXxlg1otPbEB2nOw= +github.com/lucas-clemente/quic-go v0.15.2 h1:RgxRJ7rPde0Q/uXDeb3/UdblVvxrYGDAG9G9GO78LmI= +github.com/lucas-clemente/quic-go v0.15.2/go.mod h1:qxmO5Y4ZMhdNkunGfxuZnZXnJwYpW9vjQkyrZ7BsgUI= +github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI= +github.com/marten-seemann/qtls v0.2.3 h1:0yWJ43C62LsZt08vuQJDK1uC1czUc3FJeCLPoNAI4vA= +github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= +github.com/marten-seemann/qtls v0.8.0 h1:aj+MPLibzKByw8CmG0WvWgbtBkctYPAXeB11cQJC8mo= +github.com/marten-seemann/qtls v0.8.0/go.mod h1:Lao6jDqlCfxyLKYFmZXGm2LSHBgVn+P+ROOex6YkT+k= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.2.2 h1:dxe5oCinTXiTIcfgmZecdCzPmAJKd46KsCWc35r0TV4= +github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= +github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= +github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= +github.com/pion/datachannel v1.4.13 h1:ezTn3AtUtXvKemRRjRdUgao/T8bH4ZJwrpOqU8Iz3Ss= +github.com/pion/datachannel v1.4.13/go.mod h1:+rBUwEDonA63KXx994DP/ofyyGVAm6AIMvOqQZxjWRU= +github.com/pion/datachannel v1.4.16 h1:dvuDC0IBMUDQvwO+gRu0Dv+W5j7rrgNpCmtheb6iYnc= +github.com/pion/datachannel v1.4.16/go.mod h1:gRGhxZv7X2/30Qxes4WEXtimKBXcwj/3WsDtBlHnvJY= +github.com/pion/dtls/v2 v2.0.0-rc.3 h1:u9utI+EDJOjOWfrkGQsD8WNssPcTwfYIanFB6oI8K+4= +github.com/pion/dtls/v2 v2.0.0-rc.3/go.mod h1:x0XH+cN5z+l/+/4nYL8r4sB8g6+0d1Zp2Pfkcoz8BKY= +github.com/pion/dtls/v2 v2.0.0-rc.7/go.mod h1:U199DvHpRBN0muE9+tVN4TMy1jvEhZIZ63lk4xkvVSk= +github.com/pion/dtls/v2 v2.0.0-rc.9 h1:wPb0JKmYoleAM2o8vQSPaUM+geJq7l0AdeUlPsg19ec= +github.com/pion/dtls/v2 v2.0.0-rc.9/go.mod h1:6eFkFvpo0T+odQ+39HFEtOO7LX5cUlFqXdSo4ucZtGg= +github.com/pion/ice v0.7.6 h1:EARj1MBq5NYaMtXVhYkK03i0RS/meejNHvZS++K5tSY= +github.com/pion/ice v0.7.6/go.mod h1:4xCajahEEvc5w0AM+Ujx/Rr2EczON/fKndi3jLyDdh4= +github.com/pion/ice v0.7.10/go.mod h1:YufCtyMmPeZXGTuARCracYfe0mb3EXbcRUS+vHJB5Cs= +github.com/pion/ice v0.7.12 h1:Lsh4f0Uvh/vOCXSyj+w5C736LrKt66qAKeA2LFwSkn0= +github.com/pion/ice v0.7.12/go.mod h1:yLt/9LAJEZXFtnOBdpq5YGaOF9SsDjVGCvzF3MF4k5k= +github.com/pion/logging v0.2.1/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= +github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= +github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= +github.com/pion/mdns v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY= +github.com/pion/mdns v0.0.4/go.mod h1:R1sL0p50l42S5lJs91oNdUL58nm0QHrhxnSegr++qC0= +github.com/pion/quic v0.1.1 h1:D951FV+TOqI9A0rTF7tHx0Loooqz+nyzjEyj8o3PuMA= +github.com/pion/quic v0.1.1/go.mod h1:zEU51v7ru8Mp4AUBJvj6psrSth5eEFNnVQK5K48oV3k= +github.com/pion/rtcp v1.2.1 h1:S3yG4KpYAiSmBVqKAfgRa5JdwBNj4zK3RLUa8JYdhak= +github.com/pion/rtcp v1.2.1/go.mod h1:a5dj2d6BKIKHl43EnAOIrCczcjESrtPuMgfmL6/K6QM= +github.com/pion/rtp v1.1.3/go.mod h1:/l4cvcKd0D3u9JLs2xSVI95YkfXW87a3br3nqmVtSlE= +github.com/pion/rtp v1.1.4 h1:P6xh8Y8JfzR7+JAbI79X2M8kfYETaqbuM5Otm+Z+k6U= +github.com/pion/rtp v1.1.4/go.mod h1:/l4cvcKd0D3u9JLs2xSVI95YkfXW87a3br3nqmVtSlE= +github.com/pion/rtp v1.3.2/go.mod h1:q9wPnA96pu2urCcW/sK/RiDn597bhGoAQQ+y2fDwHuY= +github.com/pion/rtp v1.4.0 h1:EkeHEXKuJhZoRUxtL2Ie80vVg9gBH+poT9UoL8M14nw= +github.com/pion/rtp v1.4.0/go.mod h1:/l4cvcKd0D3u9JLs2xSVI95YkfXW87a3br3nqmVtSlE= +github.com/pion/sctp v1.7.3 h1:Pok18oncuAq/WjNxbyltfBSLvbv/6QSCyVJKYyDWP5M= +github.com/pion/sctp v1.7.3/go.mod h1:c6C9jaDGX7f5xeSRVju/140XatpO9sOVe81EwpfzAc8= +github.com/pion/sctp v1.7.6 h1:8qZTdJtbKfAns/Hv5L0PAj8FyXcsKhMH1pKUCGisQg4= +github.com/pion/sctp v1.7.6/go.mod h1:ichkYQ5tlgCQwEwvgfdcAolqx1nHbYCxo4D7zK/K0X8= +github.com/pion/sdp/v2 v2.3.1 h1:45dub4NRdwyDmQCD3GIY7DZuqC49GBUwBdjuetvdOr0= +github.com/pion/sdp/v2 v2.3.1/go.mod h1:jccXVYW0fuK6ds2pwKr89SVBDYlCjhgMI6nucl5R5rA= +github.com/pion/sdp/v2 v2.3.4/go.mod h1:jccXVYW0fuK6ds2pwKr89SVBDYlCjhgMI6nucl5R5rA= +github.com/pion/sdp/v2 v2.3.5 h1:DtS9Z9R+E3/mn2jt+RQKBnneK1g+p3PT25+TkQHodfU= +github.com/pion/sdp/v2 v2.3.5/go.mod h1:+ZZf35r1+zbaWYiZLfPutWfx58DAWcGb2QsS3D/s9M8= +github.com/pion/srtp v1.2.6 h1:mHQuAMh0P67R7/j1F260u3O+fbRWLyjKLRPZYYvODFM= +github.com/pion/srtp v1.2.6/go.mod h1:rd8imc5htjfs99XiEoOjLMEOcVjME63UHx9Ek9IGst0= +github.com/pion/srtp v1.3.1 h1:WNDLN41ST0P6cXRpzx97JJW//vChAEo1+Etdqo+UMnM= +github.com/pion/srtp v1.3.1/go.mod h1:nxEytDDGTN+eNKJ1l5gzOCWQFuksgijorsSlgEjc40Y= +github.com/pion/stun v0.3.3 h1:brYuPl9bN9w/VM7OdNzRSLoqsnwlyNvD9MVeJrHjDQw= +github.com/pion/stun v0.3.3/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M= +github.com/pion/transport v0.6.0/go.mod h1:iWZ07doqOosSLMhZ+FXUTq+TamDoXSllxpbGcfkCmbE= +github.com/pion/transport v0.8.9/go.mod h1:lpeSM6KJFejVtZf8k0fgeN7zE73APQpTF83WvA1FVP8= +github.com/pion/transport v0.8.10 h1:lTiobMEw2PG6BH/mgIVqTV2mBp/mPT+IJLaN8ZxgdHk= +github.com/pion/transport v0.8.10/go.mod h1:tBmha/UCjpum5hqTWhfAEs3CO4/tHSg0MYRhSzR+CZ8= +github.com/pion/transport v0.10.0 h1:9M12BSneJm6ggGhJyWpDveFOstJsTiQjkLf4M44rm80= +github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE= +github.com/pion/turn v1.4.0 h1:7NUMRehQz4fIo53Qv9ui1kJ0Kr1CA82I81RHKHCeM80= +github.com/pion/turn v1.4.0/go.mod h1:aDSi6hWX/hd1+gKia9cExZOR0MU95O7zX9p3Gw/P2aU= +github.com/pion/turn/v2 v2.0.3 h1:SJUUIbcPoehlyZgMyIUbBBDhI03sBx32x3JuSIBKBWA= +github.com/pion/turn/v2 v2.0.3/go.mod h1:kl1hmT3NxcLynpXVnwJgObL8C9NaCyPTeqI2DcCpSZs= +github.com/pion/webrtc/v2 v2.1.18 h1:g0VN0xfEUSlVNfQmlCD6yOeXy/tMaktESBmHMnBS3bk= +github.com/pion/webrtc/v2 v2.1.18/go.mod h1:m0rKlYgLRZWyhmcMWegpF6xtK1ASxmOg8DAR74ttzQY= +github.com/pion/webrtc/v2 v2.2.4 h1:elWyBI/6S2kNoJ5rcTj2EMAvp/fmeiEqiuYbUd0ShRA= +github.com/pion/webrtc/v2 v2.2.4/go.mod h1:9vTqkEISnB5AXlggrFSBLGSz/kopQuYUYzHubuFpnCU= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3 h1:9iH4JKXLzFbOAdtqv/a+j8aewx2Y8lAjAydhbaScPF8= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0 h1:7etb9YClo3a6HjLzfl6rIQaU+FDfi0VSX39io3aQ+DM= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084 h1:sofwID9zm4tzrgykg80hfFph1mryUeLRsUfoocVVmRY= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.17.2 h1:RMRHFw2+wF7LO0QqtELQwo8hqSmqISyCJeFeAAuWcRo= +github.com/rs/zerolog v1.17.2/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= +github.com/rs/zerolog v1.18.0 h1:CbAm3kP2Tptby1i9sYy2MGRg0uxIN9cyDb59Ys7W8z8= +github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= +github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= +github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= +github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= +github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI= +github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU= +github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag= +github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg= +github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw= +github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= +github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= +github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= +github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= +github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0= +github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= +github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk= +github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= +github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= +github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v0.0.7 h1:FfTH+vuMXOas8jmfb5/M7dzEYx7LpcLb7a0LPe34uOU= +github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk= +github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= +github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E= +github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= +github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= +golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 h1:fpnn/HnJONpIu6hkXi1u/7rR0NzilgWr4T0JmWkEitk= +golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191206220618-eeba5f6aabab h1:FvshnhkKW+LO3HWHodML8kuVX8rnJTxKm9dFPuI68UM= +golang.org/x/sys v0.0.0-20191206220618-eeba5f6aabab/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= +google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.55.0 h1:E8yzL5unfpW3M6fz/eB7Cb5MQAYSZ7GKo4Qth+N2sgQ= +gopkg.in/ini.v1 v1.55.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= diff --git a/internal/broadcast/manager.go b/internal/broadcast/manager.go new file mode 100644 index 00000000..d6ebbe0b --- /dev/null +++ b/internal/broadcast/manager.go @@ -0,0 +1,83 @@ +package broadcast + +import ( + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "n.eko.moe/neko/internal/gst" + "n.eko.moe/neko/internal/types/config" +) + +type BroadcastManager struct { + logger zerolog.Logger + pipeline *gst.Pipeline + remote *config.Remote + config *config.Broadcast + enabled bool + url string +} + +func New(remote *config.Remote, config *config.Broadcast) *BroadcastManager { + return &BroadcastManager{ + logger: log.With().Str("module", "remote").Logger(), + remote: remote, + config: config, + enabled: false, + url: "", + } +} + +func (manager *BroadcastManager) Start() { + if !manager.enabled || manager.IsActive() { + return + } + + var err error + manager.pipeline, err = gst.CreateRTMPPipeline( + manager.remote.Device, + manager.remote.Display, + manager.config.Pipeline, + manager.url, + ) + + manager.logger.Info(). + Str("audio_device", manager.remote.Device). + Str("video_display", manager.remote.Display). + Str("rtmp_pipeline_src", manager.pipeline.Src). + Msgf("RTMP pipeline is starting...") + + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to create rtmp pipeline") + return + } + + manager.pipeline.Play() +} + +func (manager *BroadcastManager) Stop() { + if !manager.IsActive() { + return + } + + manager.pipeline.Stop() + manager.pipeline = nil +} + +func (manager *BroadcastManager) IsActive() bool { + return manager.pipeline != nil +} + +func (manager *BroadcastManager) Create(url string) { + manager.url = url + manager.enabled = true + manager.Start() +} + +func (manager *BroadcastManager) Destroy() { + manager.Stop() + manager.enabled = false +} + +func (manager *BroadcastManager) GetUrl() string { + return manager.url +} diff --git a/internal/gst/gst.c b/internal/gst/gst.c new file mode 100644 index 00000000..924787fb --- /dev/null +++ b/internal/gst/gst.c @@ -0,0 +1,95 @@ +#include "gst.h" + +#include + +typedef struct SampleHandlerUserData { + int pipelineId; +} SampleHandlerUserData; + +void gstreamer_init(void) { + gst_init(NULL, NULL); +} + +GMainLoop *gstreamer_send_main_loop = NULL; +void gstreamer_send_start_mainloop(void) { + gstreamer_send_main_loop = g_main_loop_new(NULL, FALSE); + + g_main_loop_run(gstreamer_send_main_loop); +} + +static gboolean gstreamer_send_bus_call(GstBus *bus, GstMessage *msg, gpointer data) { + switch (GST_MESSAGE_TYPE(msg)) { + + case GST_MESSAGE_EOS: + g_print("End of stream\n"); + exit(1); + break; + + case GST_MESSAGE_ERROR: { + gchar *debug; + GError *error; + + gst_message_parse_error(msg, &error, &debug); + g_free(debug); + + g_printerr("Error: %s\n", error->message); + g_error_free(error); + exit(1); + } + default: + break; + } + + return TRUE; +} + +GstFlowReturn gstreamer_send_new_sample_handler(GstElement *object, gpointer user_data) { + GstSample *sample = NULL; + GstBuffer *buffer = NULL; + gpointer copy = NULL; + gsize copy_size = 0; + SampleHandlerUserData *s = (SampleHandlerUserData *)user_data; + + g_signal_emit_by_name (object, "pull-sample", &sample); + if (sample) { + buffer = gst_sample_get_buffer(sample); + if (buffer) { + gst_buffer_extract_dup(buffer, 0, gst_buffer_get_size(buffer), ©, ©_size); + goHandlePipelineBuffer(copy, copy_size, GST_BUFFER_DURATION(buffer), s->pipelineId); + } + gst_sample_unref (sample); + } + + return GST_FLOW_OK; +} + +GstElement *gstreamer_send_create_pipeline(char *pipeline) { + GError *error = NULL; + return gst_parse_launch(pipeline, &error); +} + +void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId) { + SampleHandlerUserData *s = calloc(1, sizeof(SampleHandlerUserData)); + s->pipelineId = pipelineId; + + GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline)); + gst_bus_add_watch(bus, gstreamer_send_bus_call, NULL); + gst_object_unref(bus); + + GstElement *appsink = gst_bin_get_by_name(GST_BIN(pipeline), "appsink"); + g_object_set(appsink, "emit-signals", TRUE, NULL); + g_signal_connect(appsink, "new-sample", G_CALLBACK(gstreamer_send_new_sample_handler), s); + gst_object_unref(appsink); + + gst_element_set_state(pipeline, GST_STATE_PLAYING); +} + +void gstreamer_send_play_pipeline(GstElement *pipeline) { + gst_element_set_state(pipeline, GST_STATE_PLAYING); +} + +void gstreamer_send_stop_pipeline(GstElement *pipeline) { + gst_element_set_state(pipeline, GST_STATE_NULL); +} + + diff --git a/internal/gst/gst.go b/internal/gst/gst.go new file mode 100644 index 00000000..c3fcc56c --- /dev/null +++ b/internal/gst/gst.go @@ -0,0 +1,277 @@ +package gst + +/* +#cgo pkg-config: gstreamer-1.0 gstreamer-app-1.0 + +#include "gst.h" + +*/ +import "C" +import ( + "fmt" + "sync" + "unsafe" + + "github.com/pion/webrtc/v2" + + "n.eko.moe/neko/internal/types" +) + +/* + apt-get install \ + libgstreamer1.0-0 \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad \ + gstreamer1.0-plugins-ugly\ + gstreamer1.0-libav \ + gstreamer1.0-doc \ + gstreamer1.0-tools \ + gstreamer1.0-x \ + gstreamer1.0-alsa \ + gstreamer1.0-pulseaudio + + gst-inspect-1.0 --version + gst-inspect-1.0 plugin + gst-launch-1.0 ximagesrc show-pointer=true use-damage=false ! video/x-raw,framerate=30/1 ! videoconvert ! queue ! vp8enc error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true cpu-used=5 deadline=1 ! autovideosink + gst-launch-1.0 pulsesrc ! audioconvert ! opusenc ! autoaudiosink +*/ + +// Pipeline is a wrapper for a GStreamer Pipeline +type Pipeline struct { + Pipeline *C.GstElement + Sample chan types.Sample + CodecName string + ClockRate float32 + Src string + id int +} + +var pipelines = make(map[int]*Pipeline) +var pipelinesLock sync.Mutex +var registry *C.GstRegistry + +const ( + videoClockRate = 90000 + audioClockRate = 48000 + pcmClockRate = 8000 + videoSrc = "ximagesrc xid=%s show-pointer=true use-damage=false ! video/x-raw ! videoconvert ! queue ! " + audioSrc = "pulsesrc device=%s ! audio/x-raw,channels=2 ! audioconvert ! " +) + +func init() { + C.gstreamer_init() + registry = C.gst_registry_get() +} + +// CreateRTMPPipeline creates a GStreamer Pipeline +func CreateRTMPPipeline(pipelineDevice string, pipelineDisplay string, pipelineSrc string, pipelineRTMP string) (*Pipeline, error) { + video := fmt.Sprintf(videoSrc, pipelineDisplay) + audio := fmt.Sprintf(audioSrc, pipelineDevice) + + var pipelineStr string + if pipelineSrc != "" { + pipelineStr = fmt.Sprintf(pipelineSrc, pipelineRTMP, pipelineDevice, pipelineDisplay) + } else { + pipelineStr = fmt.Sprintf("flvmux name=mux ! rtmpsink location='%s live=1' %s audio/x-raw,channels=2 ! audioconvert ! voaacenc ! mux. %s x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! mux.", pipelineRTMP, audio, video) + } + + return CreatePipeline(pipelineStr, "", 0) +} + +// CreateAppPipeline creates a GStreamer Pipeline +func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc string) (*Pipeline, error) { + pipelineStr := " ! appsink name=appsink" + + var clockRate float32 + + switch codecName { + case webrtc.VP8: + // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html?gi-language=c + // gstreamer1.0-plugins-good + // vp8enc error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true cpu-used=5 deadline=1 + if err := CheckPlugins([]string{"ximagesrc", "vpx"}); err != nil { + return nil, err + } + + clockRate = videoClockRate + + if pipelineSrc != "" { + pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) + } else { + pipelineStr = fmt.Sprintf(videoSrc+"vp8enc cpu-used=8 threads=2 deadline=1 error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true"+pipelineStr, pipelineDevice) + } + case webrtc.VP9: + // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html?gi-language=c + // gstreamer1.0-plugins-good + // vp9enc + if err := CheckPlugins([]string{"ximagesrc", "vpx"}); err != nil { + return nil, err + } + + clockRate = videoClockRate + + // Causes panic! not sure why... + if pipelineSrc != "" { + pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) + } else { + pipelineStr = fmt.Sprintf(videoSrc+"vp9enc"+pipelineStr, pipelineDevice) + } + case webrtc.H264: + // https://gstreamer.freedesktop.org/documentation/openh264/openh264enc.html?gi-language=c#openh264enc + // gstreamer1.0-plugins-bad + // openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 + if err := CheckPlugins([]string{"ximagesrc"}); err != nil { + return nil, err + } + + clockRate = videoClockRate + + if pipelineSrc != "" { + pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) + } else { + pipelineStr = fmt.Sprintf(videoSrc+"openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream"+pipelineStr, pipelineDevice) + + // https://gstreamer.freedesktop.org/documentation/x264/index.html?gi-language=c + // gstreamer1.0-plugins-ugly + // video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream + if err := CheckPlugins([]string{"openh264"}); err != nil { + pipelineStr = fmt.Sprintf(videoSrc+"video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream"+pipelineStr, pipelineDevice) + + if err := CheckPlugins([]string{"x264"}); err != nil { + return nil, err + } + } + } + case webrtc.Opus: + // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html + // gstreamer1.0-plugins-base + // opusenc + if err := CheckPlugins([]string{"pulseaudio", "opus"}); err != nil { + return nil, err + } + + clockRate = audioClockRate + + if pipelineSrc != "" { + pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) + } else { + pipelineStr = fmt.Sprintf(audioSrc+"opusenc"+pipelineStr, pipelineDevice) + } + case webrtc.G722: + // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html?gi-language=c + // gstreamer1.0-libav + // avenc_g722 + if err := CheckPlugins([]string{"pulseaudio", "libav"}); err != nil { + return nil, err + } + + clockRate = audioClockRate + + if pipelineSrc != "" { + pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) + } else { + pipelineStr = fmt.Sprintf(audioSrc+"avenc_g722"+pipelineStr, pipelineDevice) + } + case webrtc.PCMU: + // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html?gi-language=c + // gstreamer1.0-plugins-good + // audio/x-raw, rate=8000 ! mulawenc + if err := CheckPlugins([]string{"pulseaudio", "mulaw"}); err != nil { + return nil, err + } + + clockRate = pcmClockRate + + if pipelineSrc != "" { + pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) + } else { + pipelineStr = fmt.Sprintf(audioSrc+"audio/x-raw, rate=8000 ! mulawenc"+pipelineStr, pipelineDevice) + } + case webrtc.PCMA: + // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html?gi-language=c + // gstreamer1.0-plugins-good + // audio/x-raw, rate=8000 ! alawenc + if err := CheckPlugins([]string{"pulseaudio", "alaw"}); err != nil { + return nil, err + } + + clockRate = pcmClockRate + + if pipelineSrc != "" { + pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) + } else { + pipelineStr = fmt.Sprintf(audioSrc+"audio/x-raw, rate=8000 ! alawenc"+pipelineStr, pipelineDevice) + } + default: + return nil, fmt.Errorf("unknown codec %s", codecName) + } + + return CreatePipeline(pipelineStr, codecName, clockRate) +} + +// CreatePipeline creates a GStreamer Pipeline +func CreatePipeline(pipelineStr string, codecName string, clockRate float32) (*Pipeline, error) { + pipelineStrUnsafe := C.CString(pipelineStr) + defer C.free(unsafe.Pointer(pipelineStrUnsafe)) + + pipelinesLock.Lock() + defer pipelinesLock.Unlock() + + p := &Pipeline{ + Pipeline: C.gstreamer_send_create_pipeline(pipelineStrUnsafe), + Sample: make(chan types.Sample), + CodecName: codecName, + ClockRate: clockRate, + Src: pipelineStr, + id: len(pipelines), + } + + pipelines[p.id] = p + return p, nil +} + +// Start starts the GStreamer Pipeline +func (p *Pipeline) Start() { + C.gstreamer_send_start_pipeline(p.Pipeline, C.int(p.id)) +} + +// Play starts the GStreamer Pipeline +func (p *Pipeline) Play() { + C.gstreamer_send_play_pipeline(p.Pipeline) +} + +// Stop stops the GStreamer Pipeline +func (p *Pipeline) Stop() { + C.gstreamer_send_stop_pipeline(p.Pipeline) +} + +// gst-inspect-1.0 +func CheckPlugins(plugins []string) error { + var plugin *C.GstPlugin + for _, pluginstr := range plugins { + plugincstr := C.CString(pluginstr) + plugin = C.gst_registry_find_plugin(registry, plugincstr) + C.free(unsafe.Pointer(plugincstr)) + if plugin == nil { + return fmt.Errorf("required gstreamer plugin %s not found", pluginstr) + } + } + + return nil +} + +//export goHandlePipelineBuffer +func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.int, pipelineID C.int) { + pipelinesLock.Lock() + pipeline, ok := pipelines[int(pipelineID)] + pipelinesLock.Unlock() + + if ok { + samples := uint32(pipeline.ClockRate * (float32(duration) / 1000000000)) + pipeline.Sample <- types.Sample{Data: C.GoBytes(buffer, bufferLen), Samples: samples} + } else { + fmt.Printf("discarding buffer, no pipeline with id %d", int(pipelineID)) + } + C.free(buffer) +} diff --git a/internal/gst/gst.h b/internal/gst/gst.h new file mode 100644 index 00000000..7c6965f4 --- /dev/null +++ b/internal/gst/gst.h @@ -0,0 +1,19 @@ +#ifndef GST_H +#define GST_H + +#include +#include +#include +#include + +extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); + +GstElement *gstreamer_send_create_pipeline(char *pipeline); + +void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId); +void gstreamer_send_play_pipeline(GstElement *pipeline); +void gstreamer_send_stop_pipeline(GstElement *pipeline); +void gstreamer_send_start_mainloop(void); +void gstreamer_init(void); + +#endif diff --git a/internal/http/endpoint/endpoint.go b/internal/http/endpoint/endpoint.go new file mode 100644 index 00000000..fcfcb1ae --- /dev/null +++ b/internal/http/endpoint/endpoint.go @@ -0,0 +1,102 @@ +package endpoint + +import ( + "encoding/json" + "fmt" + "net/http" + "runtime/debug" + + "github.com/go-chi/chi/middleware" + "github.com/rs/zerolog/log" +) + +type ( + Endpoint func(http.ResponseWriter, *http.Request) error + + ErrResponse struct { + Status int `json:"status,omitempty"` + Err string `json:"error,omitempty"` + Message string `json:"message,omitempty"` + Details string `json:"details,omitempty"` + Code string `json:"code,omitempty"` + RequestID string `json:"request,omitempty"` + } +) + +func Handle(handler Endpoint) http.HandlerFunc { + fn := func(w http.ResponseWriter, r *http.Request) { + if err := handler(w, r); err != nil { + WriteError(w, r, err) + } + } + + return http.HandlerFunc(fn) +} + +var nonErrorsCodes = map[int]bool{ + 404: true, +} + +func errResponse(input interface{}) *ErrResponse { + var res *ErrResponse + var err interface{} + + switch input.(type) { + case *HandlerError: + e := input.(*HandlerError) + res = &ErrResponse{ + Status: e.Status, + Err: http.StatusText(e.Status), + Message: e.Message, + } + err = e.Err + default: + res = &ErrResponse{ + Status: http.StatusInternalServerError, + Err: http.StatusText(http.StatusInternalServerError), + } + err = input + } + + if err != nil { + switch err.(type) { + case *error: + e := err.(error) + res.Details = e.Error() + break + default: + res.Details = fmt.Sprintf("%+v", err) + break + } + } + + return res +} + +func WriteError(w http.ResponseWriter, r *http.Request, err interface{}) { + hlog := log.With(). + Str("module", "http"). + Logger() + + res := errResponse(err) + + if reqID := middleware.GetReqID(r.Context()); reqID != "" { + res.RequestID = reqID + } + + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(res.Status) + + if err := json.NewEncoder(w).Encode(res); err != nil { + hlog.Warn().Err(err).Msg("Failed writing json error response") + } + + if !nonErrorsCodes[res.Status] { + logEntry := middleware.GetLogEntry(r) + if logEntry != nil { + logEntry.Panic(err, debug.Stack()) + } else { + hlog.Error().Str("stack", string(debug.Stack())).Msgf("%+v", err) + } + } +} diff --git a/internal/http/endpoint/error.go b/internal/http/endpoint/error.go new file mode 100644 index 00000000..c92000e3 --- /dev/null +++ b/internal/http/endpoint/error.go @@ -0,0 +1,17 @@ +package endpoint + +import "fmt" + +type HandlerError struct { + Status int + Message string + Err error +} + +func (e *HandlerError) Error() string { + if e.Err != nil { + return fmt.Sprintf("%s: %s", e.Message, e.Err.Error()) + } + + return e.Message +} diff --git a/internal/http/http.go b/internal/http/http.go new file mode 100644 index 00000000..e8cec82c --- /dev/null +++ b/internal/http/http.go @@ -0,0 +1,87 @@ +package http + +import ( + "context" + "fmt" + "net/http" + "os" + + "github.com/go-chi/chi" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "n.eko.moe/neko/internal/http/endpoint" + "n.eko.moe/neko/internal/http/middleware" + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/config" +) + +type Server struct { + logger zerolog.Logger + router *chi.Mux + http *http.Server + conf *config.Server +} + +func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { + logger := log.With().Str("module", "webrtc").Logger() + + router := chi.NewRouter() + // router.Use(middleware.Recoverer) // Recover from panics without crashing server + router.Use(middleware.RequestID) // Create a request ID for each request + router.Use(middleware.Logger) // Log API request calls + + router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { + webSocketHandler.Upgrade(w, r) + }) + + fs := http.FileServer(http.Dir(conf.Static)) + router.Get("/*", func(w http.ResponseWriter, r *http.Request) { + if _, err := os.Stat(conf.Static + r.RequestURI); os.IsNotExist(err) { + http.StripPrefix(r.RequestURI, fs).ServeHTTP(w, r) + } else { + fs.ServeHTTP(w, r) + } + }) + + router.NotFound(endpoint.Handle(func(w http.ResponseWriter, r *http.Request) error { + return &endpoint.HandlerError{ + Status: http.StatusNotFound, + Message: fmt.Sprintf("file '%s' is not found", r.RequestURI), + } + })) + + server := &http.Server{ + Addr: conf.Bind, + Handler: router, + } + + return &Server{ + logger: logger, + router: router, + http: server, + conf: conf, + } +} + +func (s *Server) Start() { + if s.conf.Cert != "" && s.conf.Key != "" { + go func() { + if err := s.http.ListenAndServeTLS(s.conf.Cert, s.conf.Key); err != http.ErrServerClosed { + s.logger.Panic().Err(err).Msg("unable to start https server") + } + }() + s.logger.Info().Msgf("https listening on %s", s.http.Addr) + } else { + go func() { + if err := s.http.ListenAndServe(); err != http.ErrServerClosed { + s.logger.Panic().Err(err).Msg("unable to start http server") + } + }() + s.logger.Warn().Msgf("http listening on %s", s.http.Addr) + } +} + +func (s *Server) Shutdown() error { + return s.http.Shutdown(context.Background()) +} diff --git a/internal/http/middleware/logger.go b/internal/http/middleware/logger.go new file mode 100644 index 00000000..b20ea9ac --- /dev/null +++ b/internal/http/middleware/logger.go @@ -0,0 +1,80 @@ +package middleware + +import ( + "fmt" + "net/http" + "time" + + "github.com/go-chi/chi/middleware" + "github.com/rs/zerolog/log" +) + +func Logger(next http.Handler) http.Handler { + fn := func(w http.ResponseWriter, r *http.Request) { + req := map[string]interface{}{} + + if reqID := middleware.GetReqID(r.Context()); reqID != "" { + req["id"] = reqID + } + + scheme := "http" + if r.TLS != nil { + scheme = "https" + } + + req["scheme"] = scheme + req["proto"] = r.Proto + req["method"] = r.Method + req["remote"] = r.RemoteAddr + req["agent"] = r.UserAgent() + req["uri"] = fmt.Sprintf("%s://%s%s", scheme, r.Host, r.RequestURI) + + fields := map[string]interface{}{} + fields["req"] = req + + entry := &entry{ + fields: fields, + } + + ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor) + t1 := time.Now() + + defer func() { + entry.Write(ww.Status(), ww.BytesWritten(), time.Since(t1)) + }() + + next.ServeHTTP(ww, r) + } + return http.HandlerFunc(fn) +} + +type entry struct { + fields map[string]interface{} + errors []map[string]interface{} +} + +func (e *entry) Write(status, bytes int, elapsed time.Duration) { + res := map[string]interface{}{} + res["time"] = time.Now().UTC().Format(time.RFC1123) + res["status"] = status + res["bytes"] = bytes + res["elapsed"] = float64(elapsed.Nanoseconds()) / 1000000.0 + + e.fields["res"] = res + e.fields["module"] = "http" + + if len(e.errors) > 0 { + e.fields["errors"] = e.errors + log.Error().Fields(e.fields).Msgf("request failed (%d)", status) + } else { + log.Debug().Fields(e.fields).Msgf("request complete (%d)", status) + } +} + +func (e *entry) Panic(v interface{}, stack []byte) { + err := map[string]interface{}{} + err["message"] = fmt.Sprintf("%+v", v) + err["stack"] = string(stack) + + e.errors = append(e.errors, err) +} diff --git a/internal/http/middleware/middleware.go b/internal/http/middleware/middleware.go new file mode 100644 index 00000000..1d0ca508 --- /dev/null +++ b/internal/http/middleware/middleware.go @@ -0,0 +1,12 @@ +package middleware + +// contextKey is a value for use with context.WithValue. It's used as +// a pointer so it fits in an interface{} without allocation. This technique +// for defining context keys was copied from Go 1.7's new use of context in net/http. +type ctxKey struct { + name string +} + +func (k *ctxKey) String() string { + return "neko/ctx/" + k.name +} diff --git a/internal/http/middleware/recover.go b/internal/http/middleware/recover.go new file mode 100644 index 00000000..9a254889 --- /dev/null +++ b/internal/http/middleware/recover.go @@ -0,0 +1,24 @@ +package middleware + +// The original work was derived from Goji's middleware, source: +// https://github.com/zenazn/goji/tree/master/web/middleware + +import ( + "net/http" + + "n.eko.moe/neko/internal/http/endpoint" +) + +func Recoverer(next http.Handler) http.Handler { + fn := func(w http.ResponseWriter, r *http.Request) { + defer func() { + if rvr := recover(); rvr != nil { + endpoint.WriteError(w, r, rvr) + } + }() + + next.ServeHTTP(w, r) + } + + return http.HandlerFunc(fn) +} diff --git a/internal/http/middleware/request.go b/internal/http/middleware/request.go new file mode 100644 index 00000000..c9634bf8 --- /dev/null +++ b/internal/http/middleware/request.go @@ -0,0 +1,89 @@ +package middleware + +import ( + "context" + "crypto/rand" + "encoding/base64" + "fmt" + "net/http" + "os" + "strings" + "sync/atomic" +) + +// Key to use when setting the request ID. +type ctxKeyRequestID int + +// RequestIDKey is the key that holds the unique request ID in a request context. +const RequestIDKey ctxKeyRequestID = 0 + +var prefix string +var reqid uint64 + +// A quick note on the statistics here: we're trying to calculate the chance that +// two randomly generated base62 prefixes will collide. We use the formula from +// http://en.wikipedia.org/wiki/Birthday_problem +// +// P[m, n] \approx 1 - e^{-m^2/2n} +// +// We ballpark an upper bound for $m$ by imagining (for whatever reason) a server +// that restarts every second over 10 years, for $m = 86400 * 365 * 10 = 315360000$ +// +// For a $k$ character base-62 identifier, we have $n(k) = 62^k$ +// +// Plugging this in, we find $P[m, n(10)] \approx 5.75%$, which is good enough for +// our purposes, and is surely more than anyone would ever need in practice -- a +// process that is rebooted a handful of times a day for a hundred years has less +// than a millionth of a percent chance of generating two colliding IDs. + +func init() { + hostname, err := os.Hostname() + if hostname == "" || err != nil { + hostname = "localhost" + } + var buf [12]byte + var b64 string + for len(b64) < 10 { + rand.Read(buf[:]) + b64 = base64.StdEncoding.EncodeToString(buf[:]) + b64 = strings.NewReplacer("+", "", "/", "").Replace(b64) + } + + prefix = fmt.Sprintf("%s/%s", hostname, b64[0:10]) +} + +// RequestID is a middleware that injects a request ID into the context of each +// request. A request ID is a string of the form "host.example.com/random-0001", +// where "random" is a base62 random string that uniquely identifies this go +// process, and where the last number is an atomically incremented request +// counter. +func RequestID(next http.Handler) http.Handler { + fn := func(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + requestID := r.Header.Get("X-Request-Id") + if requestID == "" { + myid := atomic.AddUint64(&reqid, 1) + requestID = fmt.Sprintf("%s-%06d", prefix, myid) + } + ctx = context.WithValue(ctx, RequestIDKey, requestID) + next.ServeHTTP(w, r.WithContext(ctx)) + } + return http.HandlerFunc(fn) +} + +// GetReqID returns a request ID from the given context if one is present. +// Returns the empty string if a request ID cannot be found. +func GetReqID(ctx context.Context) string { + if ctx == nil { + return "" + } + if reqID, ok := ctx.Value(RequestIDKey).(string); ok { + return reqID + } + return "" +} + +// NextRequestID generates the next request ID in the sequence. +func NextRequestID() uint64 { + return atomic.AddUint64(&reqid, 1) +} diff --git a/internal/http/response/response.go b/internal/http/response/response.go new file mode 100644 index 00000000..ea53baa0 --- /dev/null +++ b/internal/http/response/response.go @@ -0,0 +1,32 @@ +package response + +import ( + "encoding/json" + "net/http" + + "n.eko.moe/neko/internal/http/endpoint" +) + +// JSON encodes data to rw in JSON format. Returns a pointer to a +// HandlerError if encoding fails. +func JSON(w http.ResponseWriter, data interface{}, status int) error { + w.WriteHeader(status) + w.Header().Set("Content-Type", "application/json") + + err := json.NewEncoder(w).Encode(data) + if err != nil { + return &endpoint.HandlerError{ + Status: http.StatusInternalServerError, + Message: "unable to write JSON response", + Err: err, + } + } + + return nil +} + +// Empty merely sets the response code to NoContent (204). +func Empty(w http.ResponseWriter) error { + w.WriteHeader(http.StatusNoContent) + return nil +} diff --git a/internal/remote/manager.go b/internal/remote/manager.go new file mode 100644 index 00000000..3ed2f005 --- /dev/null +++ b/internal/remote/manager.go @@ -0,0 +1,235 @@ +package remote + +import ( + "fmt" + "time" + + "github.com/kataras/go-events" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + "n.eko.moe/neko/internal/gst" + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/config" + "n.eko.moe/neko/internal/xorg" +) + +type RemoteManager struct { + logger zerolog.Logger + video *gst.Pipeline + audio *gst.Pipeline + config *config.Remote + broadcast types.BroadcastManager + cleanup *time.Ticker + shutdown chan bool + emmiter events.EventEmmiter + streaming bool +} + +func New(config *config.Remote, broadcast types.BroadcastManager) *RemoteManager { + return &RemoteManager{ + logger: log.With().Str("module", "remote").Logger(), + cleanup: time.NewTicker(1 * time.Second), + shutdown: make(chan bool), + emmiter: events.New(), + config: config, + broadcast: broadcast, + streaming: false, + } +} + +func (manager *RemoteManager) VideoCodec() string { + return manager.config.VideoCodec +} + +func (manager *RemoteManager) AudioCodec() string { + return manager.config.AudioCodec +} + +func (manager *RemoteManager) Start() { + xorg.Display(manager.config.Display) + + if !xorg.ValidScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) { + manager.logger.Warn().Msgf("invalid screen option %dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) + } else if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { + manager.logger.Warn().Err(err).Msg("unable to change screen size") + } + + manager.createPipelines() + manager.broadcast.Start() + + go func() { + defer func() { + manager.logger.Info().Msg("shutdown") + }() + + for { + select { + case <-manager.shutdown: + return + case sample := <-manager.video.Sample: + manager.emmiter.Emit("video", sample) + case sample := <-manager.audio.Sample: + manager.emmiter.Emit("audio", sample) + case <-manager.cleanup.C: + xorg.CheckKeys(time.Second * 10) + } + } + }() +} + +func (manager *RemoteManager) Shutdown() error { + manager.logger.Info().Msgf("remote shutting down") + manager.video.Stop() + manager.audio.Stop() + manager.broadcast.Stop() + + manager.cleanup.Stop() + manager.shutdown <- true + return nil +} + +func (manager *RemoteManager) OnVideoFrame(listener func(sample types.Sample)) { + manager.emmiter.On("video", func(payload ...interface{}) { + listener(payload[0].(types.Sample)) + }) +} + +func (manager *RemoteManager) OnAudioFrame(listener func(sample types.Sample)) { + manager.emmiter.On("audio", func(payload ...interface{}) { + listener(payload[0].(types.Sample)) + }) +} + +func (manager *RemoteManager) StartStream() { + manager.createPipelines() + + manager.logger.Info(). + Str("video_display", manager.config.Display). + Str("video_codec", manager.config.VideoCodec). + Str("audio_device", manager.config.Device). + Str("audio_codec", manager.config.AudioCodec). + Str("audio_pipeline_src", manager.audio.Src). + Str("video_pipeline_src", manager.video.Src). + Str("screen_resolution", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). + Msgf("Pipelines starting...") + + manager.video.Start() + manager.audio.Start() + manager.streaming = true +} + +func (manager *RemoteManager) StopStream() { + manager.logger.Info().Msgf("Pipelines shutting down...") + manager.video.Stop() + manager.audio.Stop() + manager.streaming = false +} + +func (manager *RemoteManager) Streaming() bool { + return manager.streaming +} + +func (manager *RemoteManager) createPipelines() { + var err error + manager.video, err = gst.CreateAppPipeline( + manager.config.VideoCodec, + manager.config.Display, + manager.config.VideoParams, + ) + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to create video pipeline") + } + + manager.audio, err = gst.CreateAppPipeline( + manager.config.AudioCodec, + manager.config.Device, + manager.config.AudioParams, + ) + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to create audio pipeline") + } +} + +func (manager *RemoteManager) ChangeResolution(width int, height int, rate int) error { + if !xorg.ValidScreenSize(width, height, rate) { + return fmt.Errorf("unknown configuration") + } + + manager.video.Stop() + manager.broadcast.Stop() + + defer func() { + manager.video.Start() + manager.broadcast.Start() + + manager.logger.Info().Msg("starting video pipeline...") + }() + + if err := xorg.ChangeScreenSize(width, height, rate); err != nil { + return err + } + + var err error + manager.video, err = gst.CreateAppPipeline( + manager.config.VideoCodec, + manager.config.Display, + manager.config.VideoParams, + ) + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to create new video pipeline") + } + + return nil +} + +func (manager *RemoteManager) Move(x, y int) { + xorg.Move(x, y) +} + +func (manager *RemoteManager) Scroll(x, y int) { + xorg.Scroll(x, y) +} + +func (manager *RemoteManager) ButtonDown(code int) error { + return xorg.ButtonDown(code) +} + +func (manager *RemoteManager) KeyDown(code uint64) error { + return xorg.KeyDown(code) +} + +func (manager *RemoteManager) ButtonUp(code int) error { + return xorg.ButtonUp(code) +} + +func (manager *RemoteManager) KeyUp(code uint64) error { + return xorg.KeyUp(code) +} + +func (manager *RemoteManager) ReadClipboard() string { + return xorg.ReadClipboard() +} + +func (manager *RemoteManager) WriteClipboard(data string) { + xorg.WriteClipboard(data) +} + +func (manager *RemoteManager) ResetKeys() { + xorg.ResetKeys() +} + +func (manager *RemoteManager) ScreenConfigurations() map[int]types.ScreenConfiguration { + return xorg.ScreenConfigurations +} + +func (manager *RemoteManager) GetScreenSize() *types.ScreenSize { + return xorg.GetScreenSize() +} + +func (manager *RemoteManager) SetKeyboardLayout(layout string) { + xorg.SetKeyboardLayout(layout) +} + +func (manager *RemoteManager) SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) { + xorg.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) +} diff --git a/internal/session/manager.go b/internal/session/manager.go new file mode 100644 index 00000000..8e51bc5a --- /dev/null +++ b/internal/session/manager.go @@ -0,0 +1,189 @@ +package session + +import ( + "fmt" + + "github.com/kataras/go-events" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/utils" +) + +func New(remote types.RemoteManager) *SessionManager { + return &SessionManager{ + logger: log.With().Str("module", "session").Logger(), + host: "", + remote: remote, + members: make(map[string]*Session), + emmiter: events.New(), + } +} + +type SessionManager struct { + logger zerolog.Logger + host string + remote types.RemoteManager + members map[string]*Session + emmiter events.EventEmmiter +} + +func (manager *SessionManager) New(id string, admin bool, socket types.WebSocket) types.Session { + session := &Session{ + id: id, + admin: admin, + manager: manager, + socket: socket, + logger: manager.logger.With().Str("id", id).Logger(), + connected: false, + } + + manager.members[id] = session + manager.emmiter.Emit("created", id, session) + + if manager.remote.Streaming() != true && len(manager.members) > 0 { + manager.remote.StartStream() + } + + return session +} + +func (manager *SessionManager) HasHost() bool { + return manager.host != "" +} + +func (manager *SessionManager) IsHost(id string) bool { + return manager.host == id +} + +func (manager *SessionManager) SetHost(id string) error { + _, ok := manager.members[id] + if ok { + manager.host = id + manager.emmiter.Emit("host", id) + return nil + } + return fmt.Errorf("invalid session id %s", id) +} + +func (manager *SessionManager) GetHost() (types.Session, bool) { + host, ok := manager.members[manager.host] + return host, ok +} + +func (manager *SessionManager) ClearHost() { + id := manager.host + manager.host = "" + manager.emmiter.Emit("host_cleared", id) +} + +func (manager *SessionManager) Has(id string) bool { + _, ok := manager.members[id] + return ok +} + +func (manager *SessionManager) Get(id string) (types.Session, bool) { + session, ok := manager.members[id] + return session, ok +} + +func (manager *SessionManager) Admins() []*types.Member { + members := []*types.Member{} + for _, session := range manager.members { + if !session.connected || !session.admin { + continue + } + + member := session.Member() + if member != nil { + members = append(members, member) + } + } + return members +} + +func (manager *SessionManager) Members() []*types.Member { + members := []*types.Member{} + for _, session := range manager.members { + if !session.connected { + continue + } + + member := session.Member() + if member != nil { + members = append(members, member) + } + } + return members +} + +func (manager *SessionManager) Destroy(id string) error { + session, ok := manager.members[id] + if ok { + err := session.destroy() + delete(manager.members, id) + + if manager.remote.Streaming() != false && len(manager.members) <= 0 { + manager.remote.StopStream() + } + + manager.emmiter.Emit("destroyed", id, session) + return err + } + + return nil +} + +func (manager *SessionManager) Clear() error { + return nil +} + +func (manager *SessionManager) Broadcast(v interface{}, exclude interface{}) error { + for id, session := range manager.members { + if !session.connected { + continue + } + + if exclude != nil { + if in, _ := utils.ArrayIn(id, exclude); in { + continue + } + } + + if err := session.Send(v); err != nil { + return err + } + } + return nil +} + +func (manager *SessionManager) OnHost(listener func(id string)) { + manager.emmiter.On("host", func(payload ...interface{}) { + listener(payload[0].(string)) + }) +} + +func (manager *SessionManager) OnHostCleared(listener func(id string)) { + manager.emmiter.On("host_cleared", func(payload ...interface{}) { + listener(payload[0].(string)) + }) +} + +func (manager *SessionManager) OnDestroy(listener func(id string, session types.Session)) { + manager.emmiter.On("destroyed", func(payload ...interface{}) { + listener(payload[0].(string), payload[1].(*Session)) + }) +} + +func (manager *SessionManager) OnCreated(listener func(id string, session types.Session)) { + manager.emmiter.On("created", func(payload ...interface{}) { + listener(payload[0].(string), payload[1].(*Session)) + }) +} + +func (manager *SessionManager) OnConnected(listener func(id string, session types.Session)) { + manager.emmiter.On("connected", func(payload ...interface{}) { + listener(payload[0].(string), payload[1].(*Session)) + }) +} diff --git a/internal/session/session.go b/internal/session/session.go new file mode 100644 index 00000000..b9733a78 --- /dev/null +++ b/internal/session/session.go @@ -0,0 +1,137 @@ +package session + +import ( + "sync" + + "github.com/rs/zerolog" + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/event" + "n.eko.moe/neko/internal/types/message" +) + +type Session struct { + logger zerolog.Logger + id string + name string + admin bool + muted bool + connected bool + manager *SessionManager + socket types.WebSocket + peer types.Peer + mu sync.Mutex +} + +func (session *Session) ID() string { + return session.id +} + +func (session *Session) Name() string { + return session.name +} + +func (session *Session) Admin() bool { + return session.admin +} + +func (session *Session) Muted() bool { + return session.muted +} + +func (session *Session) Connected() bool { + return session.connected +} + +func (session *Session) Address() string { + if session.socket == nil { + return "" + } + return session.socket.Address() +} + +func (session *Session) Member() *types.Member { + return &types.Member{ + ID: session.id, + Name: session.name, + Admin: session.admin, + Muted: session.muted, + } +} + +func (session *Session) SetMuted(muted bool) { + session.muted = muted +} + +func (session *Session) SetName(name string) error { + session.name = name + return nil +} + +func (session *Session) SetSocket(socket types.WebSocket) error { + session.socket = socket + return nil +} + +func (session *Session) SetPeer(peer types.Peer) error { + session.peer = peer + return nil +} + +func (session *Session) SetConnected(connected bool) error { + session.connected = connected + if connected { + session.manager.emmiter.Emit("connected", session.id, session) + } + return nil +} + +func (session *Session) Kick(reason string) error { + if session.socket == nil { + return nil + } + if err := session.socket.Send(&message.Disconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: reason, + }); err != nil { + return err + } + + return session.destroy() +} + +func (session *Session) Send(v interface{}) error { + if session.socket == nil { + return nil + } + return session.socket.Send(v) +} + +func (session *Session) Write(v interface{}) error { + if session.socket == nil { + return nil + } + return session.socket.Send(v) +} + +func (session *Session) SignalAnswer(sdp string) error { + if session.peer == nil { + return nil + } + return session.peer.SignalAnswer(sdp) +} + +func (session *Session) destroy() error { + if session.socket != nil { + if err := session.socket.Destroy(); err != nil { + return err + } + } + + if session.peer != nil { + if err := session.peer.Destroy(); err != nil { + return err + } + } + + return nil +} diff --git a/internal/types/broadcast.go b/internal/types/broadcast.go new file mode 100644 index 00000000..fee3fd52 --- /dev/null +++ b/internal/types/broadcast.go @@ -0,0 +1,10 @@ +package types + +type BroadcastManager interface { + Start() + Stop() + IsActive() bool + Create(url string) + Destroy() + GetUrl() string +} diff --git a/internal/types/config/broadcast.go b/internal/types/config/broadcast.go new file mode 100644 index 00000000..22ef94ac --- /dev/null +++ b/internal/types/config/broadcast.go @@ -0,0 +1,23 @@ +package config + +import ( + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +type Broadcast struct { + Pipeline string +} + +func (Broadcast) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().String("broadcast_pipeline", "", "audio codec parameters to use for broadcasting") + if err := viper.BindPFlag("broadcast_pipeline", cmd.PersistentFlags().Lookup("broadcast_pipeline")); err != nil { + return err + } + + return nil +} + +func (s *Broadcast) Set() { + s.Pipeline = viper.GetString("broadcast_pipeline") +} diff --git a/internal/types/config/config.go b/internal/types/config/config.go new file mode 100644 index 00000000..68a2abc2 --- /dev/null +++ b/internal/types/config/config.go @@ -0,0 +1,8 @@ +package config + +import "github.com/spf13/cobra" + +type Config interface { + Init(cmd *cobra.Command) error + Set() +} diff --git a/internal/types/config/remote.go b/internal/types/config/remote.go new file mode 100644 index 00000000..045a840b --- /dev/null +++ b/internal/types/config/remote.go @@ -0,0 +1,136 @@ +package config + +import ( + "regexp" + "strconv" + + "github.com/pion/webrtc/v2" + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +type Remote struct { + Display string + Device string + AudioCodec string + AudioParams string + VideoCodec string + VideoParams string + ScreenWidth int + ScreenHeight int + ScreenRate int +} + +func (Remote) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().String("display", ":99.0", "XDisplay to capture") + if err := viper.BindPFlag("display", cmd.PersistentFlags().Lookup("display")); err != nil { + return err + } + + cmd.PersistentFlags().String("device", "auto_null.monitor", "audio device to capture") + if err := viper.BindPFlag("device", cmd.PersistentFlags().Lookup("device")); err != nil { + return err + } + + cmd.PersistentFlags().String("audio", "", "audio codec parameters to use for streaming") + if err := viper.BindPFlag("audio", cmd.PersistentFlags().Lookup("audio")); err != nil { + return err + } + + cmd.PersistentFlags().String("video", "", "video codec parameters to use for streaming") + if err := viper.BindPFlag("video", cmd.PersistentFlags().Lookup("video")); err != nil { + return err + } + + cmd.PersistentFlags().String("screen", "1280x720@30", "default screen resolution and framerate") + if err := viper.BindPFlag("screen", cmd.PersistentFlags().Lookup("screen")); err != nil { + return err + } + + // video codecs + cmd.PersistentFlags().Bool("vp8", false, "use VP8 video codec") + if err := viper.BindPFlag("vp8", cmd.PersistentFlags().Lookup("vp8")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("vp9", false, "use VP9 video codec") + if err := viper.BindPFlag("vp9", cmd.PersistentFlags().Lookup("vp9")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("h264", false, "use H264 video codec") + if err := viper.BindPFlag("h264", cmd.PersistentFlags().Lookup("h264")); err != nil { + return err + } + + // audio codecs + cmd.PersistentFlags().Bool("opus", false, "use Opus audio codec") + if err := viper.BindPFlag("opus", cmd.PersistentFlags().Lookup("opus")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("g722", false, "use G722 audio codec") + if err := viper.BindPFlag("g722", cmd.PersistentFlags().Lookup("g722")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("pcmu", false, "use PCMU audio codec") + if err := viper.BindPFlag("pcmu", cmd.PersistentFlags().Lookup("pcmu")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("pcma", false, "use PCMA audio codec") + if err := viper.BindPFlag("pcma", cmd.PersistentFlags().Lookup("pcma")); err != nil { + return err + } + + return nil +} + +func (s *Remote) Set() { + videoCodec := webrtc.VP8 + if viper.GetBool("vp8") { + videoCodec = webrtc.VP8 + } else if viper.GetBool("vp9") { + videoCodec = webrtc.VP9 + } else if viper.GetBool("h264") { + videoCodec = webrtc.H264 + } + + audioCodec := webrtc.Opus + if viper.GetBool("opus") { + audioCodec = webrtc.Opus + } else if viper.GetBool("g722") { + audioCodec = webrtc.G722 + } else if viper.GetBool("pcmu") { + audioCodec = webrtc.PCMU + } else if viper.GetBool("pcma") { + audioCodec = webrtc.PCMA + } + + s.Device = viper.GetString("device") + s.AudioCodec = audioCodec + s.AudioParams = viper.GetString("audio") + s.Display = viper.GetString("display") + s.VideoCodec = videoCodec + s.VideoParams = viper.GetString("video") + + s.ScreenWidth = 1280 + s.ScreenHeight = 720 + s.ScreenRate = 30 + + r := regexp.MustCompile(`([0-9]{1,4})x([0-9]{1,4})@([0-9]{1,3})`) + res := r.FindStringSubmatch(viper.GetString("screen")) + + if len(res) > 0 { + width, err1 := strconv.ParseInt(res[1], 10, 64) + height, err2 := strconv.ParseInt(res[2], 10, 64) + rate, err3 := strconv.ParseInt(res[3], 10, 64) + + if err1 == nil && err2 == nil && err3 == nil { + s.ScreenWidth = int(width) + s.ScreenHeight = int(height) + s.ScreenRate = int(rate) + } + } +} diff --git a/internal/types/config/root.go b/internal/types/config/root.go new file mode 100644 index 00000000..0223d7b2 --- /dev/null +++ b/internal/types/config/root.go @@ -0,0 +1,37 @@ +package config + +import ( + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +type Root struct { + Debug bool + Logs bool + CfgFile string +} + +func (Root) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().BoolP("debug", "d", false, "enable debug mode") + if err := viper.BindPFlag("debug", cmd.PersistentFlags().Lookup("debug")); err != nil { + return err + } + + cmd.PersistentFlags().BoolP("logs", "l", false, "save logs to file") + if err := viper.BindPFlag("logs", cmd.PersistentFlags().Lookup("logs")); err != nil { + return err + } + + cmd.PersistentFlags().String("config", "", "configuration file path") + if err := viper.BindPFlag("config", cmd.PersistentFlags().Lookup("config")); err != nil { + return err + } + + return nil +} + +func (s *Root) Set() { + s.Logs = viper.GetBool("logs") + s.Debug = viper.GetBool("debug") + s.CfgFile = viper.GetString("config") +} diff --git a/internal/types/config/server.go b/internal/types/config/server.go new file mode 100644 index 00000000..fcb4b912 --- /dev/null +++ b/internal/types/config/server.go @@ -0,0 +1,44 @@ +package config + +import ( + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +type Server struct { + Cert string + Key string + Bind string + Static string +} + +func (Server) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().String("bind", "127.0.0.1:8080", "address/port/socket to serve neko") + if err := viper.BindPFlag("bind", cmd.PersistentFlags().Lookup("bind")); err != nil { + return err + } + + cmd.PersistentFlags().String("cert", "", "path to the SSL cert used to secure the neko server") + if err := viper.BindPFlag("cert", cmd.PersistentFlags().Lookup("cert")); err != nil { + return err + } + + cmd.PersistentFlags().String("key", "", "path to the SSL key used to secure the neko server") + if err := viper.BindPFlag("key", cmd.PersistentFlags().Lookup("key")); err != nil { + return err + } + + cmd.PersistentFlags().String("static", "./www", "path to neko client files to serve") + if err := viper.BindPFlag("static", cmd.PersistentFlags().Lookup("static")); err != nil { + return err + } + + return nil +} + +func (s *Server) Set() { + s.Cert = viper.GetString("cert") + s.Key = viper.GetString("key") + s.Bind = viper.GetString("bind") + s.Static = viper.GetString("static") +} diff --git a/internal/types/config/webrtc.go b/internal/types/config/webrtc.go new file mode 100644 index 00000000..5d76832c --- /dev/null +++ b/internal/types/config/webrtc.go @@ -0,0 +1,79 @@ +package config + +import ( + "strconv" + "strings" + + "github.com/spf13/cobra" + "github.com/spf13/viper" + "n.eko.moe/neko/internal/utils" +) + +type WebRTC struct { + ICELite bool + ICEServers []string + EphemeralMin uint16 + EphemeralMax uint16 + NAT1To1IPs []string +} + +func (WebRTC) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().String("epr", "59000-59100", "limits the pool of ephemeral ports that ICE UDP connections can allocate from") + if err := viper.BindPFlag("epr", cmd.PersistentFlags().Lookup("epr")); err != nil { + return err + } + + cmd.PersistentFlags().StringSlice("nat1to1", []string{}, "sets a list of external IP addresses of 1:1 (D)NAT and a candidate type for which the external IP address is used") + if err := viper.BindPFlag("nat1to1", cmd.PersistentFlags().Lookup("nat1to1")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("icelite", false, "configures whether or not the ice agent should be a lite agent") + if err := viper.BindPFlag("icelite", cmd.PersistentFlags().Lookup("icelite")); err != nil { + return err + } + + cmd.PersistentFlags().StringSlice("iceserver", []string{"stun:stun.l.google.com:19302"}, "describes a single STUN and TURN server that can be used by the ICEAgent to establish a connection with a peer") + if err := viper.BindPFlag("iceserver", cmd.PersistentFlags().Lookup("iceserver")); err != nil { + return err + } + + return nil +} + +func (s *WebRTC) Set() { + s.ICELite = viper.GetBool("icelite") + s.ICEServers = viper.GetStringSlice("iceserver") + s.NAT1To1IPs = viper.GetStringSlice("nat1to1") + + if len(s.NAT1To1IPs) == 0 { + ip, err := utils.GetIP() + if err == nil { + s.NAT1To1IPs = append(s.NAT1To1IPs, ip) + } + } + + min := uint16(59000) + max := uint16(59100) + epr := viper.GetString("epr") + ports := strings.SplitN(epr, "-", -1) + if len(ports) > 1 { + start, err := strconv.ParseUint(ports[0], 10, 16) + if err == nil { + min = uint16(start) + } + + end, err := strconv.ParseUint(ports[1], 10, 16) + if err == nil { + max = uint16(end) + } + } + + if min > max { + s.EphemeralMin = max + s.EphemeralMax = min + } else { + s.EphemeralMin = min + s.EphemeralMax = max + } +} diff --git a/internal/types/config/websocket.go b/internal/types/config/websocket.go new file mode 100644 index 00000000..099f34bd --- /dev/null +++ b/internal/types/config/websocket.go @@ -0,0 +1,37 @@ +package config + +import ( + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +type WebSocket struct { + Password string + AdminPassword string + Proxy bool +} + +func (WebSocket) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().String("password", "neko", "password for connecting to stream") + if err := viper.BindPFlag("password", cmd.PersistentFlags().Lookup("password")); err != nil { + return err + } + + cmd.PersistentFlags().String("password_admin", "admin", "admin password for connecting to stream") + if err := viper.BindPFlag("password_admin", cmd.PersistentFlags().Lookup("password_admin")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("proxy", false, "enable reverse proxy mode") + if err := viper.BindPFlag("proxy", cmd.PersistentFlags().Lookup("proxy")); err != nil { + return err + } + + return nil +} + +func (s *WebSocket) Set() { + s.Password = viper.GetString("password") + s.AdminPassword = viper.GetString("password_admin") + s.Proxy = viper.GetBool("proxy") +} diff --git a/internal/types/event/events.go b/internal/types/event/events.go new file mode 100644 index 00000000..b97c49c8 --- /dev/null +++ b/internal/types/event/events.go @@ -0,0 +1,55 @@ +package event + +const ( + SYSTEM_DISCONNECT = "system/disconnect" +) + +const ( + SIGNAL_ANSWER = "signal/answer" + SIGNAL_PROVIDE = "signal/provide" +) + +const ( + MEMBER_LIST = "member/list" + MEMBER_CONNECTED = "member/connected" + MEMBER_DISCONNECTED = "member/disconnected" +) + +const ( + CONTROL_LOCKED = "control/locked" + CONTROL_RELEASE = "control/release" + CONTROL_REQUEST = "control/request" + CONTROL_REQUESTING = "control/requesting" + CONTROL_GIVE = "control/give" + CONTROL_CLIPBOARD = "control/clipboard" + CONTROL_KEYBOARD = "control/keyboard" +) + +const ( + CHAT_MESSAGE = "chat/message" + CHAT_EMOTE = "chat/emote" +) + +const ( + SCREEN_CONFIGURATIONS = "screen/configurations" + SCREEN_RESOLUTION = "screen/resolution" + SCREEN_SET = "screen/set" +) + +const ( + BORADCAST_STATUS = "broadcast/status" + BORADCAST_CREATE = "broadcast/create" + BORADCAST_DESTROY = "broadcast/destroy" +) + +const ( + ADMIN_BAN = "admin/ban" + ADMIN_KICK = "admin/kick" + ADMIN_LOCK = "admin/lock" + ADMIN_MUTE = "admin/mute" + ADMIN_UNLOCK = "admin/unlock" + ADMIN_UNMUTE = "admin/unmute" + ADMIN_CONTROL = "admin/control" + ADMIN_RELEASE = "admin/release" + ADMIN_GIVE = "admin/give" +) diff --git a/internal/types/keys.go b/internal/types/keys.go new file mode 100644 index 00000000..f8a2fd16 --- /dev/null +++ b/internal/types/keys.go @@ -0,0 +1,14 @@ +package types + +type Button struct { + Name string + Code int + Keysym int +} + +type Key struct { + Name string + Value string + Code int + Keysym int +} diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go new file mode 100644 index 00000000..fcf04f30 --- /dev/null +++ b/internal/types/message/messages.go @@ -0,0 +1,123 @@ +package message + +import ( + "n.eko.moe/neko/internal/types" +) + +type Message struct { + Event string `json:"event"` +} + +type Disconnect struct { + Event string `json:"event"` + Message string `json:"message"` +} + +type SignalProvide struct { + Event string `json:"event"` + ID string `json:"id"` + SDP string `json:"sdp"` + Lite bool `json:"lite"` + ICE []string `json:"ice"` +} + +type SignalAnswer struct { + Event string `json:"event"` + DisplayName string `json:"displayname"` + SDP string `json:"sdp"` +} + +type MembersList struct { + Event string `json:"event"` + Memebers []*types.Member `json:"members"` +} + +type Member struct { + Event string `json:"event"` + *types.Member +} +type MemberDisconnected struct { + Event string `json:"event"` + ID string `json:"id"` +} + +type Clipboard struct { + Event string `json:"event"` + Text string `json:"text"` +} + +type Keyboard struct { + Event string `json:"event"` + Layout *string `json:"layout,omitempty"` + CapsLock *bool `json:"capsLock,omitempty"` + NumLock *bool `json:"numLock,omitempty"` + ScrollLock *bool `json:"scrollLock,omitempty"` +} + +type Control struct { + Event string `json:"event"` + ID string `json:"id"` +} + +type ControlTarget struct { + Event string `json:"event"` + ID string `json:"id"` + Target string `json:"target"` +} + +type ChatReceive struct { + Event string `json:"event"` + Content string `json:"content"` +} + +type ChatSend struct { + Event string `json:"event"` + ID string `json:"id"` + Content string `json:"content"` +} + +type EmoteReceive struct { + Event string `json:"event"` + Emote string `json:"emote"` +} + +type EmoteSend struct { + Event string `json:"event"` + ID string `json:"id"` + Emote string `json:"emote"` +} + +type Admin struct { + Event string `json:"event"` + ID string `json:"id"` +} + +type AdminTarget struct { + Event string `json:"event"` + Target string `json:"target"` + ID string `json:"id"` +} + +type ScreenResolution struct { + Event string `json:"event"` + ID string `json:"id,omitempty"` + Width int `json:"width"` + Height int `json:"height"` + Rate int `json:"rate"` +} + +type ScreenConfigurations struct { + Event string `json:"event"` + Configurations map[int]types.ScreenConfiguration `json:"configurations"` +} + +type BroadcastStatus struct { + Event string `json:"event"` + URL string `json:"url"` + IsActive bool `json:"isActive"` +} + +type BroadcastCreate struct { + Event string `json:"event"` + URL string `json:"url"` +} diff --git a/internal/types/remote.go b/internal/types/remote.go new file mode 100644 index 00000000..b437d108 --- /dev/null +++ b/internal/types/remote.go @@ -0,0 +1,27 @@ +package types + +type RemoteManager interface { + VideoCodec() string + AudioCodec() string + Start() + Shutdown() error + OnVideoFrame(listener func(sample Sample)) + OnAudioFrame(listener func(sample Sample)) + StartStream() + StopStream() + Streaming() bool + ChangeResolution(width int, height int, rate int) error + GetScreenSize() *ScreenSize + ScreenConfigurations() map[int]ScreenConfiguration + Move(x, y int) + Scroll(x, y int) + ButtonDown(code int) error + KeyDown(code uint64) error + ButtonUp(code int) error + KeyUp(code uint64) error + ReadClipboard() string + WriteClipboard(data string) + ResetKeys() + SetKeyboardLayout(layout string) + SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) +} diff --git a/internal/types/session.go b/internal/types/session.go new file mode 100644 index 00000000..acdcac64 --- /dev/null +++ b/internal/types/session.go @@ -0,0 +1,48 @@ +package types + +type Member struct { + ID string `json:"id"` + Name string `json:"displayname"` + Admin bool `json:"admin"` + Muted bool `json:"muted"` +} + +type Session interface { + ID() string + Name() string + Admin() bool + Muted() bool + Connected() bool + Member() *Member + SetMuted(muted bool) + SetName(name string) error + SetConnected(connected bool) error + SetSocket(socket WebSocket) error + SetPeer(peer Peer) error + Address() string + Kick(message string) error + Write(v interface{}) error + Send(v interface{}) error + SignalAnswer(sdp string) error +} + +type SessionManager interface { + New(id string, admin bool, socket WebSocket) Session + HasHost() bool + IsHost(id string) bool + SetHost(id string) error + GetHost() (Session, bool) + ClearHost() + Has(id string) bool + Get(id string) (Session, bool) + Members() []*Member + Admins() []*Member + Destroy(id string) error + Clear() error + Broadcast(v interface{}, exclude interface{}) error + OnHost(listener func(id string)) + OnHostCleared(listener func(id string)) + OnDestroy(listener func(id string, session Session)) + OnCreated(listener func(id string, session Session)) + OnConnected(listener func(id string, session Session)) +} diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go new file mode 100644 index 00000000..d0da61e7 --- /dev/null +++ b/internal/types/webrtc.go @@ -0,0 +1,18 @@ +package types + +type Sample struct { + Data []byte + Samples uint32 +} + +type WebRTCManager interface { + Start() + Shutdown() error + CreatePeer(id string, session Session) (string, bool, []string, error) +} + +type Peer interface { + SignalAnswer(sdp string) error + WriteData(v interface{}) error + Destroy() error +} diff --git a/internal/types/webscoket.go b/internal/types/webscoket.go new file mode 100644 index 00000000..d5b63360 --- /dev/null +++ b/internal/types/webscoket.go @@ -0,0 +1,15 @@ +package types + +import "net/http" + +type WebSocket interface { + Address() string + Send(v interface{}) error + Destroy() error +} + +type WebSocketHandler interface { + Start() error + Shutdown() error + Upgrade(w http.ResponseWriter, r *http.Request) error +} diff --git a/internal/types/xorg.go b/internal/types/xorg.go new file mode 100644 index 00000000..dec51611 --- /dev/null +++ b/internal/types/xorg.go @@ -0,0 +1,13 @@ +package types + +type ScreenSize struct { + Width int `json:"width"` + Height int `json:"height"` + Rate int16 `json:"rate"` +} + +type ScreenConfiguration struct { + Width int `json:"width"` + Height int `json:"height"` + Rates map[int]int16 `json:"rates"` +} diff --git a/internal/utils/array.go b/internal/utils/array.go new file mode 100644 index 00000000..b4202735 --- /dev/null +++ b/internal/utils/array.go @@ -0,0 +1,24 @@ +package utils + +import ( + "reflect" +) + +func ArrayIn(val interface{}, array interface{}) (exists bool, index int) { + exists = false + index = -1 + + switch reflect.TypeOf(array).Kind() { + case reflect.Slice: + s := reflect.ValueOf(array) + for i := 0; i < s.Len(); i++ { + if reflect.DeepEqual(val, s.Index(i).Interface()) == true { + index = i + exists = true + return + } + } + } + + return +} diff --git a/internal/utils/color.go b/internal/utils/color.go new file mode 100644 index 00000000..919887c2 --- /dev/null +++ b/internal/utils/color.go @@ -0,0 +1,34 @@ +package utils + +import ( + "fmt" + "regexp" +) + +const ( + char = "&" +) + +// Colors: http://www.lihaoyi.com/post/BuildyourownCommandLinewithANSIescapecodes.html +var re = regexp.MustCompile(char + `(?m)([0-9]{1,2};[0-9]{1,2}|[0-9]{1,2})`) + +func Color(str string) string { + result := "" + lastIndex := 0 + + for _, v := range re.FindAllSubmatchIndex([]byte(str), -1) { + groups := []string{} + for i := 0; i < len(v); i += 2 { + groups = append(groups, str[v[i]:v[i+1]]) + } + + result += str[lastIndex:v[0]] + "\033[" + groups[1] + "m" + lastIndex = v[1] + } + + return result + str[lastIndex:] +} + +func Colorf(format string, a ...interface{}) string { + return fmt.Sprintf(Color(format), a...) +} diff --git a/internal/utils/ip.go b/internal/utils/ip.go new file mode 100644 index 00000000..67c7d38d --- /dev/null +++ b/internal/utils/ip.go @@ -0,0 +1,35 @@ +package utils + +import ( + "bytes" + "io/ioutil" + "net/http" +) + +// dig @resolver1.opendns.com ANY myip.opendns.com +short -4 + +func GetIP() (string, error) { + rsp, err := http.Get("http://checkip.amazonaws.com") + if err != nil { + return "", err + } + defer rsp.Body.Close() + + buf, err := ioutil.ReadAll(rsp.Body) + if err != nil { + return "", err + } + + return string(bytes.TrimSpace(buf)), nil +} + +func ReadUserIP(r *http.Request) string { + IPAddress := r.Header.Get("X-Real-Ip") + if IPAddress == "" { + IPAddress = r.Header.Get("X-Forwarded-For") + } + if IPAddress == "" { + IPAddress = r.RemoteAddr + } + return IPAddress +} diff --git a/internal/utils/json.go b/internal/utils/json.go new file mode 100644 index 00000000..7ea0494d --- /dev/null +++ b/internal/utils/json.go @@ -0,0 +1,10 @@ +package utils + +import "encoding/json" + +func Unmarshal(in interface{}, raw []byte, callback func() error) error { + if err := json.Unmarshal(raw, &in); err != nil { + return err + } + return callback() +} diff --git a/internal/utils/uid.go b/internal/utils/uid.go new file mode 100644 index 00000000..0f4216a0 --- /dev/null +++ b/internal/utils/uid.go @@ -0,0 +1,98 @@ +package utils + +import ( + "crypto/rand" + "fmt" + "math" +) + +const ( + defaultAlphabet = "_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" // len=64 + defaultSize = 21 + defaultMaskSize = 5 +) + +// Generator function +type Generator func([]byte) (int, error) + +// BytesGenerator is the default bytes generator +var BytesGenerator Generator = rand.Read + +func initMasks(params ...int) []uint { + var size int + if len(params) == 0 { + size = defaultMaskSize + } else { + size = params[0] + } + masks := make([]uint, size) + for i := 0; i < size; i++ { + shift := 3 + i + masks[i] = (2 << uint(shift)) - 1 + } + return masks +} + +func getMask(alphabet string, masks []uint) int { + for i := 0; i < len(masks); i++ { + curr := int(masks[i]) + if curr >= len(alphabet)-1 { + return curr + } + } + return 0 +} + +// GenerateUID is a low-level function to change alphabet and ID size. +func GenerateUID(alphabet string, size int) (string, error) { + if len(alphabet) == 0 || len(alphabet) > 255 { + return "", fmt.Errorf("alphabet must not empty and contain no more than 255 chars. Current len is %d", len(alphabet)) + } + if size <= 0 { + return "", fmt.Errorf("size must be positive integer") + } + + masks := initMasks(size) + mask := getMask(alphabet, masks) + ceilArg := 1.6 * float64(mask*size) / float64(len(alphabet)) + step := int(math.Ceil(ceilArg)) + + id := make([]byte, size) + bytes := make([]byte, step) + for j := 0; ; { + _, err := BytesGenerator(bytes) + if err != nil { + return "", err + } + for i := 0; i < step; i++ { + currByte := bytes[i] & byte(mask) + if currByte < byte(len(alphabet)) { + id[j] = alphabet[currByte] + j++ + if j == size { + return string(id[:size]), nil + } + } + } + } +} + +// NewUID generates secure URL-friendly unique ID. +func NewUID(param ...int) (string, error) { + var size int + if len(param) == 0 { + size = defaultSize + } else { + size = param[0] + } + bytes := make([]byte, size) + _, err := BytesGenerator(bytes) + if err != nil { + return "", err + } + id := make([]byte, size) + for i := 0; i < size; i++ { + id[i] = defaultAlphabet[bytes[i]&63] + } + return string(id[:size]), nil +} diff --git a/internal/webrtc/handle.go b/internal/webrtc/handle.go new file mode 100644 index 00000000..35c4b235 --- /dev/null +++ b/internal/webrtc/handle.go @@ -0,0 +1,137 @@ +package webrtc + +import ( + "bytes" + "encoding/binary" + "strconv" + + "github.com/pion/webrtc/v2" +) + +const OP_MOVE = 0x01 +const OP_SCROLL = 0x02 +const OP_KEY_DOWN = 0x03 +const OP_KEY_UP = 0x04 +const OP_KEY_CLK = 0x05 + +type PayloadHeader struct { + Event uint8 + Length uint16 +} + +type PayloadMove struct { + PayloadHeader + X uint16 + Y uint16 +} + +type PayloadScroll struct { + PayloadHeader + X int16 + Y int16 +} + +type PayloadKey struct { + PayloadHeader + Key uint64 +} + +func (manager *WebRTCManager) handle(id string, msg webrtc.DataChannelMessage) error { + if !manager.sessions.IsHost(id) { + return nil + } + + buffer := bytes.NewBuffer(msg.Data) + header := &PayloadHeader{} + hbytes := make([]byte, 3) + + if _, err := buffer.Read(hbytes); err != nil { + return err + } + + if err := binary.Read(bytes.NewBuffer(hbytes), binary.LittleEndian, header); err != nil { + return err + } + + buffer = bytes.NewBuffer(msg.Data) + + switch header.Event { + case OP_MOVE: + payload := &PayloadMove{} + if err := binary.Read(buffer, binary.LittleEndian, payload); err != nil { + return err + } + + manager.remote.Move(int(payload.X), int(payload.Y)) + break + case OP_SCROLL: + payload := &PayloadScroll{} + if err := binary.Read(buffer, binary.LittleEndian, payload); err != nil { + return err + } + + manager.logger. + Debug(). + Str("x", strconv.Itoa(int(payload.X))). + Str("y", strconv.Itoa(int(payload.Y))). + Msg("scroll") + + manager.remote.Scroll(int(payload.X), int(payload.Y)) + break + case OP_KEY_DOWN: + payload := &PayloadKey{} + if err := binary.Read(buffer, binary.LittleEndian, payload); err != nil { + return err + } + + if payload.Key < 8 { + err := manager.remote.ButtonDown(int(payload.Key)) + if err != nil { + manager.logger.Warn().Err(err).Msg("button down failed") + return nil + } + + manager.logger.Debug().Msgf("button down %d", payload.Key) + } else { + err := manager.remote.KeyDown(uint64(payload.Key)) + if err != nil { + manager.logger.Warn().Err(err).Msg("key down failed") + return nil + } + + manager.logger.Debug().Msgf("key down %d", payload.Key) + } + + break + case OP_KEY_UP: + payload := &PayloadKey{} + err := binary.Read(buffer, binary.LittleEndian, payload) + if err != nil { + return err + } + + if payload.Key < 8 { + err := manager.remote.ButtonUp(int(payload.Key)) + if err != nil { + manager.logger.Warn().Err(err).Msg("button up failed") + return nil + } + + manager.logger.Debug().Msgf("button up %d", payload.Key) + } else { + err := manager.remote.KeyUp(uint64(payload.Key)) + if err != nil { + manager.logger.Warn().Err(err).Msg("key up failed") + return nil + } + + manager.logger.Debug().Msgf("key up %d", payload.Key) + } + break + case OP_KEY_CLK: + // unused + break + } + + return nil +} diff --git a/internal/webrtc/logger.go b/internal/webrtc/logger.go new file mode 100644 index 00000000..52764867 --- /dev/null +++ b/internal/webrtc/logger.go @@ -0,0 +1,66 @@ +package webrtc + +import ( + "fmt" + "strings" + + "github.com/pion/logging" + "github.com/rs/zerolog" +) + +type nulllog struct{} + +func (l nulllog) Trace(msg string) {} +func (l nulllog) Tracef(format string, args ...interface{}) {} +func (l nulllog) Debug(msg string) {} +func (l nulllog) Debugf(format string, args ...interface{}) {} +func (l nulllog) Info(msg string) {} +func (l nulllog) Infof(format string, args ...interface{}) {} +func (l nulllog) Warn(msg string) {} +func (l nulllog) Warnf(format string, args ...interface{}) {} +func (l nulllog) Error(msg string) {} +func (l nulllog) Errorf(format string, args ...interface{}) {} + +type logger struct { + logger zerolog.Logger + subsystem string +} + +func (l logger) Trace(msg string) { l.logger.Trace().Msg(msg) } +func (l logger) Tracef(format string, args ...interface{}) { l.logger.Trace().Msgf(format, args...) } +func (l logger) Debug(msg string) { l.logger.Debug().Msg(msg) } +func (l logger) Debugf(format string, args ...interface{}) { l.logger.Debug().Msgf(format, args...) } +func (l logger) Info(msg string) { + if strings.Contains(msg, "packetio.Buffer is full") { + //l.logger.Panic().Msg(msg) + return + } + l.logger.Info().Msg(msg) +} +func (l logger) Infof(format string, args ...interface{}) { + msg := fmt.Sprintf(format, args...) + if strings.Contains(msg, "packetio.Buffer is full") { + // l.logger.Panic().Msg(msg) + return + } + l.logger.Info().Msg(msg) +} +func (l logger) Warn(msg string) { l.logger.Warn().Msg(msg) } +func (l logger) Warnf(format string, args ...interface{}) { l.logger.Warn().Msgf(format, args...) } +func (l logger) Error(msg string) { l.logger.Error().Msg(msg) } +func (l logger) Errorf(format string, args ...interface{}) { l.logger.Error().Msgf(format, args...) } + +type loggerFactory struct { + logger zerolog.Logger +} + +func (l loggerFactory) NewLogger(subsystem string) logging.LeveledLogger { + if subsystem == "sctp" { + return nulllog{} + } + + return logger{ + subsystem: subsystem, + logger: l.logger.With().Str("subsystem", subsystem).Logger(), + } +} diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go new file mode 100644 index 00000000..f82c4fa7 --- /dev/null +++ b/internal/webrtc/peer.go @@ -0,0 +1,38 @@ +package webrtc + +import ( + "sync" + + "github.com/pion/webrtc/v2" +) + +type Peer struct { + id string + api *webrtc.API + engine *webrtc.MediaEngine + manager *WebRTCManager + settings *webrtc.SettingEngine + connection *webrtc.PeerConnection + configuration *webrtc.Configuration + mu sync.Mutex +} + +func (peer *Peer) SignalAnswer(sdp string) error { + return peer.connection.SetRemoteDescription(webrtc.SessionDescription{SDP: sdp, Type: webrtc.SDPTypeAnswer}) +} + +func (peer *Peer) WriteData(v interface{}) error { + peer.mu.Lock() + defer peer.mu.Unlock() + return nil +} + +func (peer *Peer) Destroy() error { + if peer.connection != nil && peer.connection.ConnectionState() == webrtc.PeerConnectionStateConnected { + if err := peer.connection.Close(); err != nil { + return err + } + } + + return nil +} diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go new file mode 100644 index 00000000..b658ecb8 --- /dev/null +++ b/internal/webrtc/webrtc.go @@ -0,0 +1,201 @@ +package webrtc + +import ( + "fmt" + "io" + "math/rand" + "strings" + + "github.com/pion/webrtc/v2" + "github.com/pion/webrtc/v2/pkg/media" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/config" +) + +func New(sessions types.SessionManager, remote types.RemoteManager, config *config.WebRTC) *WebRTCManager { + return &WebRTCManager{ + logger: log.With().Str("module", "webrtc").Logger(), + remote: remote, + sessions: sessions, + config: config, + } +} + +type WebRTCManager struct { + logger zerolog.Logger + videoTrack *webrtc.Track + audioTrack *webrtc.Track + videoCodec *webrtc.RTPCodec + audioCodec *webrtc.RTPCodec + sessions types.SessionManager + remote types.RemoteManager + config *config.WebRTC +} + +func (manager *WebRTCManager) Start() { + var err error + manager.audioTrack, manager.audioCodec, err = manager.createTrack(manager.remote.AudioCodec()) + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to create audio track") + } + + manager.remote.OnAudioFrame(func(sample types.Sample) { + if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { + manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") + } + }) + + manager.videoTrack, manager.videoCodec, err = manager.createTrack(manager.remote.VideoCodec()) + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to create video track") + } + + manager.remote.OnVideoFrame(func(sample types.Sample) { + if err := manager.videoTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { + manager.logger.Warn().Err(err).Msg("video pipeline failed to write") + } + }) + + manager.logger.Info(). + Str("ice_lite", fmt.Sprintf("%t", manager.config.ICELite)). + Str("ice_servers", strings.Join(manager.config.ICEServers, ",")). + Str("ephemeral_port_range", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)). + Str("nat_ips", strings.Join(manager.config.NAT1To1IPs, ",")). + Msgf("webrtc starting") +} + +func (manager *WebRTCManager) Shutdown() error { + manager.logger.Info().Msgf("webrtc shutting down") + return nil +} + +func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (string, bool, []string, error) { + configuration := &webrtc.Configuration{ + ICEServers: []webrtc.ICEServer{ + { + URLs: manager.config.ICEServers, + }, + }, + SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, + } + + settings := webrtc.SettingEngine{ + LoggerFactory: loggerFactory{ + logger: manager.logger, + }, + } + + if manager.config.ICELite { + configuration = &webrtc.Configuration{ + SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, + } + settings.SetLite(true) + } + + settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) + settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) + + // Create MediaEngine based off sdp + engine := webrtc.MediaEngine{} + + engine.RegisterCodec(manager.audioCodec) + engine.RegisterCodec(manager.videoCodec) + + // Create API with MediaEngine and SettingEngine + api := webrtc.NewAPI(webrtc.WithMediaEngine(engine), webrtc.WithSettingEngine(settings)) + + // Create new peer connection + connection, err := api.NewPeerConnection(*configuration) + if err != nil { + return "", manager.config.ICELite, manager.config.ICEServers, err + } + + if _, err = connection.AddTransceiverFromTrack(manager.videoTrack, webrtc.RtpTransceiverInit{ + Direction: webrtc.RTPTransceiverDirectionSendonly, + }); err != nil { + return "", manager.config.ICELite, manager.config.ICEServers, err + } + + if _, err = connection.AddTransceiverFromTrack(manager.audioTrack, webrtc.RtpTransceiverInit{ + Direction: webrtc.RTPTransceiverDirectionSendonly, + }); err != nil { + return "", manager.config.ICELite, manager.config.ICEServers, err + } + + description, err := connection.CreateOffer(nil) + if err != nil { + return "", manager.config.ICELite, manager.config.ICEServers, err + } + + connection.OnDataChannel(func(d *webrtc.DataChannel) { + d.OnMessage(func(msg webrtc.DataChannelMessage) { + if err = manager.handle(id, msg); err != nil { + manager.logger.Warn().Err(err).Msg("data handle failed") + } + }) + }) + + connection.SetLocalDescription(description) + connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { + switch state { + case webrtc.PeerConnectionStateDisconnected: + case webrtc.PeerConnectionStateFailed: + manager.logger.Info().Str("id", id).Msg("peer disconnected") + manager.sessions.Destroy(id) + break + case webrtc.PeerConnectionStateConnected: + manager.logger.Info().Str("id", id).Msg("peer connected") + if err = session.SetConnected(true); err != nil { + manager.logger.Warn().Err(err).Msg("unable to set connected on peer") + manager.sessions.Destroy(id) + } + break + } + }) + + if err := session.SetPeer(&Peer{ + id: id, + api: api, + engine: &engine, + manager: manager, + settings: &settings, + connection: connection, + configuration: configuration, + }); err != nil { + return "", manager.config.ICELite, manager.config.ICEServers, err + } + + return description.SDP, manager.config.ICELite, manager.config.ICEServers, nil +} + +func (m *WebRTCManager) createTrack(codecName string) (*webrtc.Track, *webrtc.RTPCodec, error) { + var codec *webrtc.RTPCodec + switch codecName { + case webrtc.VP8: + codec = webrtc.NewRTPVP8Codec(webrtc.DefaultPayloadTypeVP8, 90000) + case webrtc.VP9: + codec = webrtc.NewRTPVP9Codec(webrtc.DefaultPayloadTypeVP9, 90000) + case webrtc.H264: + codec = webrtc.NewRTPH264Codec(webrtc.DefaultPayloadTypeH264, 90000) + case webrtc.Opus: + codec = webrtc.NewRTPOpusCodec(webrtc.DefaultPayloadTypeOpus, 48000) + case webrtc.G722: + codec = webrtc.NewRTPG722Codec(webrtc.DefaultPayloadTypeG722, 8000) + case webrtc.PCMU: + codec = webrtc.NewRTPPCMUCodec(webrtc.DefaultPayloadTypePCMU, 8000) + case webrtc.PCMA: + codec = webrtc.NewRTPPCMACodec(webrtc.DefaultPayloadTypePCMA, 8000) + default: + return nil, nil, fmt.Errorf("unknown codec %s", codecName) + } + + track, err := webrtc.NewTrack(codec.PayloadType, rand.Uint32(), "stream", "stream", codec) + if err != nil { + return nil, nil, err + } + + return track, codec, nil +} diff --git a/internal/websocket/admin.go b/internal/websocket/admin.go new file mode 100644 index 00000000..1063f279 --- /dev/null +++ b/internal/websocket/admin.go @@ -0,0 +1,298 @@ +package websocket + +import ( + "strings" + + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/event" + "n.eko.moe/neko/internal/types/message" +) + +func (h *MessageHandler) adminLock(id string, session types.Session) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + if h.locked { + h.logger.Debug().Msg("server already locked...") + return nil + } + + h.locked = true + + if err := h.sessions.Broadcast( + message.Admin{ + Event: event.ADMIN_LOCK, + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_LOCK) + return err + } + + return nil +} + +func (h *MessageHandler) adminUnlock(id string, session types.Session) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + if !h.locked { + h.logger.Debug().Msg("server not locked...") + return nil + } + + h.locked = false + + if err := h.sessions.Broadcast( + message.Admin{ + Event: event.ADMIN_UNLOCK, + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_UNLOCK) + return err + } + + return nil +} + +func (h *MessageHandler) adminControl(id string, session types.Session) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + host, ok := h.sessions.GetHost() + + h.sessions.SetHost(id) + + if ok { + if err := h.sessions.Broadcast( + message.AdminTarget{ + Event: event.ADMIN_CONTROL, + ID: id, + Target: host.ID(), + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_CONTROL) + return err + } + } else { + if err := h.sessions.Broadcast( + message.Admin{ + Event: event.ADMIN_CONTROL, + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_CONTROL) + return err + } + } + + return nil +} + +func (h *MessageHandler) adminRelease(id string, session types.Session) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + host, ok := h.sessions.GetHost() + + h.sessions.ClearHost() + + if ok { + if err := h.sessions.Broadcast( + message.AdminTarget{ + Event: event.ADMIN_RELEASE, + ID: id, + Target: host.ID(), + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_RELEASE) + return err + } + } else { + if err := h.sessions.Broadcast( + message.Admin{ + Event: event.ADMIN_RELEASE, + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_RELEASE) + return err + } + } + + return nil +} + +func (h *MessageHandler) adminGive(id string, session types.Session, payload *message.Admin) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + if !h.sessions.Has(payload.ID) { + h.logger.Debug().Str("id", payload.ID).Msg("user does not exist") + return nil + } + + // set host + h.sessions.SetHost(payload.ID) + + // let everyone know + if err := h.sessions.Broadcast( + message.AdminTarget{ + Event: event.CONTROL_GIVE, + ID: id, + Target: payload.ID, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) + return err + } + + return nil +} + +func (h *MessageHandler) adminMute(id string, session types.Session, payload *message.Admin) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + target, ok := h.sessions.Get(payload.ID) + if !ok { + h.logger.Debug().Str("id", payload.ID).Msg("can't find session id") + return nil + } + + if target.Admin() { + h.logger.Debug().Msg("target is an admin, baling") + return nil + } + + target.SetMuted(true) + + if err := h.sessions.Broadcast( + message.AdminTarget{ + Event: event.ADMIN_MUTE, + Target: target.ID(), + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_UNMUTE) + return err + } + + return nil +} + +func (h *MessageHandler) adminUnmute(id string, session types.Session, payload *message.Admin) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + target, ok := h.sessions.Get(payload.ID) + if !ok { + h.logger.Debug().Str("id", payload.ID).Msg("can't find target session") + return nil + } + + target.SetMuted(false) + + if err := h.sessions.Broadcast( + message.AdminTarget{ + Event: event.ADMIN_UNMUTE, + Target: target.ID(), + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_UNMUTE) + return err + } + + return nil +} + +func (h *MessageHandler) adminKick(id string, session types.Session, payload *message.Admin) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + target, ok := h.sessions.Get(payload.ID) + if !ok { + h.logger.Debug().Str("id", payload.ID).Msg("can't find session id") + return nil + } + + if target.Admin() { + h.logger.Debug().Msg("target is an admin, baling") + return nil + } + + if err := target.Kick("kicked"); err != nil { + return err + } + + if err := h.sessions.Broadcast( + message.AdminTarget{ + Event: event.ADMIN_KICK, + Target: target.ID(), + ID: id, + }, []string{payload.ID}); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_KICK) + return err + } + + return nil +} + +func (h *MessageHandler) adminBan(id string, session types.Session, payload *message.Admin) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + target, ok := h.sessions.Get(payload.ID) + if !ok { + h.logger.Debug().Str("id", payload.ID).Msg("can't find session id") + return nil + } + + if target.Admin() { + h.logger.Debug().Msg("target is an admin, baling") + return nil + } + + remote := target.Address() + if remote == "" { + h.logger.Debug().Msg("no remote address, baling") + return nil + } + + address := strings.SplitN(remote, ":", -1) + if len(address[0]) < 1 { + h.logger.Debug().Str("address", remote).Msg("no remote address, baling") + return nil + } + + h.logger.Debug().Str("address", remote).Msg("adding address to banned") + + h.banned[address[0]] = true + + if err := target.Kick("banned"); err != nil { + return err + } + + if err := h.sessions.Broadcast( + message.AdminTarget{ + Event: event.ADMIN_BAN, + Target: target.ID(), + ID: id, + }, []string{payload.ID}); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_BAN) + return err + } + + return nil +} diff --git a/internal/websocket/broadcast.go b/internal/websocket/broadcast.go new file mode 100644 index 00000000..c2d6a884 --- /dev/null +++ b/internal/websocket/broadcast.go @@ -0,0 +1,56 @@ +package websocket + +import ( + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/event" + "n.eko.moe/neko/internal/types/message" +) + +func (h *MessageHandler) boradcastCreate(session types.Session, payload *message.BroadcastCreate) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + h.broadcast.Create(payload.URL) + + if err := h.boradcastStatus(session); err != nil { + return err + } + + return nil +} + +func (h *MessageHandler) boradcastDestroy(session types.Session) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + h.broadcast.Destroy() + + if err := h.boradcastStatus(session); err != nil { + return err + } + + return nil +} + +func (h *MessageHandler) boradcastStatus(session types.Session) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + if err := session.Send( + message.BroadcastStatus{ + Event: event.BORADCAST_STATUS, + IsActive: h.broadcast.IsActive(), + URL: h.broadcast.GetUrl(), + }); err != nil { + h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.BORADCAST_STATUS) + return err + } + + return nil +} diff --git a/internal/websocket/chat.go b/internal/websocket/chat.go new file mode 100644 index 00000000..8f68b5d6 --- /dev/null +++ b/internal/websocket/chat.go @@ -0,0 +1,41 @@ +package websocket + +import ( + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/event" + "n.eko.moe/neko/internal/types/message" +) + +func (h *MessageHandler) chat(id string, session types.Session, payload *message.ChatReceive) error { + if session.Muted() { + return nil + } + + if err := h.sessions.Broadcast( + message.ChatSend{ + Event: event.CHAT_MESSAGE, + Content: payload.Content, + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) + return err + } + return nil +} + +func (h *MessageHandler) chatEmote(id string, session types.Session, payload *message.EmoteReceive) error { + if session.Muted() { + return nil + } + + if err := h.sessions.Broadcast( + message.EmoteSend{ + Event: event.CHAT_EMOTE, + Emote: payload.Emote, + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) + return err + } + return nil +} diff --git a/internal/websocket/control.go b/internal/websocket/control.go new file mode 100644 index 00000000..442ef3f3 --- /dev/null +++ b/internal/websocket/control.go @@ -0,0 +1,163 @@ +package websocket + +import ( + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/event" + "n.eko.moe/neko/internal/types/message" +) + +func (h *MessageHandler) controlRelease(id string, session types.Session) error { + + // check if session is host + if !h.sessions.IsHost(id) { + h.logger.Debug().Str("id", id).Msg("is not the host") + return nil + } + + // release host + h.logger.Debug().Str("id", id).Msgf("host called %s", event.CONTROL_RELEASE) + h.sessions.ClearHost() + + // tell everyone + if err := h.sessions.Broadcast( + message.Control{ + Event: event.CONTROL_RELEASE, + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) + return err + } + + return nil +} + +func (h *MessageHandler) controlRequest(id string, session types.Session) error { + // check for host + if !h.sessions.HasHost() { + // set host + h.sessions.SetHost(id) + + // let everyone know + if err := h.sessions.Broadcast( + message.Control{ + Event: event.CONTROL_LOCKED, + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) + return err + } + + return nil + } + + // get host + host, ok := h.sessions.GetHost() + if ok { + + // tell session there is a host + if err := session.Send(message.Control{ + Event: event.CONTROL_REQUEST, + ID: host.ID(), + }); err != nil { + h.logger.Warn().Err(err).Str("id", id).Msgf("sending event %s has failed", event.CONTROL_REQUEST) + return err + } + + // tell host session wants to be host + if err := host.Send(message.Control{ + Event: event.CONTROL_REQUESTING, + ID: id, + }); err != nil { + h.logger.Warn().Err(err).Str("id", host.ID()).Msgf("sending event %s has failed", event.CONTROL_REQUESTING) + return err + } + } + + return nil +} + +func (h *MessageHandler) controlGive(id string, session types.Session, payload *message.Control) error { + // check if session is host + if !h.sessions.IsHost(id) { + h.logger.Debug().Str("id", id).Msg("is not the host") + return nil + } + + if !h.sessions.Has(payload.ID) { + h.logger.Debug().Str("id", payload.ID).Msg("user does not exist") + return nil + } + + // set host + h.sessions.SetHost(payload.ID) + + // let everyone know + if err := h.sessions.Broadcast( + message.ControlTarget{ + Event: event.CONTROL_GIVE, + ID: id, + Target: payload.ID, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) + return err + } + + return nil +} + +func (h *MessageHandler) controlClipboard(id string, session types.Session, payload *message.Clipboard) error { + // check if session is host + if !h.sessions.IsHost(id) { + h.logger.Debug().Str("id", id).Msg("is not the host") + return nil + } + + h.remote.WriteClipboard(payload.Text) + return nil +} + +func (h *MessageHandler) controlKeyboard(id string, session types.Session, payload *message.Keyboard) error { + // check if session is host + if !h.sessions.IsHost(id) { + h.logger.Debug().Str("id", id).Msg("is not the host") + return nil + } + + // change layout + if payload.Layout != nil { + h.remote.SetKeyboardLayout(*payload.Layout) + } + + // set num lock + var NumLock = 0 + if payload.NumLock == nil { + NumLock = -1 + } else if *payload.NumLock { + NumLock = 1 + } + + // set caps lock + var CapsLock = 0 + if payload.CapsLock == nil { + CapsLock = -1 + } else if *payload.CapsLock { + CapsLock = 1 + } + + // set scroll lock + var ScrollLock = 0 + if payload.ScrollLock == nil { + ScrollLock = -1 + } else if *payload.ScrollLock { + ScrollLock = 1 + } + + h.logger.Debug(). + Int("NumLock", NumLock). + Int("CapsLock", CapsLock). + Int("ScrollLock", ScrollLock). + Msg("setting keyboard modifiers") + + h.remote.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) + return nil +} diff --git a/internal/websocket/handler.go b/internal/websocket/handler.go new file mode 100644 index 00000000..af829c82 --- /dev/null +++ b/internal/websocket/handler.go @@ -0,0 +1,179 @@ +package websocket + +import ( + "encoding/json" + + "github.com/pkg/errors" + "github.com/rs/zerolog" + + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/event" + "n.eko.moe/neko/internal/types/message" + "n.eko.moe/neko/internal/utils" +) + +type MessageHandler struct { + logger zerolog.Logger + sessions types.SessionManager + webrtc types.WebRTCManager + remote types.RemoteManager + broadcast types.BroadcastManager + banned map[string]bool + locked bool +} + +func (h *MessageHandler) Connected(id string, socket *WebSocket) (bool, string, error) { + address := socket.Address() + if address == "" { + h.logger.Debug().Msg("no remote address") + } else { + ok, banned := h.banned[address] + if ok && banned { + h.logger.Debug().Str("address", address).Msg("banned") + return false, "banned", nil + } + } + + if h.locked { + session, ok := h.sessions.Get(id) + if !ok || !session.Admin() { + h.logger.Debug().Msg("server locked") + return false, "locked", nil + } + } + + return true, "", nil +} + +func (h *MessageHandler) Disconnected(id string) error { + if h.locked && len(h.sessions.Admins()) == 0 { + h.locked = false + } + + return h.sessions.Destroy(id) +} + +func (h *MessageHandler) Message(id string, raw []byte) error { + header := message.Message{} + if err := json.Unmarshal(raw, &header); err != nil { + return err + } + + session, ok := h.sessions.Get(id) + if !ok { + errors.Errorf("unknown session id %s", id) + } + + switch header.Event { + // Signal Events + case event.SIGNAL_ANSWER: + payload := &message.SignalAnswer{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.signalAnswer(id, session, payload) + }), "%s failed", header.Event) + + // Control Events + case event.CONTROL_RELEASE: + return errors.Wrapf(h.controlRelease(id, session), "%s failed", header.Event) + case event.CONTROL_REQUEST: + return errors.Wrapf(h.controlRequest(id, session), "%s failed", header.Event) + case event.CONTROL_GIVE: + payload := &message.Control{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.controlGive(id, session, payload) + }), "%s failed", header.Event) + case event.CONTROL_CLIPBOARD: + payload := &message.Clipboard{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.controlClipboard(id, session, payload) + }), "%s failed", header.Event) + case event.CONTROL_KEYBOARD: + payload := &message.Keyboard{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.controlKeyboard(id, session, payload) + }), "%s failed", header.Event) + + + // Chat Events + case event.CHAT_MESSAGE: + payload := &message.ChatReceive{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.chat(id, session, payload) + }), "%s failed", header.Event) + case event.CHAT_EMOTE: + payload := &message.EmoteReceive{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.chatEmote(id, session, payload) + }), "%s failed", header.Event) + + // Screen Events + case event.SCREEN_RESOLUTION: + return errors.Wrapf(h.screenResolution(id, session), "%s failed", header.Event) + case event.SCREEN_CONFIGURATIONS: + return errors.Wrapf(h.screenConfigurations(id, session), "%s failed", header.Event) + case event.SCREEN_SET: + payload := &message.ScreenResolution{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.screenSet(id, session, payload) + }), "%s failed", header.Event) + + // Boradcast Events + case event.BORADCAST_CREATE: + payload := &message.BroadcastCreate{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.boradcastCreate(session, payload) + }), "%s failed", header.Event) + case event.BORADCAST_DESTROY: + return errors.Wrapf(h.boradcastDestroy(session), "%s failed", header.Event) + + // Admin Events + case event.ADMIN_LOCK: + return errors.Wrapf(h.adminLock(id, session), "%s failed", header.Event) + case event.ADMIN_UNLOCK: + return errors.Wrapf(h.adminUnlock(id, session), "%s failed", header.Event) + case event.ADMIN_CONTROL: + return errors.Wrapf(h.adminControl(id, session), "%s failed", header.Event) + case event.ADMIN_RELEASE: + return errors.Wrapf(h.adminRelease(id, session), "%s failed", header.Event) + case event.ADMIN_GIVE: + payload := &message.Admin{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.adminGive(id, session, payload) + }), "%s failed", header.Event) + case event.ADMIN_BAN: + payload := &message.Admin{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.adminBan(id, session, payload) + }), "%s failed", header.Event) + case event.ADMIN_KICK: + payload := &message.Admin{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.adminKick(id, session, payload) + }), "%s failed", header.Event) + case event.ADMIN_MUTE: + payload := &message.Admin{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.adminMute(id, session, payload) + }), "%s failed", header.Event) + case event.ADMIN_UNMUTE: + payload := &message.Admin{} + return errors.Wrapf( + utils.Unmarshal(payload, raw, func() error { + return h.adminUnmute(id, session, payload) + }), "%s failed", header.Event) + default: + return errors.Errorf("unknown message event %s", header.Event) + } +} diff --git a/internal/websocket/screen.go b/internal/websocket/screen.go new file mode 100644 index 00000000..2547f630 --- /dev/null +++ b/internal/websocket/screen.go @@ -0,0 +1,66 @@ +package websocket + +import ( + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/event" + "n.eko.moe/neko/internal/types/message" +) + +func (h *MessageHandler) screenSet(id string, session types.Session, payload *message.ScreenResolution) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + if err := h.remote.ChangeResolution(payload.Width, payload.Height, payload.Rate); err != nil { + h.logger.Warn().Err(err).Msgf("unable to change screen size") + return err + } + + if err := h.sessions.Broadcast( + message.ScreenResolution{ + Event: event.SCREEN_RESOLUTION, + ID: id, + Width: payload.Width, + Height: payload.Height, + Rate: payload.Rate, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.SCREEN_RESOLUTION) + return err + } + + return nil +} + +func (h *MessageHandler) screenResolution(id string, session types.Session) error { + if size := h.remote.GetScreenSize(); size != nil { + if err := session.Send(message.ScreenResolution{ + Event: event.SCREEN_RESOLUTION, + Width: size.Width, + Height: size.Height, + Rate: int(size.Rate), + }); err != nil { + h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_RESOLUTION) + return err + } + } + + return nil +} + +func (h *MessageHandler) screenConfigurations(id string, session types.Session) error { + if !session.Admin() { + h.logger.Debug().Msg("user not admin") + return nil + } + + if err := session.Send(message.ScreenConfigurations{ + Event: event.SCREEN_CONFIGURATIONS, + Configurations: h.remote.ScreenConfigurations(), + }); err != nil { + h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_CONFIGURATIONS) + return err + } + + return nil +} diff --git a/internal/websocket/session.go b/internal/websocket/session.go new file mode 100644 index 00000000..9151aa23 --- /dev/null +++ b/internal/websocket/session.go @@ -0,0 +1,93 @@ +package websocket + +import ( + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/event" + "n.eko.moe/neko/internal/types/message" +) + +func (h *MessageHandler) SessionCreated(id string, session types.Session) error { + // send sdp and id over to client + if err := h.signalProvide(id, session); err != nil { + return err + } + + if session.Admin() { + // send screen configurations if admin + if err := h.screenConfigurations(id, session); err != nil { + return err + } + + // send broadcast status if admin + if err := h.boradcastStatus(session); err != nil { + return err + } + } + + return nil +} + +func (h *MessageHandler) SessionConnected(id string, session types.Session) error { + // send list of members to session + if err := session.Send(message.MembersList{ + Event: event.MEMBER_LIST, + Memebers: h.sessions.Members(), + }); err != nil { + h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST) + return err + } + + // send screen current resolution + if err := h.screenResolution(id, session); err != nil { + return err + } + + // tell session there is a host + host, ok := h.sessions.GetHost() + if ok { + if err := session.Send(message.Control{ + Event: event.CONTROL_LOCKED, + ID: host.ID(), + }); err != nil { + h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.CONTROL_LOCKED) + return err + } + } + + // let everyone know there is a new session + if err := h.sessions.Broadcast( + message.Member{ + Event: event.MEMBER_CONNECTED, + Member: session.Member(), + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) + return err + } + + return nil +} + +func (h *MessageHandler) SessionDestroyed(id string) error { + // clear host if exists + if h.sessions.IsHost(id) { + h.sessions.ClearHost() + if err := h.sessions.Broadcast(message.Control{ + Event: event.CONTROL_RELEASE, + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) + } + } + + // let everyone know session disconnected + if err := h.sessions.Broadcast( + message.MemberDisconnected{ + Event: event.MEMBER_DISCONNECTED, + ID: id, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.MEMBER_DISCONNECTED) + return err + } + + return nil +} diff --git a/internal/websocket/signal.go b/internal/websocket/signal.go new file mode 100644 index 00000000..e24db554 --- /dev/null +++ b/internal/websocket/signal.go @@ -0,0 +1,38 @@ +package websocket + +import ( + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/event" + "n.eko.moe/neko/internal/types/message" +) + +func (h *MessageHandler) signalProvide(id string, session types.Session) error { + sdp, lite, ice, err := h.webrtc.CreatePeer(id, session) + if err != nil { + return err + } + + if err := session.Send(message.SignalProvide{ + Event: event.SIGNAL_PROVIDE, + ID: id, + SDP: sdp, + Lite: lite, + ICE: ice, + }); err != nil { + return err + } + + return nil +} + +func (h *MessageHandler) signalAnswer(id string, session types.Session, payload *message.SignalAnswer) error { + if err := session.SetName(payload.DisplayName); err != nil { + return err + } + + if err := session.SignalAnswer(payload.SDP); err != nil { + return err + } + + return nil +} diff --git a/internal/websocket/socket.go b/internal/websocket/socket.go new file mode 100644 index 00000000..c9875bfd --- /dev/null +++ b/internal/websocket/socket.go @@ -0,0 +1,55 @@ +package websocket + +import ( + "encoding/json" + "strings" + "sync" + + "github.com/gorilla/websocket" +) + +type WebSocket struct { + id string + address string + ws *WebSocketHandler + connection *websocket.Conn + mu sync.Mutex +} + +func (socket *WebSocket) Address() string { + //remote := socket.connection.RemoteAddr() + address := strings.SplitN(socket.address, ":", -1) + if len(address[0]) < 1 { + return socket.address + } + return address[0] +} + +func (socket *WebSocket) Send(v interface{}) error { + socket.mu.Lock() + defer socket.mu.Unlock() + if socket.connection == nil { + return nil + } + + raw, err := json.Marshal(v) + if err != nil { + return err + } + + socket.ws.logger.Debug(). + Str("session", socket.id). + Str("address", socket.connection.RemoteAddr().String()). + Str("raw", string(raw)). + Msg("sending message to client") + + return socket.connection.WriteMessage(websocket.TextMessage, raw) +} + +func (socket *WebSocket) Destroy() error { + if socket.connection == nil { + return nil + } + + return socket.connection.Close() +} diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go new file mode 100644 index 00000000..77e9651d --- /dev/null +++ b/internal/websocket/websocket.go @@ -0,0 +1,268 @@ +package websocket + +import ( + "fmt" + "net/http" + "time" + + "github.com/gorilla/websocket" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "n.eko.moe/neko/internal/types" + "n.eko.moe/neko/internal/types/config" + "n.eko.moe/neko/internal/types/event" + "n.eko.moe/neko/internal/types/message" + "n.eko.moe/neko/internal/utils" +) + +func New(sessions types.SessionManager, remote types.RemoteManager, broadcast types.BroadcastManager, webrtc types.WebRTCManager, conf *config.WebSocket) *WebSocketHandler { + logger := log.With().Str("module", "websocket").Logger() + + return &WebSocketHandler{ + logger: logger, + conf: conf, + sessions: sessions, + remote: remote, + upgrader: websocket.Upgrader{ + CheckOrigin: func(r *http.Request) bool { + return true + }, + }, + handler: &MessageHandler{ + logger: logger.With().Str("subsystem", "handler").Logger(), + remote: remote, + broadcast: broadcast, + sessions: sessions, + webrtc: webrtc, + banned: make(map[string]bool), + locked: false, + }, + } +} + +// Send pings to peer with this period. Must be less than pongWait. +const pingPeriod = 60 * time.Second + +type WebSocketHandler struct { + logger zerolog.Logger + upgrader websocket.Upgrader + sessions types.SessionManager + remote types.RemoteManager + conf *config.WebSocket + handler *MessageHandler + shutdown chan bool +} + +func (ws *WebSocketHandler) Start() error { + ws.sessions.OnCreated(func(id string, session types.Session) { + if err := ws.handler.SessionCreated(id, session); err != nil { + ws.logger.Warn().Str("id", id).Err(err).Msg("session created with and error") + } else { + ws.logger.Debug().Str("id", id).Msg("session created") + } + }) + + ws.sessions.OnConnected(func(id string, session types.Session) { + if err := ws.handler.SessionConnected(id, session); err != nil { + ws.logger.Warn().Str("id", id).Err(err).Msg("session connected with and error") + } else { + ws.logger.Debug().Str("id", id).Msg("session connected") + } + }) + + ws.sessions.OnDestroy(func(id string, session types.Session) { + if err := ws.handler.SessionDestroyed(id); err != nil { + ws.logger.Warn().Str("id", id).Err(err).Msg("session destroyed with and error") + } else { + ws.logger.Debug().Str("id", id).Msg("session destroyed") + } + }) + + go func() { + defer func() { + ws.logger.Info().Msg("shutdown") + }() + + current := ws.remote.ReadClipboard() + + for { + select { + case <-ws.shutdown: + return + default: + if ws.sessions.HasHost() { + text := ws.remote.ReadClipboard() + if text != current { + session, ok := ws.sessions.GetHost() + if ok { + session.Send(message.Clipboard{ + Event: event.CONTROL_CLIPBOARD, + Text: text, + }) + } + current = text + } + } + time.Sleep(100 * time.Millisecond) + } + } + }() + + return nil +} + +func (ws *WebSocketHandler) Shutdown() error { + ws.shutdown <- true + return nil +} + +func (ws *WebSocketHandler) Upgrade(w http.ResponseWriter, r *http.Request) error { + ws.logger.Debug().Msg("attempting to upgrade connection") + + connection, err := ws.upgrader.Upgrade(w, r, nil) + if err != nil { + ws.logger.Error().Err(err).Msg("failed to upgrade connection") + return err + } + + id, ip, admin, err := ws.authenticate(r) + if err != nil { + ws.logger.Warn().Err(err).Msg("authentication failed") + + if err = connection.WriteJSON(message.Disconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: "invalid_password", + }); err != nil { + ws.logger.Error().Err(err).Msg("failed to send disconnect") + } + + if err = connection.Close(); err != nil { + return err + } + return nil + } + + socket := &WebSocket{ + id: id, + ws: ws, + address: ip, + connection: connection, + } + + ok, reason, err := ws.handler.Connected(id, socket) + if err != nil { + ws.logger.Error().Err(err).Msg("connection failed") + return err + } + + if !ok { + if err = connection.WriteJSON(message.Disconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: reason, + }); err != nil { + ws.logger.Error().Err(err).Msg("failed to send disconnect") + } + + if err = connection.Close(); err != nil { + return err + } + + return nil + } + + ws.sessions.New(id, admin, socket) + + ws.logger. + Debug(). + Str("session", id). + Str("address", connection.RemoteAddr().String()). + Msg("new connection created") + + defer func() { + ws.logger. + Debug(). + Str("session", id). + Str("address", connection.RemoteAddr().String()). + Msg("session ended") + }() + + ws.handle(connection, id) + return nil +} + +func (ws *WebSocketHandler) authenticate(r *http.Request) (string, string, bool, error) { + ip := r.RemoteAddr + + if ws.conf.Proxy { + ip = utils.ReadUserIP(r) + } + + id, err := utils.NewUID(32) + if err != nil { + return "", ip, false, err + } + + passwords, ok := r.URL.Query()["password"] + if !ok || len(passwords[0]) < 1 { + return "", ip, false, fmt.Errorf("no password provided") + } + + if passwords[0] == ws.conf.AdminPassword { + return id, ip, true, nil + } + + if passwords[0] == ws.conf.Password { + return id, ip, false, nil + } + + return "", ip, false, fmt.Errorf("invalid password: %s", passwords[0]) +} + +func (ws *WebSocketHandler) handle(connection *websocket.Conn, id string) { + bytes := make(chan []byte) + cancel := make(chan struct{}) + ticker := time.NewTicker(pingPeriod) + + go func() { + defer func() { + ticker.Stop() + ws.logger.Debug().Str("address", connection.RemoteAddr().String()).Msg("handle socket ending") + ws.handler.Disconnected(id) + }() + + for { + _, raw, err := connection.ReadMessage() + if err != nil { + if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { + ws.logger.Warn().Err(err).Msg("read message error") + } else { + ws.logger.Debug().Err(err).Msg("read message error") + } + close(cancel) + break + } + bytes <- raw + } + }() + + for { + select { + case raw := <-bytes: + ws.logger.Debug(). + Str("session", id). + Str("address", connection.RemoteAddr().String()). + Str("raw", string(raw)). + Msg("received message from client") + if err := ws.handler.Message(id, raw); err != nil { + ws.logger.Error().Err(err).Msg("message handler has failed") + } + case <-cancel: + return + case _ = <-ticker.C: + if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { + return + } + } + } +} diff --git a/internal/xorg/xorg.c b/internal/xorg/xorg.c new file mode 100644 index 00000000..58421f5f --- /dev/null +++ b/internal/xorg/xorg.c @@ -0,0 +1,195 @@ +#include "xorg.h" + +static clipboard_c *CLIPBOARD = NULL; +static Display *DISPLAY = NULL; +static char *NAME = ":0.0"; +static int REGISTERED = 0; +static int DIRTY = 0; + +Display *getXDisplay(void) { + /* Close the display if displayName has changed */ + if (DIRTY) { + XDisplayClose(); + DIRTY = 0; + } + + if (DISPLAY == NULL) { + /* First try the user set displayName */ + DISPLAY = XOpenDisplay(NAME); + + /* Then try using environment variable DISPLAY */ + if (DISPLAY == NULL) { + DISPLAY = XOpenDisplay(NULL); + } + + if (DISPLAY == NULL) { + fputs("Could not open main display\n", stderr); + } else if (!REGISTERED) { + atexit(&XDisplayClose); + REGISTERED = 1; + } + } + + return DISPLAY; +} + +clipboard_c *getClipboard(void) { + if (CLIPBOARD == NULL) { + CLIPBOARD = clipboard_new(NULL); + } + return CLIPBOARD; +} + +void XDisplayClose(void) { + if (DISPLAY != NULL) { + XCloseDisplay(DISPLAY); + DISPLAY = NULL; + } +} + +void XDisplaySet(char *input) { + NAME = strdup(input); + DIRTY = 1; +} + +void XMove(int x, int y) { + Display *display = getXDisplay(); + XWarpPointer(display, None, DefaultRootWindow(display), 0, 0, 0, 0, x, y); + XSync(display, 0); +} + +void XScroll(int x, int y) { + int ydir = 4; /* Button 4 is up, 5 is down. */ + int xdir = 6; + + Display *display = getXDisplay(); + + if (y < 0) { + ydir = 5; + } + + if (x < 0) { + xdir = 7; + } + + int xi; + int yi; + + for (xi = 0; xi < abs(x); xi++) { + XTestFakeButtonEvent(display, xdir, 1, CurrentTime); + XTestFakeButtonEvent(display, xdir, 0, CurrentTime); + } + + for (yi = 0; yi < abs(y); yi++) { + XTestFakeButtonEvent(display, ydir, 1, CurrentTime); + XTestFakeButtonEvent(display, ydir, 0, CurrentTime); + } + + XSync(display, 0); +} + +void XButton(unsigned int button, int down) { + if (button != 0) { + Display *display = getXDisplay(); + XTestFakeButtonEvent(display, button, down, CurrentTime); + XSync(display, 0); + } +} + +void XKey(unsigned long key, int down) { + if (key != 0) { + Display *display = getXDisplay(); + KeyCode code = XKeysymToKeycode(display, key); + + // Map non-existing keysyms to new keycodes + if(code == 0) { + int min, max, numcodes; + XDisplayKeycodes(display, &min, &max); + XGetKeyboardMapping(display, min, max-min, &numcodes); + + code = (max-min+1)*numcodes; + KeySym keysym_list[numcodes]; + for(int i=0;i + #include + #include + #include + #include + #include + #include + #include /* For fputs() */ + #include /* For strdup() */ + + extern void goCreateScreenSize(int index, int width, int height, int mwidth, int mheight); + extern void goSetScreenRates(int index, int rate_index, short rate); + + /* Returns the main display, closed either on exit or when closeMainDisplay() + * is invoked. This removes a bit of the overhead of calling XOpenDisplay() & + * XCloseDisplay() everytime the main display needs to be used. + * + * Note that this is almost certainly not thread safe. */ + Display *getXDisplay(void); + clipboard_c *getClipboard(void); + + void XMove(int x, int y); + void XScroll(int x, int y); + void XButton(unsigned int button, int down); + void XKey(unsigned long key, int down); + + void XClipboardSet(char *src); + char *XClipboardGet(); + + void XGetScreenConfigurations(); + void XSetScreenConfiguration(int index, short rate); + int XGetScreenSize(); + short XGetScreenRate(); + + void XDisplayClose(void); + void XDisplaySet(char *input); + + void SetKeyboardLayout(char *layout); + void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock); +#endif + diff --git a/neko.code-workspace b/neko.code-workspace new file mode 100644 index 00000000..876a1499 --- /dev/null +++ b/neko.code-workspace @@ -0,0 +1,8 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": {} +} \ No newline at end of file diff --git a/neko.go b/neko.go new file mode 100644 index 00000000..0d6026fd --- /dev/null +++ b/neko.go @@ -0,0 +1,184 @@ +package neko + +import ( + "fmt" + "os" + "os/signal" + "runtime" + + "n.eko.moe/neko/internal/broadcast" + "n.eko.moe/neko/internal/http" + "n.eko.moe/neko/internal/remote" + "n.eko.moe/neko/internal/session" + "n.eko.moe/neko/internal/types/config" + "n.eko.moe/neko/internal/webrtc" + "n.eko.moe/neko/internal/websocket" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + "github.com/spf13/cobra" +) + +const Header = `&34 + _ __ __ + / | / /__ / /______ \ /\ + / |/ / _ \/ //_/ __ \ ) ( ') + / /| / __/ ,< / /_/ / ( / ) +/_/ |_/\___/_/|_|\____/ \(__)| +&1&37 nurdism/neko &33%s v%s&0 +` + +var ( + // + buildDate = "dev" + // + gitCommit = "dev" + // + gitBranch = "dev" + + // Major version when you make incompatible API changes, + major = "dev" + // Minor version when you add functionality in a backwards-compatible manner, and + minor = "dev" + // Patch version when you make backwards-compatible bug fixeneko. + patch = "dev" +) + +var Service *Neko + +func init() { + Service = &Neko{ + Version: &Version{ + Major: major, + Minor: minor, + Patch: patch, + GitCommit: gitCommit, + GitBranch: gitBranch, + BuildDate: buildDate, + GoVersion: runtime.Version(), + Compiler: runtime.Compiler, + Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), + }, + Root: &config.Root{}, + Server: &config.Server{}, + Remote: &config.Remote{}, + Broadcast: &config.Broadcast{}, + WebRTC: &config.WebRTC{}, + WebSocket: &config.WebSocket{}, + } +} + +type Version struct { + Major string + Minor string + Patch string + GitCommit string + GitBranch string + BuildDate string + GoVersion string + Compiler string + Platform string +} + +func (i *Version) String() string { + return fmt.Sprintf("%s.%s.%s %s", i.Major, i.Minor, i.Patch, i.GitCommit) +} + +func (i *Version) Details() string { + return fmt.Sprintf( + "%s\n%s\n%s\n%s\n%s\n%s\n%s\n", + fmt.Sprintf("Version %s.%s.%s", i.Major, i.Minor, i.Patch), + fmt.Sprintf("GitCommit %s", i.GitCommit), + fmt.Sprintf("GitBranch %s", i.GitBranch), + fmt.Sprintf("BuildDate %s", i.BuildDate), + fmt.Sprintf("GoVersion %s", i.GoVersion), + fmt.Sprintf("Compiler %s", i.Compiler), + fmt.Sprintf("Platform %s", i.Platform), + ) +} + +type Neko struct { + Version *Version + Root *config.Root + Remote *config.Remote + Broadcast *config.Broadcast + Server *config.Server + WebRTC *config.WebRTC + WebSocket *config.WebSocket + + logger zerolog.Logger + server *http.Server + sessionManager *session.SessionManager + remoteManager *remote.RemoteManager + broadcastManager *broadcast.BroadcastManager + webRTCManager *webrtc.WebRTCManager + webSocketHandler *websocket.WebSocketHandler +} + +func (neko *Neko) Preflight() { + neko.logger = log.With().Str("service", "neko").Logger() +} + +func (neko *Neko) Start() { + broadcastManager := broadcast.New(neko.Remote, neko.Broadcast) + + remoteManager := remote.New(neko.Remote, broadcastManager) + remoteManager.Start() + + sessionManager := session.New(remoteManager) + + webRTCManager := webrtc.New(sessionManager, remoteManager, neko.WebRTC) + webRTCManager.Start() + + webSocketHandler := websocket.New(sessionManager, remoteManager, broadcastManager, webRTCManager, neko.WebSocket) + webSocketHandler.Start() + + server := http.New(neko.Server, webSocketHandler) + server.Start() + + neko.sessionManager = sessionManager + neko.remoteManager = remoteManager + neko.webRTCManager = webRTCManager + neko.webSocketHandler = webSocketHandler + neko.server = server +} + +func (neko *Neko) Shutdown() { + if err := neko.remoteManager.Shutdown(); err != nil { + neko.logger.Err(err).Msg("remote manager shutdown with an error") + } else { + neko.logger.Debug().Msg("remote manager shutdown") + } + + if err := neko.webRTCManager.Shutdown(); err != nil { + neko.logger.Err(err).Msg("webrtc manager shutdown with an error") + } else { + neko.logger.Debug().Msg("webrtc manager shutdown") + } + + if err := neko.webSocketHandler.Shutdown(); err != nil { + neko.logger.Err(err).Msg("websocket handler shutdown with an error") + } else { + neko.logger.Debug().Msg("websocket handler shutdown") + } + + if err := neko.server.Shutdown(); err != nil { + neko.logger.Err(err).Msg("server shutdown with an error") + } else { + neko.logger.Debug().Msg("server shutdown") + } +} + +func (neko *Neko) ServeCommand(cmd *cobra.Command, args []string) { + neko.logger.Info().Msg("starting neko server") + neko.Start() + neko.logger.Info().Msg("neko ready") + + quit := make(chan os.Signal) + signal.Notify(quit, os.Interrupt) + sig := <-quit + + neko.logger.Warn().Msgf("received %s, attempting graceful shutdown: \n", sig) + neko.Shutdown() + neko.logger.Info().Msg("shutdown complete") +} From 968ea7d4f25b0d5d75c7b4ac70165d768cd93309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 22 Oct 2020 17:00:32 +0200 Subject: [PATCH 002/876] add gitignore. --- .gitignore | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..ba6365d1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories (remove the comment below to include it) +vendor/ + From 0d7a24befc1bb01e6bd965d5e37ca806a2808e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 22 Oct 2020 17:08:13 +0200 Subject: [PATCH 003/876] add Dockerfile. --- Dockerfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..32bbb03a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,27 @@ +FROM golang:1.15-buster as server +WORKDIR /src + +# +# install dependencies +RUN set -eux; apt-get update; \ + apt-get install -y --no-install-recommends git cmake make libx11-dev libxrandr-dev libxtst-dev \ + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly; \ + # + # install libclipboard + set -eux; \ + cd /tmp; \ + git clone https://github.com/jtanx/libclipboard; \ + cd libclipboard; \ + cmake .; \ + make -j4; \ + make install; \ + rm -rf /tmp/libclipboard; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# build server +COPY server/ . +RUN go get -v -t -d . && go build -o bin/neko -i cmd/neko/main.go From 5800ea7df564bcf7ad2887437c2dffecd4b9352c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 22 Oct 2020 21:07:37 +0200 Subject: [PATCH 004/876] fix Dockerfile. --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 32bbb03a..076cb15b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,5 +23,7 @@ RUN set -eux; apt-get update; \ # # build server -COPY server/ . +COPY . . RUN go get -v -t -d . && go build -o bin/neko -i cmd/neko/main.go + +ENTRYPOINT [ "bin/neko" ] From 687cf987f8e48531d1ebdcf58c08f306efcc9ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 25 Oct 2020 01:36:57 +0200 Subject: [PATCH 005/876] fix gitignore. --- .gitignore | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index ba6365d1..d855be89 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,2 @@ -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, built with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -# Dependency directories (remove the comment below to include it) -vendor/ +bin/ From a5014e205e51083524855156a5415e23265abc3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 19:15:48 +0100 Subject: [PATCH 006/876] n.eko.moe -> demodesk. --- build | 2 +- cmd/neko/main.go | 6 +++--- cmd/root.go | 2 +- cmd/serve.go | 4 ++-- go.mod | 2 +- internal/broadcast/manager.go | 4 ++-- internal/gst/gst.go | 2 +- internal/http/http.go | 8 ++++---- internal/http/middleware/recover.go | 2 +- internal/http/response/response.go | 2 +- internal/remote/manager.go | 8 ++++---- internal/session/manager.go | 4 ++-- internal/session/session.go | 6 +++--- internal/types/config/webrtc.go | 2 +- internal/types/message/messages.go | 2 +- internal/webrtc/webrtc.go | 4 ++-- internal/websocket/admin.go | 6 +++--- internal/websocket/broadcast.go | 6 +++--- internal/websocket/chat.go | 6 +++--- internal/websocket/control.go | 6 +++--- internal/websocket/handler.go | 8 ++++---- internal/websocket/screen.go | 6 +++--- internal/websocket/session.go | 6 +++--- internal/websocket/signal.go | 6 +++--- internal/websocket/websocket.go | 10 +++++----- internal/xorg/xorg.go | 2 +- neko.go | 14 +++++++------- 27 files changed, 68 insertions(+), 68 deletions(-) diff --git a/build b/build index 895b12a7..9c27b57b 100644 --- a/build +++ b/build @@ -7,4 +7,4 @@ GIT_COMMIT=`git rev-parse --short HEAD` GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` GIT_DIRTY=`git diff-index --quiet HEAD -- || echo "✗-"` -go build -o bin/neko -ldflags "-s -X 'n.eko.moe/neko.buildDate=${BUILD_TIME}' -X 'n.eko.moe/neko.gitCommit=${GIT_DIRTY}${GIT_COMMIT}' -X 'n.eko.moe/neko.gitBranch=${GIT_BRANCH}'" -i cmd/neko/main.go +go build -o bin/neko -ldflags "-s -X 'demodesk/neko.buildDate=${BUILD_TIME}' -X 'demodesk/neko.gitCommit=${GIT_DIRTY}${GIT_COMMIT}' -X 'demodesk/neko.gitBranch=${GIT_BRANCH}'" -i cmd/neko/main.go diff --git a/cmd/neko/main.go b/cmd/neko/main.go index d4de0bfc..1af5be07 100644 --- a/cmd/neko/main.go +++ b/cmd/neko/main.go @@ -5,9 +5,9 @@ import ( "github.com/rs/zerolog/log" - "n.eko.moe/neko" - "n.eko.moe/neko/cmd" - "n.eko.moe/neko/internal/utils" + "demodesk/neko" + "demodesk/neko/cmd" + "demodesk/neko/internal/utils" ) func main() { diff --git a/cmd/root.go b/cmd/root.go index 293f3450..6364bc7d 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "n.eko.moe/neko" + "demodesk/neko" ) func Execute() error { diff --git a/cmd/serve.go b/cmd/serve.go index b6a78077..520080c8 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -4,8 +4,8 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "n.eko.moe/neko" - "n.eko.moe/neko/internal/types/config" + "demodesk/neko" + "demodesk/neko/internal/types/config" ) func init() { diff --git a/go.mod b/go.mod index dfb14cca..0c99f262 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module n.eko.moe/neko +module demodesk/neko go 1.13 diff --git a/internal/broadcast/manager.go b/internal/broadcast/manager.go index d6ebbe0b..6b28e3c2 100644 --- a/internal/broadcast/manager.go +++ b/internal/broadcast/manager.go @@ -4,8 +4,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "n.eko.moe/neko/internal/gst" - "n.eko.moe/neko/internal/types/config" + "demodesk/neko/internal/gst" + "demodesk/neko/internal/types/config" ) type BroadcastManager struct { diff --git a/internal/gst/gst.go b/internal/gst/gst.go index c3fcc56c..57f230e4 100644 --- a/internal/gst/gst.go +++ b/internal/gst/gst.go @@ -14,7 +14,7 @@ import ( "github.com/pion/webrtc/v2" - "n.eko.moe/neko/internal/types" + "demodesk/neko/internal/types" ) /* diff --git a/internal/http/http.go b/internal/http/http.go index e8cec82c..08e4bf8f 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -10,10 +10,10 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "n.eko.moe/neko/internal/http/endpoint" - "n.eko.moe/neko/internal/http/middleware" - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/config" + "demodesk/neko/internal/http/endpoint" + "demodesk/neko/internal/http/middleware" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/config" ) type Server struct { diff --git a/internal/http/middleware/recover.go b/internal/http/middleware/recover.go index 9a254889..f90eb9a5 100644 --- a/internal/http/middleware/recover.go +++ b/internal/http/middleware/recover.go @@ -6,7 +6,7 @@ package middleware import ( "net/http" - "n.eko.moe/neko/internal/http/endpoint" + "demodesk/neko/internal/http/endpoint" ) func Recoverer(next http.Handler) http.Handler { diff --git a/internal/http/response/response.go b/internal/http/response/response.go index ea53baa0..09ec1102 100644 --- a/internal/http/response/response.go +++ b/internal/http/response/response.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "n.eko.moe/neko/internal/http/endpoint" + "demodesk/neko/internal/http/endpoint" ) // JSON encodes data to rw in JSON format. Returns a pointer to a diff --git a/internal/remote/manager.go b/internal/remote/manager.go index 3ed2f005..d0ad05e8 100644 --- a/internal/remote/manager.go +++ b/internal/remote/manager.go @@ -7,10 +7,10 @@ import ( "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "n.eko.moe/neko/internal/gst" - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/config" - "n.eko.moe/neko/internal/xorg" + "demodesk/neko/internal/gst" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/config" + "demodesk/neko/internal/xorg" ) type RemoteManager struct { diff --git a/internal/session/manager.go b/internal/session/manager.go index 8e51bc5a..d68d578f 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/utils" + "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" ) func New(remote types.RemoteManager) *SessionManager { diff --git a/internal/session/session.go b/internal/session/session.go index b9733a78..2ca194a2 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -4,9 +4,9 @@ import ( "sync" "github.com/rs/zerolog" - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/event" - "n.eko.moe/neko/internal/types/message" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" ) type Session struct { diff --git a/internal/types/config/webrtc.go b/internal/types/config/webrtc.go index 5d76832c..13cbf185 100644 --- a/internal/types/config/webrtc.go +++ b/internal/types/config/webrtc.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "n.eko.moe/neko/internal/utils" + "demodesk/neko/internal/utils" ) type WebRTC struct { diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index fcf04f30..ae9431ef 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -1,7 +1,7 @@ package message import ( - "n.eko.moe/neko/internal/types" + "demodesk/neko/internal/types" ) type Message struct { diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index b658ecb8..0ea8e652 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -11,8 +11,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/config" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/config" ) func New(sessions types.SessionManager, remote types.RemoteManager, config *config.WebRTC) *WebRTCManager { diff --git a/internal/websocket/admin.go b/internal/websocket/admin.go index 1063f279..dd78a770 100644 --- a/internal/websocket/admin.go +++ b/internal/websocket/admin.go @@ -3,9 +3,9 @@ package websocket import ( "strings" - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/event" - "n.eko.moe/neko/internal/types/message" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" ) func (h *MessageHandler) adminLock(id string, session types.Session) error { diff --git a/internal/websocket/broadcast.go b/internal/websocket/broadcast.go index c2d6a884..d62aa798 100644 --- a/internal/websocket/broadcast.go +++ b/internal/websocket/broadcast.go @@ -1,9 +1,9 @@ package websocket import ( - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/event" - "n.eko.moe/neko/internal/types/message" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" ) func (h *MessageHandler) boradcastCreate(session types.Session, payload *message.BroadcastCreate) error { diff --git a/internal/websocket/chat.go b/internal/websocket/chat.go index 8f68b5d6..735c5554 100644 --- a/internal/websocket/chat.go +++ b/internal/websocket/chat.go @@ -1,9 +1,9 @@ package websocket import ( - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/event" - "n.eko.moe/neko/internal/types/message" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" ) func (h *MessageHandler) chat(id string, session types.Session, payload *message.ChatReceive) error { diff --git a/internal/websocket/control.go b/internal/websocket/control.go index 442ef3f3..cf771bc3 100644 --- a/internal/websocket/control.go +++ b/internal/websocket/control.go @@ -1,9 +1,9 @@ package websocket import ( - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/event" - "n.eko.moe/neko/internal/types/message" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" ) func (h *MessageHandler) controlRelease(id string, session types.Session) error { diff --git a/internal/websocket/handler.go b/internal/websocket/handler.go index af829c82..001676d9 100644 --- a/internal/websocket/handler.go +++ b/internal/websocket/handler.go @@ -6,10 +6,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/event" - "n.eko.moe/neko/internal/types/message" - "n.eko.moe/neko/internal/utils" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" + "demodesk/neko/internal/utils" ) type MessageHandler struct { diff --git a/internal/websocket/screen.go b/internal/websocket/screen.go index 2547f630..ddb35167 100644 --- a/internal/websocket/screen.go +++ b/internal/websocket/screen.go @@ -1,9 +1,9 @@ package websocket import ( - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/event" - "n.eko.moe/neko/internal/types/message" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" ) func (h *MessageHandler) screenSet(id string, session types.Session, payload *message.ScreenResolution) error { diff --git a/internal/websocket/session.go b/internal/websocket/session.go index 9151aa23..8bb0d053 100644 --- a/internal/websocket/session.go +++ b/internal/websocket/session.go @@ -1,9 +1,9 @@ package websocket import ( - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/event" - "n.eko.moe/neko/internal/types/message" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" ) func (h *MessageHandler) SessionCreated(id string, session types.Session) error { diff --git a/internal/websocket/signal.go b/internal/websocket/signal.go index e24db554..50b4446d 100644 --- a/internal/websocket/signal.go +++ b/internal/websocket/signal.go @@ -1,9 +1,9 @@ package websocket import ( - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/event" - "n.eko.moe/neko/internal/types/message" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" ) func (h *MessageHandler) signalProvide(id string, session types.Session) error { diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index 77e9651d..523120e2 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -9,11 +9,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "n.eko.moe/neko/internal/types" - "n.eko.moe/neko/internal/types/config" - "n.eko.moe/neko/internal/types/event" - "n.eko.moe/neko/internal/types/message" - "n.eko.moe/neko/internal/utils" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/config" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" + "demodesk/neko/internal/utils" ) func New(sessions types.SessionManager, remote types.RemoteManager, broadcast types.BroadcastManager, webrtc types.WebRTCManager, conf *config.WebSocket) *WebSocketHandler { diff --git a/internal/xorg/xorg.go b/internal/xorg/xorg.go index 39f33f7f..ec5d0727 100644 --- a/internal/xorg/xorg.go +++ b/internal/xorg/xorg.go @@ -15,7 +15,7 @@ import ( "unsafe" "regexp" - "n.eko.moe/neko/internal/types" + "demodesk/neko/internal/types" ) var ScreenConfigurations = make(map[int]types.ScreenConfiguration) diff --git a/neko.go b/neko.go index 0d6026fd..4a01151f 100644 --- a/neko.go +++ b/neko.go @@ -6,13 +6,13 @@ import ( "os/signal" "runtime" - "n.eko.moe/neko/internal/broadcast" - "n.eko.moe/neko/internal/http" - "n.eko.moe/neko/internal/remote" - "n.eko.moe/neko/internal/session" - "n.eko.moe/neko/internal/types/config" - "n.eko.moe/neko/internal/webrtc" - "n.eko.moe/neko/internal/websocket" + "demodesk/neko/internal/broadcast" + "demodesk/neko/internal/http" + "demodesk/neko/internal/remote" + "demodesk/neko/internal/session" + "demodesk/neko/internal/types/config" + "demodesk/neko/internal/webrtc" + "demodesk/neko/internal/websocket" "github.com/rs/zerolog" "github.com/rs/zerolog/log" From 26c2bbf10deb79cbdb3d8fce1d1bddafbef5ae09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 20:06:34 +0100 Subject: [PATCH 007/876] remove unused HTTP middlewares. --- internal/http/http.go | 13 ++-- internal/http/middleware/middleware.go | 12 ---- internal/http/middleware/recover.go | 24 ------- internal/http/middleware/request.go | 89 -------------------------- internal/http/response/response.go | 32 --------- 5 files changed, 7 insertions(+), 163 deletions(-) delete mode 100644 internal/http/middleware/middleware.go delete mode 100644 internal/http/middleware/recover.go delete mode 100644 internal/http/middleware/request.go delete mode 100644 internal/http/response/response.go diff --git a/internal/http/http.go b/internal/http/http.go index 08e4bf8f..735bf17a 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -7,11 +7,12 @@ import ( "os" "github.com/go-chi/chi" + "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "demodesk/neko/internal/http/endpoint" - "demodesk/neko/internal/http/middleware" + customMiddleware "demodesk/neko/internal/http/middleware" "demodesk/neko/internal/types" "demodesk/neko/internal/types/config" ) @@ -24,12 +25,12 @@ type Server struct { } func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { - logger := log.With().Str("module", "webrtc").Logger() + logger := log.With().Str("module", "http").Logger() router := chi.NewRouter() - // router.Use(middleware.Recoverer) // Recover from panics without crashing server + router.Use(middleware.Recoverer) // Recover from panics without crashing server router.Use(middleware.RequestID) // Create a request ID for each request - router.Use(middleware.Logger) // Log API request calls + router.Use(customMiddleware.Logger) // Log API request calls using custom logger function router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { webSocketHandler.Upgrade(w, r) @@ -51,7 +52,7 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { } })) - server := &http.Server{ + http := &http.Server{ Addr: conf.Bind, Handler: router, } @@ -59,7 +60,7 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { return &Server{ logger: logger, router: router, - http: server, + http: http, conf: conf, } } diff --git a/internal/http/middleware/middleware.go b/internal/http/middleware/middleware.go deleted file mode 100644 index 1d0ca508..00000000 --- a/internal/http/middleware/middleware.go +++ /dev/null @@ -1,12 +0,0 @@ -package middleware - -// contextKey is a value for use with context.WithValue. It's used as -// a pointer so it fits in an interface{} without allocation. This technique -// for defining context keys was copied from Go 1.7's new use of context in net/http. -type ctxKey struct { - name string -} - -func (k *ctxKey) String() string { - return "neko/ctx/" + k.name -} diff --git a/internal/http/middleware/recover.go b/internal/http/middleware/recover.go deleted file mode 100644 index f90eb9a5..00000000 --- a/internal/http/middleware/recover.go +++ /dev/null @@ -1,24 +0,0 @@ -package middleware - -// The original work was derived from Goji's middleware, source: -// https://github.com/zenazn/goji/tree/master/web/middleware - -import ( - "net/http" - - "demodesk/neko/internal/http/endpoint" -) - -func Recoverer(next http.Handler) http.Handler { - fn := func(w http.ResponseWriter, r *http.Request) { - defer func() { - if rvr := recover(); rvr != nil { - endpoint.WriteError(w, r, rvr) - } - }() - - next.ServeHTTP(w, r) - } - - return http.HandlerFunc(fn) -} diff --git a/internal/http/middleware/request.go b/internal/http/middleware/request.go deleted file mode 100644 index c9634bf8..00000000 --- a/internal/http/middleware/request.go +++ /dev/null @@ -1,89 +0,0 @@ -package middleware - -import ( - "context" - "crypto/rand" - "encoding/base64" - "fmt" - "net/http" - "os" - "strings" - "sync/atomic" -) - -// Key to use when setting the request ID. -type ctxKeyRequestID int - -// RequestIDKey is the key that holds the unique request ID in a request context. -const RequestIDKey ctxKeyRequestID = 0 - -var prefix string -var reqid uint64 - -// A quick note on the statistics here: we're trying to calculate the chance that -// two randomly generated base62 prefixes will collide. We use the formula from -// http://en.wikipedia.org/wiki/Birthday_problem -// -// P[m, n] \approx 1 - e^{-m^2/2n} -// -// We ballpark an upper bound for $m$ by imagining (for whatever reason) a server -// that restarts every second over 10 years, for $m = 86400 * 365 * 10 = 315360000$ -// -// For a $k$ character base-62 identifier, we have $n(k) = 62^k$ -// -// Plugging this in, we find $P[m, n(10)] \approx 5.75%$, which is good enough for -// our purposes, and is surely more than anyone would ever need in practice -- a -// process that is rebooted a handful of times a day for a hundred years has less -// than a millionth of a percent chance of generating two colliding IDs. - -func init() { - hostname, err := os.Hostname() - if hostname == "" || err != nil { - hostname = "localhost" - } - var buf [12]byte - var b64 string - for len(b64) < 10 { - rand.Read(buf[:]) - b64 = base64.StdEncoding.EncodeToString(buf[:]) - b64 = strings.NewReplacer("+", "", "/", "").Replace(b64) - } - - prefix = fmt.Sprintf("%s/%s", hostname, b64[0:10]) -} - -// RequestID is a middleware that injects a request ID into the context of each -// request. A request ID is a string of the form "host.example.com/random-0001", -// where "random" is a base62 random string that uniquely identifies this go -// process, and where the last number is an atomically incremented request -// counter. -func RequestID(next http.Handler) http.Handler { - fn := func(w http.ResponseWriter, r *http.Request) { - ctx := r.Context() - requestID := r.Header.Get("X-Request-Id") - if requestID == "" { - myid := atomic.AddUint64(&reqid, 1) - requestID = fmt.Sprintf("%s-%06d", prefix, myid) - } - ctx = context.WithValue(ctx, RequestIDKey, requestID) - next.ServeHTTP(w, r.WithContext(ctx)) - } - return http.HandlerFunc(fn) -} - -// GetReqID returns a request ID from the given context if one is present. -// Returns the empty string if a request ID cannot be found. -func GetReqID(ctx context.Context) string { - if ctx == nil { - return "" - } - if reqID, ok := ctx.Value(RequestIDKey).(string); ok { - return reqID - } - return "" -} - -// NextRequestID generates the next request ID in the sequence. -func NextRequestID() uint64 { - return atomic.AddUint64(&reqid, 1) -} diff --git a/internal/http/response/response.go b/internal/http/response/response.go deleted file mode 100644 index 09ec1102..00000000 --- a/internal/http/response/response.go +++ /dev/null @@ -1,32 +0,0 @@ -package response - -import ( - "encoding/json" - "net/http" - - "demodesk/neko/internal/http/endpoint" -) - -// JSON encodes data to rw in JSON format. Returns a pointer to a -// HandlerError if encoding fails. -func JSON(w http.ResponseWriter, data interface{}, status int) error { - w.WriteHeader(status) - w.Header().Set("Content-Type", "application/json") - - err := json.NewEncoder(w).Encode(data) - if err != nil { - return &endpoint.HandlerError{ - Status: http.StatusInternalServerError, - Message: "unable to write JSON response", - Err: err, - } - } - - return nil -} - -// Empty merely sets the response code to NoContent (204). -func Empty(w http.ResponseWriter) error { - w.WriteHeader(http.StatusNoContent) - return nil -} From 01d125316f171c634ae5e8ffa562e7c5d107e4ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 20:29:18 +0100 Subject: [PATCH 008/876] WebSocketHandler no return. --- internal/types/webscoket.go | 2 +- internal/websocket/websocket.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/types/webscoket.go b/internal/types/webscoket.go index d5b63360..fd924b47 100644 --- a/internal/types/webscoket.go +++ b/internal/types/webscoket.go @@ -9,7 +9,7 @@ type WebSocket interface { } type WebSocketHandler interface { - Start() error + Start() Shutdown() error Upgrade(w http.ResponseWriter, r *http.Request) error } diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index 523120e2..a09151bc 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -54,7 +54,7 @@ type WebSocketHandler struct { shutdown chan bool } -func (ws *WebSocketHandler) Start() error { +func (ws *WebSocketHandler) Start() { ws.sessions.OnCreated(func(id string, session types.Session) { if err := ws.handler.SessionCreated(id, session); err != nil { ws.logger.Warn().Str("id", id).Err(err).Msg("session created with and error") @@ -108,8 +108,6 @@ func (ws *WebSocketHandler) Start() error { } } }() - - return nil } func (ws *WebSocketHandler) Shutdown() error { From cf54343b502b03a34854fc5fc2654b24013661fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 20:31:04 +0100 Subject: [PATCH 009/876] broadcastManager to neko object. --- neko.go | 1 + 1 file changed, 1 insertion(+) diff --git a/neko.go b/neko.go index 4a01151f..d7a6084f 100644 --- a/neko.go +++ b/neko.go @@ -138,6 +138,7 @@ func (neko *Neko) Start() { neko.sessionManager = sessionManager neko.remoteManager = remoteManager + neko.broadcastManager = broadcastManager neko.webRTCManager = webRTCManager neko.webSocketHandler = webSocketHandler neko.server = server From 80430e1ef41c1839561d3410d8f58dc39f4e51f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 20:43:26 +0100 Subject: [PATCH 010/876] the channel used with signal.Notify should be buffered. --- neko.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neko.go b/neko.go index d7a6084f..be46757b 100644 --- a/neko.go +++ b/neko.go @@ -175,7 +175,7 @@ func (neko *Neko) ServeCommand(cmd *cobra.Command, args []string) { neko.Start() neko.logger.Info().Msg("neko ready") - quit := make(chan os.Signal) + quit := make(chan os.Signal, 1) signal.Notify(quit, os.Interrupt) sig := <-quit From d0d3e6b2d2d24a1c4ace926b75e141a3dccea007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 20:44:50 +0100 Subject: [PATCH 011/876] should omit comparison to bool constant. --- internal/utils/array.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/utils/array.go b/internal/utils/array.go index b4202735..20b4f8d7 100644 --- a/internal/utils/array.go +++ b/internal/utils/array.go @@ -12,7 +12,7 @@ func ArrayIn(val interface{}, array interface{}) (exists bool, index int) { case reflect.Slice: s := reflect.ValueOf(array) for i := 0; i < s.Len(); i++ { - if reflect.DeepEqual(val, s.Index(i).Interface()) == true { + if reflect.DeepEqual(val, s.Index(i).Interface()) { index = i exists = true return From 76285543569aae85ce97b29568dc7ec69fb99090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 20:46:34 +0100 Subject: [PATCH 012/876] redundant break statement. --- internal/http/endpoint/endpoint.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/http/endpoint/endpoint.go b/internal/http/endpoint/endpoint.go index fcfcb1ae..b6734be7 100644 --- a/internal/http/endpoint/endpoint.go +++ b/internal/http/endpoint/endpoint.go @@ -63,10 +63,8 @@ func errResponse(input interface{}) *ErrResponse { case *error: e := err.(error) res.Details = e.Error() - break default: res.Details = fmt.Sprintf("%+v", err) - break } } From 2f0b159ad644e3f54d54a76f70df644961c9958c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 20:54:09 +0100 Subject: [PATCH 013/876] SetEphemeralUDPPortRange error catch. --- internal/webrtc/webrtc.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index 0ea8e652..80c71887 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -95,7 +95,11 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri settings.SetLite(true) } - settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) + err := settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) + if err != nil { + return "", manager.config.ICELite, manager.config.ICEServers, err + } + settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) // Create MediaEngine based off sdp From 4093bc531123c144cce1c2c273e070aa833b1e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 20:56:14 +0100 Subject: [PATCH 014/876] peer connection SetLocalDescription error catch. --- internal/webrtc/webrtc.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index 80c71887..2ad1e5f1 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -142,7 +142,10 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri }) }) - connection.SetLocalDescription(description) + if err := connection.SetLocalDescription(description); err != nil { + return "", manager.config.ICELite, manager.config.ICEServers, err + } + connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateDisconnected: From f521373f9baee20a03e18a6dba0bfa0d66cbc224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 21:50:19 +0100 Subject: [PATCH 015/876] should omit comparison to bool constant. --- internal/session/manager.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index d68d578f..33829f7a 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -42,7 +42,7 @@ func (manager *SessionManager) New(id string, admin bool, socket types.WebSocket manager.members[id] = session manager.emmiter.Emit("created", id, session) - if manager.remote.Streaming() != true && len(manager.members) > 0 { + if !manager.remote.Streaming() && len(manager.members) > 0 { manager.remote.StartStream() } @@ -124,7 +124,7 @@ func (manager *SessionManager) Destroy(id string) error { err := session.destroy() delete(manager.members, id) - if manager.remote.Streaming() != false && len(manager.members) <= 0 { + if !manager.remote.Streaming() && len(manager.members) <= 0 { manager.remote.StopStream() } From f751cba428c25f8112412020c26ff89d4a9c6a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 21:50:47 +0100 Subject: [PATCH 016/876] sessions Destroy log error. --- internal/webrtc/webrtc.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index 2ad1e5f1..359e32a4 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -151,13 +151,17 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri case webrtc.PeerConnectionStateDisconnected: case webrtc.PeerConnectionStateFailed: manager.logger.Info().Str("id", id).Msg("peer disconnected") - manager.sessions.Destroy(id) + if err = manager.sessions.Destroy(id); err != nil { + manager.logger.Warn().Err(err).Msg("error while destroying session") + } break case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", id).Msg("peer connected") if err = session.SetConnected(true); err != nil { manager.logger.Warn().Err(err).Msg("unable to set connected on peer") - manager.sessions.Destroy(id) + if err = manager.sessions.Destroy(id); err != nil { + manager.logger.Warn().Err(err).Msg("error while destroying session") + } } break } From 2b0d85a98c8dd140e7cb81efbb566820a8ebb6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 21:54:48 +0100 Subject: [PATCH 017/876] redundant break statement. --- internal/webrtc/handle.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/internal/webrtc/handle.go b/internal/webrtc/handle.go index 35c4b235..851cfd66 100644 --- a/internal/webrtc/handle.go +++ b/internal/webrtc/handle.go @@ -63,7 +63,6 @@ func (manager *WebRTCManager) handle(id string, msg webrtc.DataChannelMessage) e } manager.remote.Move(int(payload.X), int(payload.Y)) - break case OP_SCROLL: payload := &PayloadScroll{} if err := binary.Read(buffer, binary.LittleEndian, payload); err != nil { @@ -77,7 +76,6 @@ func (manager *WebRTCManager) handle(id string, msg webrtc.DataChannelMessage) e Msg("scroll") manager.remote.Scroll(int(payload.X), int(payload.Y)) - break case OP_KEY_DOWN: payload := &PayloadKey{} if err := binary.Read(buffer, binary.LittleEndian, payload); err != nil { @@ -101,8 +99,6 @@ func (manager *WebRTCManager) handle(id string, msg webrtc.DataChannelMessage) e manager.logger.Debug().Msgf("key down %d", payload.Key) } - - break case OP_KEY_UP: payload := &PayloadKey{} err := binary.Read(buffer, binary.LittleEndian, payload) From 95ce0063eccf66de29ead20198b64b19c3494f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 21:59:37 +0100 Subject: [PATCH 018/876] set host catch error. --- internal/websocket/admin.go | 10 ++++++++-- internal/websocket/control.go | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/internal/websocket/admin.go b/internal/websocket/admin.go index dd78a770..cc3e6f05 100644 --- a/internal/websocket/admin.go +++ b/internal/websocket/admin.go @@ -66,7 +66,10 @@ func (h *MessageHandler) adminControl(id string, session types.Session) error { host, ok := h.sessions.GetHost() - h.sessions.SetHost(id) + if err := h.sessions.SetHost(id); err != nil { + h.logger.Warn().Err(err).Msgf("SetHost failed") + return err + } if ok { if err := h.sessions.Broadcast( @@ -138,7 +141,10 @@ func (h *MessageHandler) adminGive(id string, session types.Session, payload *me } // set host - h.sessions.SetHost(payload.ID) + if err := h.sessions.SetHost(payload.ID); err != nil { + h.logger.Warn().Err(err).Msgf("SetHost failed") + return err + } // let everyone know if err := h.sessions.Broadcast( diff --git a/internal/websocket/control.go b/internal/websocket/control.go index cf771bc3..b02fe6c8 100644 --- a/internal/websocket/control.go +++ b/internal/websocket/control.go @@ -35,7 +35,10 @@ func (h *MessageHandler) controlRequest(id string, session types.Session) error // check for host if !h.sessions.HasHost() { // set host - h.sessions.SetHost(id) + if err := h.sessions.SetHost(id); err != nil { + h.logger.Warn().Err(err).Msgf("SetHost failed") + return err + } // let everyone know if err := h.sessions.Broadcast( @@ -89,7 +92,10 @@ func (h *MessageHandler) controlGive(id string, session types.Session, payload * } // set host - h.sessions.SetHost(payload.ID) + if err := h.sessions.SetHost(payload.ID); err != nil { + h.logger.Warn().Err(err).Msgf("SetHost failed") + return err + } // let everyone know if err := h.sessions.Broadcast( From 1e3abf51aff17cce3ee58de92ca5490f3a60c280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 22:02:31 +0100 Subject: [PATCH 019/876] remove unused package. --- internal/session/session.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 2ca194a2..35eb18d4 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -1,8 +1,6 @@ package session import ( - "sync" - "github.com/rs/zerolog" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" @@ -19,7 +17,6 @@ type Session struct { manager *SessionManager socket types.WebSocket peer types.Peer - mu sync.Mutex } func (session *Session) ID() string { From 541ca808786b6a1972e7ebf7e66025bb4bb8d377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 22:02:42 +0100 Subject: [PATCH 020/876] unknown session id return error. --- internal/websocket/handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/websocket/handler.go b/internal/websocket/handler.go index 001676d9..ed6a2b3a 100644 --- a/internal/websocket/handler.go +++ b/internal/websocket/handler.go @@ -61,7 +61,7 @@ func (h *MessageHandler) Message(id string, raw []byte) error { session, ok := h.sessions.Get(id) if !ok { - errors.Errorf("unknown session id %s", id) + return errors.Errorf("unknown session id %s", id) } switch header.Event { From 1ce6dad973c108d8076f19b6f708b31327aea7fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 22:07:18 +0100 Subject: [PATCH 021/876] log clipboard sync error. --- internal/websocket/websocket.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index a09151bc..2db416a0 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -96,10 +96,12 @@ func (ws *WebSocketHandler) Start() { if text != current { session, ok := ws.sessions.GetHost() if ok { - session.Send(message.Clipboard{ + if err := session.Send(message.Clipboard{ Event: event.CONTROL_CLIPBOARD, Text: text, - }) + }); err != nil { + ws.logger.Warn().Err(err).Msg("could not sync clipboard") + } } current = text } From 91fed3c4805c4eb987c8e68d953291094426fc38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 22:09:02 +0100 Subject: [PATCH 022/876] log socket disconnected error. --- internal/websocket/websocket.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index 2db416a0..11ee9bae 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -228,7 +228,9 @@ func (ws *WebSocketHandler) handle(connection *websocket.Conn, id string) { defer func() { ticker.Stop() ws.logger.Debug().Str("address", connection.RemoteAddr().String()).Msg("handle socket ending") - ws.handler.Disconnected(id) + if err := ws.handler.Disconnected(id); err != nil { + ws.logger.Warn().Err(err).Msg("socket disconnected with error") + } }() for { From f5fcf724f49a64e77eea45401fad8a5b3989ee66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 22:09:48 +0100 Subject: [PATCH 023/876] unnecessary assignment to the blank identifier. --- internal/websocket/websocket.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index 11ee9bae..20390dcb 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -261,7 +261,7 @@ func (ws *WebSocketHandler) handle(connection *websocket.Conn, id string) { } case <-cancel: return - case _ = <-ticker.C: + case <-ticker.C: if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { return } From 7ec3d5ac6d73602d223a7684ae44da69f3084ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 22:21:31 +0100 Subject: [PATCH 024/876] add nolint. --- cmd/root.go | 1 + internal/http/endpoint/endpoint.go | 1 + internal/xorg/xorg.go | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/cmd/root.go b/cmd/root.go index 6364bc7d..78af80df 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -52,6 +52,7 @@ func init() { } if _, err := os.Stat(logs); os.IsNotExist(err) { + //nolint os.Mkdir(logs, os.ModePerm) } diff --git a/internal/http/endpoint/endpoint.go b/internal/http/endpoint/endpoint.go index b6734be7..92a29424 100644 --- a/internal/http/endpoint/endpoint.go +++ b/internal/http/endpoint/endpoint.go @@ -41,6 +41,7 @@ func errResponse(input interface{}) *ErrResponse { var res *ErrResponse var err interface{} + //nolint switch input.(type) { case *HandlerError: e := input.(*HandlerError) diff --git a/internal/xorg/xorg.go b/internal/xorg/xorg.go index ec5d0727..ebe25baf 100644 --- a/internal/xorg/xorg.go +++ b/internal/xorg/xorg.go @@ -130,11 +130,13 @@ func WriteClipboard(data string) { func ResetKeys() { for code := range debounce_button { + //nolint ButtonUp(code) delete(debounce_button, code) } for code := range debounce_key { + //nolint KeyUp(code) delete(debounce_key, code) @@ -147,6 +149,7 @@ func CheckKeys(duration time.Duration) { if t.Sub(start) < duration { continue } + //nolint ButtonUp(code) delete(debounce_button, code) @@ -155,6 +158,7 @@ func CheckKeys(duration time.Duration) { if t.Sub(start) < duration { continue } + //nolint KeyUp(code) delete(debounce_key, code) From 4b39607af01cbdf8dc4f96546896aca736a06d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 22:24:19 +0100 Subject: [PATCH 025/876] redundant break statement. --- internal/webrtc/handle.go | 2 -- internal/webrtc/webrtc.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/webrtc/handle.go b/internal/webrtc/handle.go index 851cfd66..57b233d2 100644 --- a/internal/webrtc/handle.go +++ b/internal/webrtc/handle.go @@ -123,10 +123,8 @@ func (manager *WebRTCManager) handle(id string, msg webrtc.DataChannelMessage) e manager.logger.Debug().Msgf("key up %d", payload.Key) } - break case OP_KEY_CLK: // unused - break } return nil diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index 359e32a4..6b6afe7d 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -154,7 +154,6 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri if err = manager.sessions.Destroy(id); err != nil { manager.logger.Warn().Err(err).Msg("error while destroying session") } - break case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", id).Msg("peer connected") if err = session.SetConnected(true); err != nil { @@ -163,7 +162,6 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri manager.logger.Warn().Err(err).Msg("error while destroying session") } } - break } }) From e1ef49c46a472f72c52c8b32da896b6331218328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 22:28:10 +0100 Subject: [PATCH 026/876] ws upgrade fail error message. --- internal/http/http.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/http/http.go b/internal/http/http.go index 735bf17a..daf88ae8 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -33,7 +33,9 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { router.Use(customMiddleware.Logger) // Log API request calls using custom logger function router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { - webSocketHandler.Upgrade(w, r) + if webSocketHandler.Upgrade(w, r) != nil { + w.Write([]byte("unable to upgrade your connection to a websocket")) + } }) fs := http.FileServer(http.Dir(conf.Static)) From 7d5df0346ee9b6e5bd18743cc01cdc878d6abc2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 22:36:30 +0100 Subject: [PATCH 027/876] add nolint. --- internal/http/http.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/http/http.go b/internal/http/http.go index daf88ae8..c0322c2f 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -34,6 +34,7 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { if webSocketHandler.Upgrade(w, r) != nil { + //nolint w.Write([]byte("unable to upgrade your connection to a websocket")) } }) From 96e99955fcc75941d42d71abf420049e27573b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 29 Oct 2020 17:50:04 +0100 Subject: [PATCH 028/876] refactor rempte manager - start pipeline only once. --- internal/remote/manager.go | 52 +++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/internal/remote/manager.go b/internal/remote/manager.go index d0ad05e8..2d8119e3 100644 --- a/internal/remote/manager.go +++ b/internal/remote/manager.go @@ -48,13 +48,18 @@ func (manager *RemoteManager) AudioCodec() string { func (manager *RemoteManager) Start() { xorg.Display(manager.config.Display) + manager.logger.Info(). + Str("screen_resolution", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). + Msgf("Setting screen resolution...") + if !xorg.ValidScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) { manager.logger.Warn().Msgf("invalid screen option %dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) } else if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { manager.logger.Warn().Err(err).Msg("unable to change screen size") } - manager.createPipelines() + manager.createVideoPipeline() + manager.createAudioPipeline() manager.broadcast.Start() go func() { @@ -101,17 +106,7 @@ func (manager *RemoteManager) OnAudioFrame(listener func(sample types.Sample)) { } func (manager *RemoteManager) StartStream() { - manager.createPipelines() - - manager.logger.Info(). - Str("video_display", manager.config.Display). - Str("video_codec", manager.config.VideoCodec). - Str("audio_device", manager.config.Device). - Str("audio_codec", manager.config.AudioCodec). - Str("audio_pipeline_src", manager.audio.Src). - Str("video_pipeline_src", manager.video.Src). - Str("screen_resolution", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). - Msgf("Pipelines starting...") + manager.logger.Info().Msgf("Pipelines starting...") manager.video.Start() manager.audio.Start() @@ -120,6 +115,7 @@ func (manager *RemoteManager) StartStream() { func (manager *RemoteManager) StopStream() { manager.logger.Info().Msgf("Pipelines shutting down...") + manager.video.Stop() manager.audio.Stop() manager.streaming = false @@ -129,22 +125,41 @@ func (manager *RemoteManager) Streaming() bool { return manager.streaming } -func (manager *RemoteManager) createPipelines() { +func (manager *RemoteManager) createVideoPipeline() { var err error + + manager.logger.Info(). + Str("video_codec", manager.config.VideoCodec). + Str("video_display", manager.config.Display). + Str("video_params", manager.config.VideoParams). + Msgf("Creating video pipeline...") + manager.video, err = gst.CreateAppPipeline( manager.config.VideoCodec, manager.config.Display, manager.config.VideoParams, ) + if err != nil { manager.logger.Panic().Err(err).Msg("unable to create video pipeline") } +} + +func (manager *RemoteManager) createAudioPipeline() { + var err error + + manager.logger.Info(). + Str("audio_codec", manager.config.AudioCodec). + Str("audio_display", manager.config.Device). + Str("audio_params", manager.config.AudioParams). + Msgf("Creating audio pipeline...") manager.audio, err = gst.CreateAppPipeline( manager.config.AudioCodec, manager.config.Device, manager.config.AudioParams, ) + if err != nil { manager.logger.Panic().Err(err).Msg("unable to create audio pipeline") } @@ -169,16 +184,7 @@ func (manager *RemoteManager) ChangeResolution(width int, height int, rate int) return err } - var err error - manager.video, err = gst.CreateAppPipeline( - manager.config.VideoCodec, - manager.config.Display, - manager.config.VideoParams, - ) - if err != nil { - manager.logger.Panic().Err(err).Msg("unable to create new video pipeline") - } - + manager.createVideoPipeline() return nil } From cd769c05d39eb07ed3cf74b38b371b6cda8d8dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 29 Oct 2020 17:51:17 +0100 Subject: [PATCH 029/876] gst - correctly destroy unused pipelines. --- internal/gst/gst.c | 5 +++++ internal/gst/gst.go | 5 +++++ internal/gst/gst.h | 1 + internal/remote/manager.go | 6 +++--- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/internal/gst/gst.c b/internal/gst/gst.c index 924787fb..a4f5b78b 100644 --- a/internal/gst/gst.c +++ b/internal/gst/gst.c @@ -68,6 +68,11 @@ GstElement *gstreamer_send_create_pipeline(char *pipeline) { return gst_parse_launch(pipeline, &error); } +void gstreamer_send_destroy_pipeline(GstElement *pipeline) { + gst_element_set_state (pipeline, GST_STATE_NULL); + gst_object_unref (pipeline); +} + void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId) { SampleHandlerUserData *s = calloc(1, sizeof(SampleHandlerUserData)); s->pipelineId = pipelineId; diff --git a/internal/gst/gst.go b/internal/gst/gst.go index 57f230e4..a147d472 100644 --- a/internal/gst/gst.go +++ b/internal/gst/gst.go @@ -231,6 +231,11 @@ func CreatePipeline(pipelineStr string, codecName string, clockRate float32) (*P return p, nil } +// Destroy GStreamer Pipeline +func (p *Pipeline) DestroyPipeline() { + C.gstreamer_send_destroy_pipeline(p.Pipeline) +} + // Start starts the GStreamer Pipeline func (p *Pipeline) Start() { C.gstreamer_send_start_pipeline(p.Pipeline, C.int(p.id)) diff --git a/internal/gst/gst.h b/internal/gst/gst.h index 7c6965f4..19b3b5b7 100644 --- a/internal/gst/gst.h +++ b/internal/gst/gst.h @@ -9,6 +9,7 @@ extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); GstElement *gstreamer_send_create_pipeline(char *pipeline); +void gstreamer_send_destroy_pipeline(GstElement *pipeline); void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId); void gstreamer_send_play_pipeline(GstElement *pipeline); diff --git a/internal/remote/manager.go b/internal/remote/manager.go index 2d8119e3..5b5792de 100644 --- a/internal/remote/manager.go +++ b/internal/remote/manager.go @@ -84,8 +84,8 @@ func (manager *RemoteManager) Start() { func (manager *RemoteManager) Shutdown() error { manager.logger.Info().Msgf("remote shutting down") - manager.video.Stop() - manager.audio.Stop() + manager.video.DestroyPipeline() + manager.audio.DestroyPipeline() manager.broadcast.Stop() manager.cleanup.Stop() @@ -170,7 +170,7 @@ func (manager *RemoteManager) ChangeResolution(width int, height int, rate int) return fmt.Errorf("unknown configuration") } - manager.video.Stop() + manager.video.DestroyPipeline() manager.broadcast.Stop() defer func() { From 78c397ef542440a24c911b90cc2da3f99125229b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 29 Oct 2020 18:07:04 +0100 Subject: [PATCH 030/876] fix formatting. --- internal/gst/gst.c | 10 ++++------ internal/remote/manager.go | 1 + internal/session/session.go | 1 + internal/xorg/xorg.c | 20 ++++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/gst/gst.c b/internal/gst/gst.c index a4f5b78b..b68dccee 100644 --- a/internal/gst/gst.c +++ b/internal/gst/gst.c @@ -50,14 +50,14 @@ GstFlowReturn gstreamer_send_new_sample_handler(GstElement *object, gpointer use gsize copy_size = 0; SampleHandlerUserData *s = (SampleHandlerUserData *)user_data; - g_signal_emit_by_name (object, "pull-sample", &sample); + g_signal_emit_by_name(object, "pull-sample", &sample); if (sample) { buffer = gst_sample_get_buffer(sample); if (buffer) { gst_buffer_extract_dup(buffer, 0, gst_buffer_get_size(buffer), ©, ©_size); goHandlePipelineBuffer(copy, copy_size, GST_BUFFER_DURATION(buffer), s->pipelineId); } - gst_sample_unref (sample); + gst_sample_unref(sample); } return GST_FLOW_OK; @@ -69,8 +69,8 @@ GstElement *gstreamer_send_create_pipeline(char *pipeline) { } void gstreamer_send_destroy_pipeline(GstElement *pipeline) { - gst_element_set_state (pipeline, GST_STATE_NULL); - gst_object_unref (pipeline); + gst_element_set_state(pipeline, GST_STATE_NULL); + gst_object_unref(pipeline); } void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId) { @@ -96,5 +96,3 @@ void gstreamer_send_play_pipeline(GstElement *pipeline) { void gstreamer_send_stop_pipeline(GstElement *pipeline) { gst_element_set_state(pipeline, GST_STATE_NULL); } - - diff --git a/internal/remote/manager.go b/internal/remote/manager.go index 5b5792de..19f803bd 100644 --- a/internal/remote/manager.go +++ b/internal/remote/manager.go @@ -7,6 +7,7 @@ import ( "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "demodesk/neko/internal/gst" "demodesk/neko/internal/types" "demodesk/neko/internal/types/config" diff --git a/internal/session/session.go b/internal/session/session.go index 35eb18d4..869d7fda 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -2,6 +2,7 @@ package session import ( "github.com/rs/zerolog" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" diff --git a/internal/xorg/xorg.c b/internal/xorg/xorg.c index 58421f5f..6c7b72eb 100644 --- a/internal/xorg/xorg.c +++ b/internal/xorg/xorg.c @@ -54,7 +54,7 @@ void XDisplaySet(char *input) { void XMove(int x, int y) { Display *display = getXDisplay(); - XWarpPointer(display, None, DefaultRootWindow(display), 0, 0, 0, 0, x, y); + XWarpPointer(display, None, DefaultRootWindow(display), 0, 0, 0, 0, x, y); XSync(display, 0); } @@ -102,7 +102,7 @@ void XKey(unsigned long key, int down) { KeyCode code = XKeysymToKeycode(display, key); // Map non-existing keysyms to new keycodes - if(code == 0) { + if (code == 0) { int min, max, numcodes; XDisplayKeycodes(display, &min, &max); XGetKeyboardMapping(display, min, max-min, &numcodes); @@ -129,19 +129,19 @@ char *XClipboardGet() { } void XGetScreenConfigurations() { - Display *display = getXDisplay(); - Window root = RootWindow(display, 0); + Display *display = getXDisplay(); + Window root = RootWindow(display, 0); XRRScreenSize *xrrs; - int num_sizes; + int num_sizes; xrrs = XRRSizes(display, 0, &num_sizes); - for(int i = 0; i < num_sizes; i ++) { + for (int i = 0; i < num_sizes; i++) { short *rates; - int num_rates; + int num_rates; goCreateScreenSize(i, xrrs[i].width, xrrs[i].height, xrrs[i].mwidth, xrrs[i].mheight); rates = XRRRates(display, 0, i, &num_rates); - for (int j = 0; j < num_rates; j ++) { + for (int j = 0; j < num_rates; j++) { goSetScreenRates(i, j, rates[j]); } } @@ -155,14 +155,14 @@ void XSetScreenConfiguration(int index, short rate) { int XGetScreenSize() { Display *display = getXDisplay(); - XRRScreenConfiguration *conf = XRRGetScreenInfo(display, RootWindow(display, 0)); + XRRScreenConfiguration *conf = XRRGetScreenInfo(display, RootWindow(display, 0)); Rotation original_rotation; return XRRConfigCurrentConfiguration(conf, &original_rotation); } short XGetScreenRate() { Display *display = getXDisplay(); - XRRScreenConfiguration *conf = XRRGetScreenInfo(display, RootWindow(display, 0)); + XRRScreenConfiguration *conf = XRRGetScreenInfo(display, RootWindow(display, 0)); return XRRConfigCurrentRate(conf); } From 3c5c01f475a197daeb7a98892df4bc01dacfa761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 29 Oct 2020 18:11:30 +0100 Subject: [PATCH 031/876] remove chat. --- internal/types/event/events.go | 5 ---- internal/types/message/messages.go | 11 -------- internal/websocket/chat.go | 41 ------------------------------ internal/websocket/handler.go | 15 ----------- 4 files changed, 72 deletions(-) delete mode 100644 internal/websocket/chat.go diff --git a/internal/types/event/events.go b/internal/types/event/events.go index b97c49c8..5d11b3e3 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -25,11 +25,6 @@ const ( CONTROL_KEYBOARD = "control/keyboard" ) -const ( - CHAT_MESSAGE = "chat/message" - CHAT_EMOTE = "chat/emote" -) - const ( SCREEN_CONFIGURATIONS = "screen/configurations" SCREEN_RESOLUTION = "screen/resolution" diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index ae9431ef..ee7a20ba 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -65,17 +65,6 @@ type ControlTarget struct { Target string `json:"target"` } -type ChatReceive struct { - Event string `json:"event"` - Content string `json:"content"` -} - -type ChatSend struct { - Event string `json:"event"` - ID string `json:"id"` - Content string `json:"content"` -} - type EmoteReceive struct { Event string `json:"event"` Emote string `json:"emote"` diff --git a/internal/websocket/chat.go b/internal/websocket/chat.go deleted file mode 100644 index 735c5554..00000000 --- a/internal/websocket/chat.go +++ /dev/null @@ -1,41 +0,0 @@ -package websocket - -import ( - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" -) - -func (h *MessageHandler) chat(id string, session types.Session, payload *message.ChatReceive) error { - if session.Muted() { - return nil - } - - if err := h.sessions.Broadcast( - message.ChatSend{ - Event: event.CHAT_MESSAGE, - Content: payload.Content, - ID: id, - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) - return err - } - return nil -} - -func (h *MessageHandler) chatEmote(id string, session types.Session, payload *message.EmoteReceive) error { - if session.Muted() { - return nil - } - - if err := h.sessions.Broadcast( - message.EmoteSend{ - Event: event.CHAT_EMOTE, - Emote: payload.Emote, - ID: id, - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) - return err - } - return nil -} diff --git a/internal/websocket/handler.go b/internal/websocket/handler.go index ed6a2b3a..86038711 100644 --- a/internal/websocket/handler.go +++ b/internal/websocket/handler.go @@ -97,21 +97,6 @@ func (h *MessageHandler) Message(id string, raw []byte) error { return h.controlKeyboard(id, session, payload) }), "%s failed", header.Event) - - // Chat Events - case event.CHAT_MESSAGE: - payload := &message.ChatReceive{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.chat(id, session, payload) - }), "%s failed", header.Event) - case event.CHAT_EMOTE: - payload := &message.EmoteReceive{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.chatEmote(id, session, payload) - }), "%s failed", header.Event) - // Screen Events case event.SCREEN_RESOLUTION: return errors.Wrapf(h.screenResolution(id, session), "%s failed", header.Event) From fc3ee13f657df0d444c235eec97f047f1aed5836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 29 Oct 2020 22:12:33 +0100 Subject: [PATCH 032/876] move logger to http package. --- internal/http/http.go | 5 ++--- internal/http/{middleware => }/logger.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) rename internal/http/{middleware => }/logger.go (98%) diff --git a/internal/http/http.go b/internal/http/http.go index c0322c2f..0a9b15bd 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -12,7 +12,6 @@ import ( "github.com/rs/zerolog/log" "demodesk/neko/internal/http/endpoint" - customMiddleware "demodesk/neko/internal/http/middleware" "demodesk/neko/internal/types" "demodesk/neko/internal/types/config" ) @@ -30,7 +29,7 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { router := chi.NewRouter() router.Use(middleware.Recoverer) // Recover from panics without crashing server router.Use(middleware.RequestID) // Create a request ID for each request - router.Use(customMiddleware.Logger) // Log API request calls using custom logger function + router.Use(Logger) // Log API request calls using custom logger function router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { if webSocketHandler.Upgrade(w, r) != nil { @@ -51,7 +50,7 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { router.NotFound(endpoint.Handle(func(w http.ResponseWriter, r *http.Request) error { return &endpoint.HandlerError{ Status: http.StatusNotFound, - Message: fmt.Sprintf("file '%s' is not found", r.RequestURI), + Message: fmt.Sprintf("Endpoint '%s' was not found.", r.RequestURI), } })) diff --git a/internal/http/middleware/logger.go b/internal/http/logger.go similarity index 98% rename from internal/http/middleware/logger.go rename to internal/http/logger.go index b20ea9ac..dabffea1 100644 --- a/internal/http/middleware/logger.go +++ b/internal/http/logger.go @@ -1,4 +1,4 @@ -package middleware +package http import ( "fmt" From 5acd428dee3c6ee6ee1befc79737cd04da9ce0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 29 Oct 2020 22:23:30 +0100 Subject: [PATCH 033/876] create api skeleton. --- internal/api/member/authenticate.go | 1 + internal/api/room/broadcast.go | 1 + internal/api/room/clipboard.go | 1 + internal/api/room/control.go | 1 + internal/api/room/keyboard.go | 1 + internal/api/room/resolution.go | 1 + internal/api/router.go | 40 +++++++++++++++++++++++++++++ internal/http/http.go | 4 +++ 8 files changed, 50 insertions(+) create mode 100644 internal/api/member/authenticate.go create mode 100644 internal/api/room/broadcast.go create mode 100644 internal/api/room/clipboard.go create mode 100644 internal/api/room/control.go create mode 100644 internal/api/room/keyboard.go create mode 100644 internal/api/room/resolution.go create mode 100644 internal/api/router.go diff --git a/internal/api/member/authenticate.go b/internal/api/member/authenticate.go new file mode 100644 index 00000000..363b41ee --- /dev/null +++ b/internal/api/member/authenticate.go @@ -0,0 +1 @@ +package member diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go new file mode 100644 index 00000000..01912655 --- /dev/null +++ b/internal/api/room/broadcast.go @@ -0,0 +1 @@ +package room diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go new file mode 100644 index 00000000..01912655 --- /dev/null +++ b/internal/api/room/clipboard.go @@ -0,0 +1 @@ +package room diff --git a/internal/api/room/control.go b/internal/api/room/control.go new file mode 100644 index 00000000..01912655 --- /dev/null +++ b/internal/api/room/control.go @@ -0,0 +1 @@ +package room diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go new file mode 100644 index 00000000..01912655 --- /dev/null +++ b/internal/api/room/keyboard.go @@ -0,0 +1 @@ +package room diff --git a/internal/api/room/resolution.go b/internal/api/room/resolution.go new file mode 100644 index 00000000..01912655 --- /dev/null +++ b/internal/api/room/resolution.go @@ -0,0 +1 @@ +package room diff --git a/internal/api/router.go b/internal/api/router.go new file mode 100644 index 00000000..b03f1a8d --- /dev/null +++ b/internal/api/router.go @@ -0,0 +1,40 @@ +package api + +import ( + "net/http" + + "github.com/go-chi/chi" + + // "demodesk/neko/internal/api/member" + // "demodesk/neko/internal/api/room" +) + +func Mount(router *chi.Mux) { + // all member routes + router.Mount("/member", MemberRoutes()) + + // all room routes + router.Mount("/room", RoomRoutes()) +} + +func MemberRoutes() *chi.Mux { + router := chi.NewRouter() + + router.Get("/test", func(w http.ResponseWriter, r *http.Request) { + //nolint + w.Write([]byte("hello world")) + }) + + return router +} + +func RoomRoutes() *chi.Mux { + router := chi.NewRouter() + + router.Get("/test", func(w http.ResponseWriter, r *http.Request) { + //nolint + w.Write([]byte("hello world")) + }) + + return router +} diff --git a/internal/http/http.go b/internal/http/http.go index 0a9b15bd..973405aa 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -11,6 +11,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "demodesk/neko/internal/api" "demodesk/neko/internal/http/endpoint" "demodesk/neko/internal/types" "demodesk/neko/internal/types/config" @@ -31,6 +32,9 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { router.Use(middleware.RequestID) // Create a request ID for each request router.Use(Logger) // Log API request calls using custom logger function + // Mount REST API + api.Mount(router) + router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { if webSocketHandler.Upgrade(w, r) != nil { //nolint From dabd7e368ef82feb9eb43496a1cd1068695cf7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Oct 2020 17:00:42 +0100 Subject: [PATCH 034/876] add go-chi/render module. --- go.mod | 1 + go.sum | 2 ++ 2 files changed, 3 insertions(+) diff --git a/go.mod b/go.mod index 0c99f262..c9527eaa 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-chi/chi v4.1.0+incompatible + github.com/go-chi/render v1.0.1 github.com/golang/protobuf v1.3.5 // indirect github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 diff --git a/go.sum b/go.sum index 67ae498c..1d37322d 100644 --- a/go.sum +++ b/go.sum @@ -52,6 +52,8 @@ github.com/go-chi/chi v4.0.3+incompatible h1:gakN3pDJnzZN5jqFV2TEdF66rTfKeITyR8q github.com/go-chi/chi v4.0.3+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-chi/chi v4.1.0+incompatible h1:ETj3cggsVIY2Xao5ExCu6YhEh5MD6JTfcBzS37R260w= github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= +github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= From dc32e64190cd24e396e6fb0d9b807702b8919732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Oct 2020 18:16:21 +0100 Subject: [PATCH 035/876] api manager. --- internal/api/member/handler.go | 32 +++++++++++++++++ internal/api/room/handler.go | 45 ++++++++++++++++++++++++ internal/api/room/resolution.go | 60 +++++++++++++++++++++++++++++++ internal/api/router.go | 62 +++++++++++++++++---------------- internal/http/http.go | 11 ++++-- neko.go | 8 ++++- 6 files changed, 185 insertions(+), 33 deletions(-) create mode 100644 internal/api/member/handler.go create mode 100644 internal/api/room/handler.go diff --git a/internal/api/member/handler.go b/internal/api/member/handler.go new file mode 100644 index 00000000..088212db --- /dev/null +++ b/internal/api/member/handler.go @@ -0,0 +1,32 @@ +package member + +import ( + "github.com/go-chi/chi" + + "demodesk/neko/internal/types" +) + +type MemberHandler struct { + sessions types.SessionManager + websocket types.WebSocketHandler +} + +func New( + sessions types.SessionManager, + websocket types.WebSocketHandler, +) *MemberHandler { + // Init + + return &MemberHandler{ + sessions: sessions, + websocket: websocket, + } +} + +func (h *MemberHandler) Router() *chi.Mux { + r := chi.NewRouter() + + // TODO + + return r +} diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go new file mode 100644 index 00000000..2ec948a6 --- /dev/null +++ b/internal/api/room/handler.go @@ -0,0 +1,45 @@ +package room + +import ( + "github.com/go-chi/chi" + + "demodesk/neko/internal/types" +) + +type RoomHandler struct { + sessions types.SessionManager + remote types.RemoteManager + broadcast types.BroadcastManager + websocket types.WebSocketHandler +} + +func New( + sessions types.SessionManager, + remote types.RemoteManager, + broadcast types.BroadcastManager, + websocket types.WebSocketHandler, +) *RoomHandler { + // Init + + return &RoomHandler{ + sessions: sessions, + remote: remote, + broadcast: broadcast, + websocket: websocket, + } +} + +func (h *RoomHandler) Router() *chi.Mux { + r := chi.NewRouter() + + r.Route("/resolution", func(r chi.Router) { + r.Get("/", h.ResolutionGet) + r.Post("/", h.ResolutionChange) + + r.Get("/list", h.ResolutionList) + }) + + // TODO + + return r +} diff --git a/internal/api/room/resolution.go b/internal/api/room/resolution.go index 01912655..138e91fd 100644 --- a/internal/api/room/resolution.go +++ b/internal/api/room/resolution.go @@ -1 +1,61 @@ package room + +import ( + "net/http" + + "github.com/go-chi/render" +) + +type ErrResponse struct { + Code int `json:"code"` + Message string `json:"message"` +} + +type ResolutionStruct struct { + Width int `json:"width"` + Height int `json:"height"` + Rate int `json:"rate"` +} + +func (h *RoomHandler) ResolutionGet(w http.ResponseWriter, r *http.Request) { + size := h.remote.GetScreenSize() + + if size == nil { + w.WriteHeader(http.StatusInternalServerError) + render.JSON(w, r, ErrResponse{ + Code: -1, + Message: "Unable to get current screen resolution.", + }) + return + } + + render.JSON(w, r, ResolutionStruct{ + Width: size.Width, + Height: size.Height, + Rate: int(size.Rate), + }) +} + +func (h *RoomHandler) ResolutionChange(w http.ResponseWriter, r *http.Request) { + // data := &ResolutionStruct{} + // if err := render.Bind(r, data); err != nil { + // render.JSON(w, r, ErrResponse{ + // Code: -1, + // Message: "Invalid Request.", + // }) + // return + // } + + render.JSON(w, r, ErrResponse{ + Code: -1, + Message: "Not implmented.", + }) +} + +func (h *RoomHandler) ResolutionList(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusInternalServerError) + render.JSON(w, r, ErrResponse{ + Code: -1, + Message: "Not implmented.", + }) +} diff --git a/internal/api/router.go b/internal/api/router.go index b03f1a8d..c7e0285c 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -1,40 +1,42 @@ package api import ( - "net/http" - "github.com/go-chi/chi" - // "demodesk/neko/internal/api/member" - // "demodesk/neko/internal/api/room" + "demodesk/neko/internal/api/member" + "demodesk/neko/internal/api/room" + "demodesk/neko/internal/types" ) -func Mount(router *chi.Mux) { +type API struct { + sessions types.SessionManager + remote types.RemoteManager + broadcast types.BroadcastManager + websocket types.WebSocketHandler +} + +func New( + sessions types.SessionManager, + remote types.RemoteManager, + broadcast types.BroadcastManager, + websocket types.WebSocketHandler, +) *API { + // Init + + return &API{ + sessions: sessions, + remote: remote, + broadcast: broadcast, + websocket: websocket, + } +} + +func (a *API) Mount(router *chi.Mux) { // all member routes - router.Mount("/member", MemberRoutes()) + memberHandler := member.New(a.sessions, a.websocket) + router.Mount("/member", memberHandler.Router()) - // all room routes - router.Mount("/room", RoomRoutes()) -} - -func MemberRoutes() *chi.Mux { - router := chi.NewRouter() - - router.Get("/test", func(w http.ResponseWriter, r *http.Request) { - //nolint - w.Write([]byte("hello world")) - }) - - return router -} - -func RoomRoutes() *chi.Mux { - router := chi.NewRouter() - - router.Get("/test", func(w http.ResponseWriter, r *http.Request) { - //nolint - w.Write([]byte("hello world")) - }) - - return router + // get room routes + roomHandler := room.New(a.sessions, a.remote, a.broadcast, a.websocket) + router.Mount("/room", roomHandler.Router()) } diff --git a/internal/http/http.go b/internal/http/http.go index 973405aa..cab997d1 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -24,7 +24,13 @@ type Server struct { conf *config.Server } -func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { +func New( + sessions types.SessionManager, + remote types.RemoteManager, + broadcast types.BroadcastManager, + webSocketHandler types.WebSocketHandler, + conf *config.Server, +) *Server { logger := log.With().Str("module", "http").Logger() router := chi.NewRouter() @@ -33,7 +39,8 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server { router.Use(Logger) // Log API request calls using custom logger function // Mount REST API - api.Mount(router) + apiManager := api.New(sessions, remote, broadcast, webSocketHandler) + apiManager.Mount(router) router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { if webSocketHandler.Upgrade(w, r) != nil { diff --git a/neko.go b/neko.go index be46757b..6c631dee 100644 --- a/neko.go +++ b/neko.go @@ -133,7 +133,13 @@ func (neko *Neko) Start() { webSocketHandler := websocket.New(sessionManager, remoteManager, broadcastManager, webRTCManager, neko.WebSocket) webSocketHandler.Start() - server := http.New(neko.Server, webSocketHandler) + server := http.New( + sessionManager, + remoteManager, + broadcastManager, + webSocketHandler, + neko.Server, + ) server.Start() neko.sessionManager = sessionManager From b4a233ef2e6afc0233c7beb1beb47af5fedfac3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Oct 2020 19:32:52 +0100 Subject: [PATCH 036/876] remove xorg ValidScreenSize double checking. --- internal/remote/manager.go | 19 +++++-------------- internal/xorg/xorg.go | 16 +--------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/internal/remote/manager.go b/internal/remote/manager.go index 19f803bd..0fcdba13 100644 --- a/internal/remote/manager.go +++ b/internal/remote/manager.go @@ -53,9 +53,7 @@ func (manager *RemoteManager) Start() { Str("screen_resolution", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). Msgf("Setting screen resolution...") - if !xorg.ValidScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) { - manager.logger.Warn().Msgf("invalid screen option %dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) - } else if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { + if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { manager.logger.Warn().Err(err).Msg("unable to change screen size") } @@ -167,26 +165,19 @@ func (manager *RemoteManager) createAudioPipeline() { } func (manager *RemoteManager) ChangeResolution(width int, height int, rate int) error { - if !xorg.ValidScreenSize(width, height, rate) { - return fmt.Errorf("unknown configuration") - } - manager.video.DestroyPipeline() manager.broadcast.Stop() defer func() { + manager.createVideoPipeline() + manager.video.Start() manager.broadcast.Start() manager.logger.Info().Msg("starting video pipeline...") }() - - if err := xorg.ChangeScreenSize(width, height, rate); err != nil { - return err - } - - manager.createVideoPipeline() - return nil + + return xorg.ChangeScreenSize(width, height, rate) } func (manager *RemoteManager) Move(x, y int) { diff --git a/internal/xorg/xorg.go b/internal/xorg/xorg.go index ebe25baf..b4bd10dd 100644 --- a/internal/xorg/xorg.go +++ b/internal/xorg/xorg.go @@ -165,20 +165,6 @@ func CheckKeys(duration time.Duration) { } } -func ValidScreenSize(width int, height int, rate int) bool { - for _, size := range ScreenConfigurations { - if size.Width == width && size.Height == height { - for _, fps := range size.Rates { - if int16(rate) == fps { - return true - } - } - } - } - - return false -} - func ChangeScreenSize(width int, height int, rate int) error { mu.Lock() defer mu.Unlock() @@ -194,7 +180,7 @@ func ChangeScreenSize(width int, height int, rate int) error { } } - return fmt.Errorf("unknown configuration") + return fmt.Errorf("Unknown screen configuration %dx%d@%d.", width, height, rate) } func GetScreenSize() *types.ScreenSize { From 0c40eda36baa789e637269cae190cce765e9fa82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Oct 2020 19:39:45 +0100 Subject: [PATCH 037/876] manager fix naming convention. --- internal/remote/manager.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/remote/manager.go b/internal/remote/manager.go index 0fcdba13..ca01f7e6 100644 --- a/internal/remote/manager.go +++ b/internal/remote/manager.go @@ -57,8 +57,8 @@ func (manager *RemoteManager) Start() { manager.logger.Warn().Err(err).Msg("unable to change screen size") } - manager.createVideoPipeline() - manager.createAudioPipeline() + manager.CreateVideoPipeline() + manager.CreateAudioPipeline() manager.broadcast.Start() go func() { @@ -124,7 +124,7 @@ func (manager *RemoteManager) Streaming() bool { return manager.streaming } -func (manager *RemoteManager) createVideoPipeline() { +func (manager *RemoteManager) CreateVideoPipeline() { var err error manager.logger.Info(). @@ -144,7 +144,7 @@ func (manager *RemoteManager) createVideoPipeline() { } } -func (manager *RemoteManager) createAudioPipeline() { +func (manager *RemoteManager) CreateAudioPipeline() { var err error manager.logger.Info(). @@ -169,7 +169,7 @@ func (manager *RemoteManager) ChangeResolution(width int, height int, rate int) manager.broadcast.Stop() defer func() { - manager.createVideoPipeline() + manager.CreateVideoPipeline() manager.video.Start() manager.broadcast.Start() From d48b857dfe3d852b6c75e40c31b02891fbade714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Oct 2020 19:56:22 +0100 Subject: [PATCH 038/876] API resiolution with error handling. --- internal/api/room/resolution.go | 48 ++++++++++++-------------- internal/api/utils/error.go | 60 +++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 27 deletions(-) create mode 100644 internal/api/utils/error.go diff --git a/internal/api/room/resolution.go b/internal/api/room/resolution.go index 138e91fd..50330d5e 100644 --- a/internal/api/room/resolution.go +++ b/internal/api/room/resolution.go @@ -4,12 +4,9 @@ import ( "net/http" "github.com/go-chi/render" -) -type ErrResponse struct { - Code int `json:"code"` - Message string `json:"message"` -} + "demodesk/neko/internal/api/utils" +) type ResolutionStruct struct { Width int `json:"width"` @@ -17,15 +14,15 @@ type ResolutionStruct struct { Rate int `json:"rate"` } +func (a *ResolutionStruct) Bind(r *http.Request) error { + return nil +} + func (h *RoomHandler) ResolutionGet(w http.ResponseWriter, r *http.Request) { size := h.remote.GetScreenSize() if size == nil { - w.WriteHeader(http.StatusInternalServerError) - render.JSON(w, r, ErrResponse{ - Code: -1, - Message: "Unable to get current screen resolution.", - }) + render.Render(w, r, utils.ErrMessage(500, "Not implmented.")) return } @@ -37,25 +34,22 @@ func (h *RoomHandler) ResolutionGet(w http.ResponseWriter, r *http.Request) { } func (h *RoomHandler) ResolutionChange(w http.ResponseWriter, r *http.Request) { - // data := &ResolutionStruct{} - // if err := render.Bind(r, data); err != nil { - // render.JSON(w, r, ErrResponse{ - // Code: -1, - // Message: "Invalid Request.", - // }) - // return - // } + data := &ResolutionStruct{} + if err := render.Bind(r, data); err != nil { + render.Render(w, r, utils.ErrInvalidRequest(err)) + return + } - render.JSON(w, r, ErrResponse{ - Code: -1, - Message: "Not implmented.", - }) + if err := h.remote.ChangeResolution(data.Width, data.Height, data.Rate); err != nil { + render.Render(w, r, utils.ErrInvalidRequest(err)) + return + } + + // TODO: WebSocket notify. + + render.JSON(w, r, data) } func (h *RoomHandler) ResolutionList(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(http.StatusInternalServerError) - render.JSON(w, r, ErrResponse{ - Code: -1, - Message: "Not implmented.", - }) + render.Render(w, r, utils.ErrMessage(500, "Not implmented.")) } diff --git a/internal/api/utils/error.go b/internal/api/utils/error.go new file mode 100644 index 00000000..0b214590 --- /dev/null +++ b/internal/api/utils/error.go @@ -0,0 +1,60 @@ +package utils + +import ( + "net/http" + + "github.com/go-chi/render" +) + +//-- +// Error response payloads & renderers +//-- + +// ErrResponse renderer type for handling all sorts of errors. +// +// In the best case scenario, the excellent github.com/pkg/errors package +// helps reveal information on the error, setting it on Err, and in the Render() +// method, using it to set the application-specific error code in AppCode. +type ErrResponse struct { + Err error `json:"-"` // low-level runtime error + HTTPStatusCode int `json:"-"` // http response status code + + StatusText string `json:"status"` // user-level status message + AppCode int64 `json:"code,omitempty"` // application-specific error code + ErrorText string `json:"error,omitempty"` // application-level error message, for debugging +} + +func (e *ErrResponse) Render(w http.ResponseWriter, r *http.Request) error { + render.Status(r, e.HTTPStatusCode) + return nil +} + +func ErrMessage(HTTPStatusCode int, StatusText string) render.Renderer { + return &ErrResponse{ + HTTPStatusCode: HTTPStatusCode, + StatusText: StatusText, + } +} + +func ErrInvalidRequest(err error) render.Renderer { + return &ErrResponse{ + Err: err, + HTTPStatusCode: 400, + StatusText: "Invalid request.", + ErrorText: err.Error(), + } +} + +func ErrRender(err error) render.Renderer { + return &ErrResponse{ + Err: err, + HTTPStatusCode: 422, + StatusText: "Error rendering response.", + ErrorText: err.Error(), + } +} + +var ErrNotFound = &ErrResponse{ + HTTPStatusCode: 404, + StatusText: "Resource not found.", +} From 9343e85b8f3f3aafcab9e72e517406dd4fff3563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Oct 2020 21:28:07 +0100 Subject: [PATCH 039/876] resolution -> screen configuration. --- internal/api/room/handler.go | 8 ++++---- internal/api/room/{resolution.go => screen.go} | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) rename internal/api/room/{resolution.go => screen.go} (64%) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 2ec948a6..b03e9760 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -32,11 +32,11 @@ func New( func (h *RoomHandler) Router() *chi.Mux { r := chi.NewRouter() - r.Route("/resolution", func(r chi.Router) { - r.Get("/", h.ResolutionGet) - r.Post("/", h.ResolutionChange) + r.Route("/screen", func(r chi.Router) { + r.Get("/", h.ScreenConfiguration) + r.Post("/", h.ScreenConfigurationChange) - r.Get("/list", h.ResolutionList) + r.Get("/configurations", h.ScreenConfigurationsList) }) // TODO diff --git a/internal/api/room/resolution.go b/internal/api/room/screen.go similarity index 64% rename from internal/api/room/resolution.go rename to internal/api/room/screen.go index 50330d5e..d3e9d54e 100644 --- a/internal/api/room/resolution.go +++ b/internal/api/room/screen.go @@ -8,17 +8,17 @@ import ( "demodesk/neko/internal/api/utils" ) -type ResolutionStruct struct { +type ScreenConfiguration struct { Width int `json:"width"` Height int `json:"height"` Rate int `json:"rate"` } -func (a *ResolutionStruct) Bind(r *http.Request) error { +func (a *ScreenConfiguration) Bind(r *http.Request) error { return nil } -func (h *RoomHandler) ResolutionGet(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request) { size := h.remote.GetScreenSize() if size == nil { @@ -26,15 +26,15 @@ func (h *RoomHandler) ResolutionGet(w http.ResponseWriter, r *http.Request) { return } - render.JSON(w, r, ResolutionStruct{ + render.JSON(w, r, ScreenConfiguration{ Width: size.Width, Height: size.Height, Rate: int(size.Rate), }) } -func (h *RoomHandler) ResolutionChange(w http.ResponseWriter, r *http.Request) { - data := &ResolutionStruct{} +func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.Request) { + data := &ScreenConfiguration{} if err := render.Bind(r, data); err != nil { render.Render(w, r, utils.ErrInvalidRequest(err)) return @@ -50,6 +50,6 @@ func (h *RoomHandler) ResolutionChange(w http.ResponseWriter, r *http.Request) { render.JSON(w, r, data) } -func (h *RoomHandler) ResolutionList(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) ScreenConfigurationsList(w http.ResponseWriter, r *http.Request) { render.Render(w, r, utils.ErrMessage(500, "Not implmented.")) } From b6d5df6d04d7d56fa333c7d11545150d178eb2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Oct 2020 21:29:51 +0100 Subject: [PATCH 040/876] API screen change websocket broadcast. --- internal/api/room/screen.go | 6 +++++- internal/websocket/broadcast/screen.go | 17 +++++++++++++++++ internal/websocket/screen.go | 10 ++-------- 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 internal/websocket/broadcast/screen.go diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index d3e9d54e..3c6ed3eb 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -6,6 +6,7 @@ import ( "github.com/go-chi/render" "demodesk/neko/internal/api/utils" + "demodesk/neko/internal/websocket/broadcast" ) type ScreenConfiguration struct { @@ -45,7 +46,10 @@ func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.R return } - // TODO: WebSocket notify. + if err := broadcast.ScreenConfiguration(h.sessions, "-todo-session-id-", data.Width, data.Height, data.Rate); err != nil { + render.Render(w, r, utils.ErrInvalidRequest(err)) + return + } render.JSON(w, r, data) } diff --git a/internal/websocket/broadcast/screen.go b/internal/websocket/broadcast/screen.go new file mode 100644 index 00000000..ead004e3 --- /dev/null +++ b/internal/websocket/broadcast/screen.go @@ -0,0 +1,17 @@ +package broadcast + +import ( + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" +) + +func ScreenConfiguration(session types.SessionManager, id string, width int, height int, rate int) error { + return session.Broadcast(message.ScreenResolution{ + Event: event.SCREEN_RESOLUTION, + ID: id, + Width: width, + Height: height, + Rate: rate, + }, nil) +} diff --git a/internal/websocket/screen.go b/internal/websocket/screen.go index ddb35167..26a6fa71 100644 --- a/internal/websocket/screen.go +++ b/internal/websocket/screen.go @@ -4,6 +4,7 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" + "demodesk/neko/internal/websocket/broadcast" ) func (h *MessageHandler) screenSet(id string, session types.Session, payload *message.ScreenResolution) error { @@ -17,14 +18,7 @@ func (h *MessageHandler) screenSet(id string, session types.Session, payload *me return err } - if err := h.sessions.Broadcast( - message.ScreenResolution{ - Event: event.SCREEN_RESOLUTION, - ID: id, - Width: payload.Width, - Height: payload.Height, - Rate: payload.Rate, - }, nil); err != nil { + if err := broadcast.ScreenConfiguration(h.sessions, id, payload.Width, payload.Height, payload.Rate); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.SCREEN_RESOLUTION) return err } From bff779aee791cca0378c2b11e3b5209c14437c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Oct 2020 22:06:03 +0100 Subject: [PATCH 041/876] add new REST errors. --- internal/api/utils/error.go | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/internal/api/utils/error.go b/internal/api/utils/error.go index 0b214590..8b0ed52e 100644 --- a/internal/api/utils/error.go +++ b/internal/api/utils/error.go @@ -45,7 +45,16 @@ func ErrInvalidRequest(err error) render.Renderer { } } -func ErrRender(err error) render.Renderer { +func ErrInternalServer(err error) render.Renderer { + return &ErrResponse{ + Err: err, + HTTPStatusCode: 500, + StatusText: "Internal server error.", + ErrorText: err.Error(), + } +} + +func ErrNot(err error) render.Renderer { return &ErrResponse{ Err: err, HTTPStatusCode: 422, @@ -54,6 +63,16 @@ func ErrRender(err error) render.Renderer { } } +var ErrNotAuthenticated = &ErrResponse{ + HTTPStatusCode: 401, + StatusText: "Invalid or missing access token.", +} + +var ErrNotAuthorized = &ErrResponse{ + HTTPStatusCode: 403, + StatusText: "Access token does not have the required scope.", +} + var ErrNotFound = &ErrResponse{ HTTPStatusCode: 404, StatusText: "Resource not found.", From c77d2b03059cac4bcdaa075d4145f2c38c630232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Oct 2020 22:20:23 +0100 Subject: [PATCH 042/876] ScreenConfigurationsList API. --- internal/api/room/screen.go | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 3c6ed3eb..64289fa5 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -16,6 +16,14 @@ type ScreenConfiguration struct { } func (a *ScreenConfiguration) Bind(r *http.Request) error { + // Bind will run after the unmarshalling is complete, its a + // good time to focus some post-processing after a decoding. + return nil +} + +func (a *ScreenConfiguration) Render(w http.ResponseWriter, r *http.Request) error { + // Pre-processing before a response is marshalled and sent + // across the wire return nil } @@ -55,5 +63,18 @@ func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.R } func (h *RoomHandler) ScreenConfigurationsList(w http.ResponseWriter, r *http.Request) { - render.Render(w, r, utils.ErrMessage(500, "Not implmented.")) + list := []render.Renderer{} + + ScreenConfigurations := h.remote.ScreenConfigurations() + for _, size := range ScreenConfigurations { + for _, fps := range size.Rates { + list = append(list, &ScreenConfiguration{ + Width: size.Width, + Height: size.Height, + Rate: int(fps), + }) + } + } + + render.RenderList(w, r, list) } From 4e6a78fb545531e864f34b4bd128d1fe9645fd78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Oct 2020 22:39:35 +0100 Subject: [PATCH 043/876] update errors. --- internal/api/room/screen.go | 8 ++++---- internal/api/utils/error.go | 13 +++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 64289fa5..30932939 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -31,7 +31,7 @@ func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request size := h.remote.GetScreenSize() if size == nil { - render.Render(w, r, utils.ErrMessage(500, "Not implmented.")) + render.Render(w, r, utils.ErrMessage(500, "Unable to get screen configuration.")) return } @@ -45,17 +45,17 @@ func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.Request) { data := &ScreenConfiguration{} if err := render.Bind(r, data); err != nil { - render.Render(w, r, utils.ErrInvalidRequest(err)) + render.Render(w, r, utils.ErrBadRequest(err)) return } if err := h.remote.ChangeResolution(data.Width, data.Height, data.Rate); err != nil { - render.Render(w, r, utils.ErrInvalidRequest(err)) + render.Render(w, r, utils.ErrUnprocessableEntity(err)) return } if err := broadcast.ScreenConfiguration(h.sessions, "-todo-session-id-", data.Width, data.Height, data.Rate); err != nil { - render.Render(w, r, utils.ErrInvalidRequest(err)) + render.Render(w, r, utils.ErrInternalServer(err)) return } diff --git a/internal/api/utils/error.go b/internal/api/utils/error.go index 8b0ed52e..05ee8ed3 100644 --- a/internal/api/utils/error.go +++ b/internal/api/utils/error.go @@ -36,11 +36,20 @@ func ErrMessage(HTTPStatusCode int, StatusText string) render.Renderer { } } -func ErrInvalidRequest(err error) render.Renderer { +func ErrBadRequest(err error) render.Renderer { return &ErrResponse{ Err: err, HTTPStatusCode: 400, - StatusText: "Invalid request.", + StatusText: "Bad request.", + ErrorText: err.Error(), + } +} + +func ErrUnprocessableEntity(err error) render.Renderer { + return &ErrResponse{ + Err: err, + HTTPStatusCode: 400, + StatusText: "Unprocessable Entity.", ErrorText: err.Error(), } } From 31bd61e2d35d135003e7dca46e06eb6ba977a99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 10:37:57 +0100 Subject: [PATCH 044/876] add jwtauth module. --- go.mod | 1 + go.sum | 3 +++ 2 files changed, 4 insertions(+) diff --git a/go.mod b/go.mod index c9527eaa..687a014e 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-chi/chi v4.1.0+incompatible + github.com/go-chi/jwtauth v4.0.4+incompatible github.com/go-chi/render v1.0.1 github.com/golang/protobuf v1.3.5 // indirect github.com/gorilla/websocket v1.4.2 diff --git a/go.sum b/go.sum index 1d37322d..08decb25 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -52,6 +53,8 @@ github.com/go-chi/chi v4.0.3+incompatible h1:gakN3pDJnzZN5jqFV2TEdF66rTfKeITyR8q github.com/go-chi/chi v4.0.3+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-chi/chi v4.1.0+incompatible h1:ETj3cggsVIY2Xao5ExCu6YhEh5MD6JTfcBzS37R260w= github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/go-chi/jwtauth v4.0.4+incompatible h1:LGIxg6YfvSBzxU2BljXbrzVc1fMlgqSKBQgKOGAVtPY= +github.com/go-chi/jwtauth v4.0.4+incompatible/go.mod h1:Q5EIArY/QnD6BdS+IyDw7B2m6iNbnPxtfd6/BcmtWbs= github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= From 71d39a5c74fe9068cc56163e85ec388753cbaf6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 10:48:24 +0100 Subject: [PATCH 045/876] add API JWT auth. --- internal/api/member/handler.go | 13 ++++++++-- internal/api/room/handler.go | 19 ++++++++------- internal/api/router.go | 42 ++++++++++++++++++++++++++++----- internal/http/http.go | 2 +- internal/types/config/server.go | 14 +++++++++++ 5 files changed, 73 insertions(+), 17 deletions(-) diff --git a/internal/api/member/handler.go b/internal/api/member/handler.go index 088212db..427f096b 100644 --- a/internal/api/member/handler.go +++ b/internal/api/member/handler.go @@ -23,10 +23,19 @@ func New( } } -func (h *MemberHandler) Router() *chi.Mux { +func (h *MemberHandler) Router( + usersOnly func(chi.Router, func(chi.Router)), + adminsOnly func(chi.Router, func(chi.Router)), +) *chi.Mux { r := chi.NewRouter() - // TODO + usersOnly(r, func(r chi.Router) { + + }) + + adminsOnly(r, func(r chi.Router) { + + }) return r } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index b03e9760..f30af980 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -29,17 +29,20 @@ func New( } } -func (h *RoomHandler) Router() *chi.Mux { +func (h *RoomHandler) Router( + usersOnly func(chi.Router, func(chi.Router)), + adminsOnly func(chi.Router, func(chi.Router)), +) *chi.Mux { r := chi.NewRouter() - - r.Route("/screen", func(r chi.Router) { - r.Get("/", h.ScreenConfiguration) - r.Post("/", h.ScreenConfigurationChange) - - r.Get("/configurations", h.ScreenConfigurationsList) + + usersOnly(r, func(r chi.Router) { + r.Get("/screen", h.ScreenConfiguration) }) - // TODO + adminsOnly(r, func(r chi.Router) { + r.Post("/screen", h.ScreenConfigurationChange) + r.Get("/screen/configurations", h.ScreenConfigurationsList) + }) return r } diff --git a/internal/api/router.go b/internal/api/router.go index c7e0285c..9d04433c 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -2,10 +2,12 @@ package api import ( "github.com/go-chi/chi" + "github.com/go-chi/jwtauth" "demodesk/neko/internal/api/member" "demodesk/neko/internal/api/room" "demodesk/neko/internal/types" + "demodesk/neko/internal/types/config" ) type API struct { @@ -15,13 +17,18 @@ type API struct { websocket types.WebSocketHandler } +var AdminToken *jwtauth.JWTAuth +var UserToken *jwtauth.JWTAuth + func New( sessions types.SessionManager, remote types.RemoteManager, broadcast types.BroadcastManager, websocket types.WebSocketHandler, + conf *config.Server, ) *API { - // Init + AdminToken = jwtauth.New("HS256", []byte(conf.AdminToken), nil) + UserToken = jwtauth.New("HS256", []byte(conf.UserToken), nil) return &API{ sessions: sessions, @@ -31,12 +38,35 @@ func New( } } -func (a *API) Mount(router *chi.Mux) { - // all member routes +func (a *API) Mount(r *chi.Mux) { memberHandler := member.New(a.sessions, a.websocket) - router.Mount("/member", memberHandler.Router()) + r.Mount("/member", memberHandler.Router(UsersOnly, AdminsOnly)) - // get room routes roomHandler := room.New(a.sessions, a.remote, a.broadcast, a.websocket) - router.Mount("/room", roomHandler.Router()) + r.Mount("/room", roomHandler.Router(UsersOnly, AdminsOnly)) +} + +func UsersOnly(r chi.Router, protectedRoutes func(r chi.Router)) { + r.Group(func(r chi.Router) { + // Verify JWT tokens + r.Use(jwtauth.Verifier(UserToken)) + r.Use(jwtauth.Verifier(AdminToken)) + + // Handle valid / invalid tokens. + r.Use(jwtauth.Authenticator) + + protectedRoutes(r) + }) +} + +func AdminsOnly(r chi.Router, protectedRoutes func(r chi.Router)) { + r.Group(func(r chi.Router) { + // Verify JWT token + r.Use(jwtauth.Verifier(AdminToken)) + + // Handle valid / invalid tokens. + r.Use(jwtauth.Authenticator) + + protectedRoutes(r) + }) } diff --git a/internal/http/http.go b/internal/http/http.go index cab997d1..9136d85e 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -39,7 +39,7 @@ func New( router.Use(Logger) // Log API request calls using custom logger function // Mount REST API - apiManager := api.New(sessions, remote, broadcast, webSocketHandler) + apiManager := api.New(sessions, remote, broadcast, webSocketHandler, conf) apiManager.Mount(router) router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { diff --git a/internal/types/config/server.go b/internal/types/config/server.go index fcb4b912..627e3061 100644 --- a/internal/types/config/server.go +++ b/internal/types/config/server.go @@ -10,6 +10,8 @@ type Server struct { Key string Bind string Static string + UserToken string + AdminToken string } func (Server) Init(cmd *cobra.Command) error { @@ -33,6 +35,16 @@ func (Server) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().String("user_token", "user_secret", "JWT token for users") + if err := viper.BindPFlag("user_token", cmd.PersistentFlags().Lookup("user_token")); err != nil { + return err + } + + cmd.PersistentFlags().String("admin_token", "admin_secret", "JWT token for admins") + if err := viper.BindPFlag("admin_token", cmd.PersistentFlags().Lookup("admin_token")); err != nil { + return err + } + return nil } @@ -41,4 +53,6 @@ func (s *Server) Set() { s.Key = viper.GetString("key") s.Bind = viper.GetString("bind") s.Static = viper.GetString("static") + s.UserToken = viper.GetString("user_token") + s.AdminToken = viper.GetString("admin_token") } From c609a28a38bb0fe61b92bf45dbab81728704cbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 11:54:58 +0100 Subject: [PATCH 046/876] remove unused packages. --- go.mod | 5 ----- go.sum | 51 +++++---------------------------------------------- 2 files changed, 5 insertions(+), 51 deletions(-) diff --git a/go.mod b/go.mod index 687a014e..79bb48b6 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,8 @@ module demodesk/neko go 1.13 require ( - github.com/coreos/go-etcd v2.0.0+incompatible // indirect - github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-chi/chi v4.1.0+incompatible - github.com/go-chi/jwtauth v4.0.4+incompatible github.com/go-chi/render v1.0.1 github.com/golang/protobuf v1.3.5 // indirect github.com/gorilla/websocket v1.4.2 @@ -19,7 +16,6 @@ require ( github.com/pion/logging v0.2.2 github.com/pion/rtp v1.4.0 // indirect github.com/pion/sdp/v2 v2.3.5 // indirect - github.com/pion/turn v1.4.0 // indirect github.com/pion/webrtc/v2 v2.2.4 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.18.0 @@ -29,7 +25,6 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.6.2 - github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 // indirect golang.org/x/sys v0.0.0-20200331124033-c3d80250170d // indirect golang.org/x/text v0.3.2 // indirect diff --git a/go.sum b/go.sum index 08decb25..640d76dc 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,7 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75 h1:3ILjVyslFbc4jl1w5TWuvvslFD/nDfR2H8tVaMVLrEY= github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -26,12 +27,10 @@ github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wX github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -49,12 +48,8 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/go-chi/chi v4.0.3+incompatible h1:gakN3pDJnzZN5jqFV2TEdF66rTfKeITyR8qu6ekICEY= -github.com/go-chi/chi v4.0.3+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-chi/chi v4.1.0+incompatible h1:ETj3cggsVIY2Xao5ExCu6YhEh5MD6JTfcBzS37R260w= github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= -github.com/go-chi/jwtauth v4.0.4+incompatible h1:LGIxg6YfvSBzxU2BljXbrzVc1fMlgqSKBQgKOGAVtPY= -github.com/go-chi/jwtauth v4.0.4+incompatible/go.mod h1:Q5EIArY/QnD6BdS+IyDw7B2m6iNbnPxtfd6/BcmtWbs= github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= @@ -70,6 +65,7 @@ github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200j github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.4.0 h1:Rd1kQnQu0Hq3qvJppYSG0HtP+f5LPPUiDswTLiEegLg= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= @@ -88,8 +84,6 @@ github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE0 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= @@ -153,30 +147,25 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pion/datachannel v1.4.13 h1:ezTn3AtUtXvKemRRjRdUgao/T8bH4ZJwrpOqU8Iz3Ss= -github.com/pion/datachannel v1.4.13/go.mod h1:+rBUwEDonA63KXx994DP/ofyyGVAm6AIMvOqQZxjWRU= github.com/pion/datachannel v1.4.16 h1:dvuDC0IBMUDQvwO+gRu0Dv+W5j7rrgNpCmtheb6iYnc= github.com/pion/datachannel v1.4.16/go.mod h1:gRGhxZv7X2/30Qxes4WEXtimKBXcwj/3WsDtBlHnvJY= -github.com/pion/dtls/v2 v2.0.0-rc.3 h1:u9utI+EDJOjOWfrkGQsD8WNssPcTwfYIanFB6oI8K+4= -github.com/pion/dtls/v2 v2.0.0-rc.3/go.mod h1:x0XH+cN5z+l/+/4nYL8r4sB8g6+0d1Zp2Pfkcoz8BKY= github.com/pion/dtls/v2 v2.0.0-rc.7/go.mod h1:U199DvHpRBN0muE9+tVN4TMy1jvEhZIZ63lk4xkvVSk= github.com/pion/dtls/v2 v2.0.0-rc.9 h1:wPb0JKmYoleAM2o8vQSPaUM+geJq7l0AdeUlPsg19ec= github.com/pion/dtls/v2 v2.0.0-rc.9/go.mod h1:6eFkFvpo0T+odQ+39HFEtOO7LX5cUlFqXdSo4ucZtGg= -github.com/pion/ice v0.7.6 h1:EARj1MBq5NYaMtXVhYkK03i0RS/meejNHvZS++K5tSY= -github.com/pion/ice v0.7.6/go.mod h1:4xCajahEEvc5w0AM+Ujx/Rr2EczON/fKndi3jLyDdh4= github.com/pion/ice v0.7.10/go.mod h1:YufCtyMmPeZXGTuARCracYfe0mb3EXbcRUS+vHJB5Cs= github.com/pion/ice v0.7.12 h1:Lsh4f0Uvh/vOCXSyj+w5C736LrKt66qAKeA2LFwSkn0= github.com/pion/ice v0.7.12/go.mod h1:yLt/9LAJEZXFtnOBdpq5YGaOF9SsDjVGCvzF3MF4k5k= -github.com/pion/logging v0.2.1/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY= @@ -185,39 +174,25 @@ github.com/pion/quic v0.1.1 h1:D951FV+TOqI9A0rTF7tHx0Loooqz+nyzjEyj8o3PuMA= github.com/pion/quic v0.1.1/go.mod h1:zEU51v7ru8Mp4AUBJvj6psrSth5eEFNnVQK5K48oV3k= github.com/pion/rtcp v1.2.1 h1:S3yG4KpYAiSmBVqKAfgRa5JdwBNj4zK3RLUa8JYdhak= github.com/pion/rtcp v1.2.1/go.mod h1:a5dj2d6BKIKHl43EnAOIrCczcjESrtPuMgfmL6/K6QM= -github.com/pion/rtp v1.1.3/go.mod h1:/l4cvcKd0D3u9JLs2xSVI95YkfXW87a3br3nqmVtSlE= -github.com/pion/rtp v1.1.4 h1:P6xh8Y8JfzR7+JAbI79X2M8kfYETaqbuM5Otm+Z+k6U= -github.com/pion/rtp v1.1.4/go.mod h1:/l4cvcKd0D3u9JLs2xSVI95YkfXW87a3br3nqmVtSlE= github.com/pion/rtp v1.3.2/go.mod h1:q9wPnA96pu2urCcW/sK/RiDn597bhGoAQQ+y2fDwHuY= github.com/pion/rtp v1.4.0 h1:EkeHEXKuJhZoRUxtL2Ie80vVg9gBH+poT9UoL8M14nw= github.com/pion/rtp v1.4.0/go.mod h1:/l4cvcKd0D3u9JLs2xSVI95YkfXW87a3br3nqmVtSlE= -github.com/pion/sctp v1.7.3 h1:Pok18oncuAq/WjNxbyltfBSLvbv/6QSCyVJKYyDWP5M= -github.com/pion/sctp v1.7.3/go.mod h1:c6C9jaDGX7f5xeSRVju/140XatpO9sOVe81EwpfzAc8= github.com/pion/sctp v1.7.6 h1:8qZTdJtbKfAns/Hv5L0PAj8FyXcsKhMH1pKUCGisQg4= github.com/pion/sctp v1.7.6/go.mod h1:ichkYQ5tlgCQwEwvgfdcAolqx1nHbYCxo4D7zK/K0X8= -github.com/pion/sdp/v2 v2.3.1 h1:45dub4NRdwyDmQCD3GIY7DZuqC49GBUwBdjuetvdOr0= -github.com/pion/sdp/v2 v2.3.1/go.mod h1:jccXVYW0fuK6ds2pwKr89SVBDYlCjhgMI6nucl5R5rA= github.com/pion/sdp/v2 v2.3.4/go.mod h1:jccXVYW0fuK6ds2pwKr89SVBDYlCjhgMI6nucl5R5rA= github.com/pion/sdp/v2 v2.3.5 h1:DtS9Z9R+E3/mn2jt+RQKBnneK1g+p3PT25+TkQHodfU= github.com/pion/sdp/v2 v2.3.5/go.mod h1:+ZZf35r1+zbaWYiZLfPutWfx58DAWcGb2QsS3D/s9M8= -github.com/pion/srtp v1.2.6 h1:mHQuAMh0P67R7/j1F260u3O+fbRWLyjKLRPZYYvODFM= -github.com/pion/srtp v1.2.6/go.mod h1:rd8imc5htjfs99XiEoOjLMEOcVjME63UHx9Ek9IGst0= github.com/pion/srtp v1.3.1 h1:WNDLN41ST0P6cXRpzx97JJW//vChAEo1+Etdqo+UMnM= github.com/pion/srtp v1.3.1/go.mod h1:nxEytDDGTN+eNKJ1l5gzOCWQFuksgijorsSlgEjc40Y= github.com/pion/stun v0.3.3 h1:brYuPl9bN9w/VM7OdNzRSLoqsnwlyNvD9MVeJrHjDQw= github.com/pion/stun v0.3.3/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M= github.com/pion/transport v0.6.0/go.mod h1:iWZ07doqOosSLMhZ+FXUTq+TamDoXSllxpbGcfkCmbE= -github.com/pion/transport v0.8.9/go.mod h1:lpeSM6KJFejVtZf8k0fgeN7zE73APQpTF83WvA1FVP8= github.com/pion/transport v0.8.10 h1:lTiobMEw2PG6BH/mgIVqTV2mBp/mPT+IJLaN8ZxgdHk= github.com/pion/transport v0.8.10/go.mod h1:tBmha/UCjpum5hqTWhfAEs3CO4/tHSg0MYRhSzR+CZ8= github.com/pion/transport v0.10.0 h1:9M12BSneJm6ggGhJyWpDveFOstJsTiQjkLf4M44rm80= github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE= -github.com/pion/turn v1.4.0 h1:7NUMRehQz4fIo53Qv9ui1kJ0Kr1CA82I81RHKHCeM80= -github.com/pion/turn v1.4.0/go.mod h1:aDSi6hWX/hd1+gKia9cExZOR0MU95O7zX9p3Gw/P2aU= github.com/pion/turn/v2 v2.0.3 h1:SJUUIbcPoehlyZgMyIUbBBDhI03sBx32x3JuSIBKBWA= github.com/pion/turn/v2 v2.0.3/go.mod h1:kl1hmT3NxcLynpXVnwJgObL8C9NaCyPTeqI2DcCpSZs= -github.com/pion/webrtc/v2 v2.1.18 h1:g0VN0xfEUSlVNfQmlCD6yOeXy/tMaktESBmHMnBS3bk= -github.com/pion/webrtc/v2 v2.1.18/go.mod h1:m0rKlYgLRZWyhmcMWegpF6xtK1ASxmOg8DAR74ttzQY= github.com/pion/webrtc/v2 v2.2.4 h1:elWyBI/6S2kNoJ5rcTj2EMAvp/fmeiEqiuYbUd0ShRA= github.com/pion/webrtc/v2 v2.2.4/go.mod h1:9vTqkEISnB5AXlggrFSBLGSz/kopQuYUYzHubuFpnCU= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -245,8 +220,6 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.17.2 h1:RMRHFw2+wF7LO0QqtELQwo8hqSmqISyCJeFeAAuWcRo= -github.com/rs/zerolog v1.17.2/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= github.com/rs/zerolog v1.18.0 h1:CbAm3kP2Tptby1i9sYy2MGRg0uxIN9cyDb59Ys7W8z8= github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= @@ -293,8 +266,6 @@ github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v0.0.7 h1:FfTH+vuMXOas8jmfb5/M7dzEYx7LpcLb7a0LPe34uOU= github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= @@ -305,10 +276,7 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk= -github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E= github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -317,13 +285,13 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= @@ -338,13 +306,9 @@ go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 h1:fpnn/HnJONpIu6hkXi1u/7rR0NzilgWr4T0JmWkEitk= @@ -370,8 +334,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= @@ -392,14 +354,11 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191206220618-eeba5f6aabab h1:FvshnhkKW+LO3HWHodML8kuVX8rnJTxKm9dFPuI68UM= -golang.org/x/sys v0.0.0-20191206220618-eeba5f6aabab/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA= From 963d210507eea66b020471dfa118acd4806d3aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 12:27:55 +0100 Subject: [PATCH 047/876] use custom JWT middleware. --- go.mod | 1 + internal/api/member/handler.go | 13 ++------ internal/api/room/handler.go | 17 +++++----- internal/api/router.go | 39 +++++++--------------- internal/api/utils/auth.go | 59 ++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 46 deletions(-) create mode 100644 internal/api/utils/auth.go diff --git a/go.mod b/go.mod index 79bb48b6..ce55586f 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module demodesk/neko go 1.13 require ( + github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-chi/chi v4.1.0+incompatible github.com/go-chi/render v1.0.1 diff --git a/internal/api/member/handler.go b/internal/api/member/handler.go index 427f096b..1330bbe8 100644 --- a/internal/api/member/handler.go +++ b/internal/api/member/handler.go @@ -3,6 +3,7 @@ package member import ( "github.com/go-chi/chi" + "demodesk/neko/internal/api/utils" "demodesk/neko/internal/types" ) @@ -24,18 +25,10 @@ func New( } func (h *MemberHandler) Router( - usersOnly func(chi.Router, func(chi.Router)), - adminsOnly func(chi.Router, func(chi.Router)), + usersOnly utils.HttpMiddleware, + adminsOnly utils.HttpMiddleware, ) *chi.Mux { r := chi.NewRouter() - usersOnly(r, func(r chi.Router) { - - }) - - adminsOnly(r, func(r chi.Router) { - - }) - return r } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index f30af980..2dbbb455 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -3,6 +3,7 @@ package room import ( "github.com/go-chi/chi" + "demodesk/neko/internal/api/utils" "demodesk/neko/internal/types" ) @@ -30,18 +31,16 @@ func New( } func (h *RoomHandler) Router( - usersOnly func(chi.Router, func(chi.Router)), - adminsOnly func(chi.Router, func(chi.Router)), + usersOnly utils.HttpMiddleware, + adminsOnly utils.HttpMiddleware, ) *chi.Mux { r := chi.NewRouter() - - usersOnly(r, func(r chi.Router) { - r.Get("/screen", h.ScreenConfiguration) - }) - adminsOnly(r, func(r chi.Router) { - r.Post("/screen", h.ScreenConfigurationChange) - r.Get("/screen/configurations", h.ScreenConfigurationsList) + r.Route("/screen", func(r chi.Router) { + r.With(usersOnly).Get("/", h.ScreenConfiguration) + r.With(adminsOnly).Post("/", h.ScreenConfigurationChange) + + r.With(adminsOnly).Get("/configurations", h.ScreenConfigurationsList) }) return r diff --git a/internal/api/router.go b/internal/api/router.go index 9d04433c..551c1ba1 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -1,13 +1,15 @@ package api import ( + "net/http" + "github.com/go-chi/chi" - "github.com/go-chi/jwtauth" - + "demodesk/neko/internal/api/member" "demodesk/neko/internal/api/room" "demodesk/neko/internal/types" "demodesk/neko/internal/types/config" + "demodesk/neko/internal/api/utils" ) type API struct { @@ -17,8 +19,8 @@ type API struct { websocket types.WebSocketHandler } -var AdminToken *jwtauth.JWTAuth -var UserToken *jwtauth.JWTAuth +var AdminToken []byte +var UserToken []byte func New( sessions types.SessionManager, @@ -27,8 +29,8 @@ func New( websocket types.WebSocketHandler, conf *config.Server, ) *API { - AdminToken = jwtauth.New("HS256", []byte(conf.AdminToken), nil) - UserToken = jwtauth.New("HS256", []byte(conf.UserToken), nil) + AdminToken = []byte(conf.AdminToken) + UserToken = []byte(conf.UserToken) return &API{ sessions: sessions, @@ -46,27 +48,10 @@ func (a *API) Mount(r *chi.Mux) { r.Mount("/room", roomHandler.Router(UsersOnly, AdminsOnly)) } -func UsersOnly(r chi.Router, protectedRoutes func(r chi.Router)) { - r.Group(func(r chi.Router) { - // Verify JWT tokens - r.Use(jwtauth.Verifier(UserToken)) - r.Use(jwtauth.Verifier(AdminToken)) - - // Handle valid / invalid tokens. - r.Use(jwtauth.Authenticator) - - protectedRoutes(r) - }) +func UsersOnly(next http.Handler) http.Handler { + return utils.AuthMiddleware(next, UserToken, AdminToken) } -func AdminsOnly(r chi.Router, protectedRoutes func(r chi.Router)) { - r.Group(func(r chi.Router) { - // Verify JWT token - r.Use(jwtauth.Verifier(AdminToken)) - - // Handle valid / invalid tokens. - r.Use(jwtauth.Authenticator) - - protectedRoutes(r) - }) +func AdminsOnly(next http.Handler) http.Handler { + return utils.AuthMiddleware(next, AdminToken) } diff --git a/internal/api/utils/auth.go b/internal/api/utils/auth.go new file mode 100644 index 00000000..03f80dbb --- /dev/null +++ b/internal/api/utils/auth.go @@ -0,0 +1,59 @@ +package utils + +import ( + "context" + "fmt" + "net/http" + "strings" + + "github.com/go-chi/render" + "github.com/dgrijalva/jwt-go" +) + +func GetUserName(r *http.Request) interface{} { + props, _ := r.Context().Value("props").(jwt.MapClaims) + return props["user_name"] +} + +type HttpMiddleware = func(next http.Handler) http.Handler + +func AuthMiddleware(next http.Handler, jwtSecrets ...[]byte) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + authHeader := strings.Split(r.Header.Get("Authorization"), "Bearer ") + if len(authHeader) != 2 { + render.Render(w, r, ErrMessage(401, "Malformed JWT token.")) + return + } + + jwtToken := authHeader[1] + var jwtVerified *jwt.Token + var err error + for _, jwtSecret := range jwtSecrets { + jwtVerified, err = jwt.Parse(jwtToken, func(token *jwt.Token) (interface{}, error) { + if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok { + return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"]) + } + + return jwtSecret, nil + }) + + if err == nil { + break + } + } + + if err != nil { + render.Render(w, r, ErrMessage(401, "Invalid JWT token.")) + return + } + + if claims, ok := jwtVerified.Claims.(jwt.MapClaims); ok && jwtVerified.Valid { + ctx := context.WithValue(r.Context(), "props", claims) + // Access context values in handlers like this + // props, _ := r.Context().Value("props").(jwt.MapClaims) + next.ServeHTTP(w, r.WithContext(ctx)) + } else { + render.Render(w, r, ErrMessage(401, "Unauthorized.")) + } + }) +} From 894c0f28dcc4e7d51a6b198f47242e81454e9fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 12:35:02 +0100 Subject: [PATCH 048/876] REST API implement Clipboard. --- internal/api/room/clipboard.go | 46 ++++++++++++++++++++++++++++++++++ internal/api/room/handler.go | 5 ++++ 2 files changed, 51 insertions(+) diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 01912655..aaf7d2b2 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -1 +1,47 @@ package room + +import ( + "net/http" + + "github.com/go-chi/render" + + "demodesk/neko/internal/api/utils" +) + +type ClipboardData struct { + Text string `json:"text"` +} + +func (a *ClipboardData) Bind(r *http.Request) error { + // Bind will run after the unmarshalling is complete, its a + // good time to focus some post-processing after a decoding. + return nil +} + +func (a *ClipboardData) Render(w http.ResponseWriter, r *http.Request) error { + // Pre-processing before a response is marshalled and sent + // across the wire + return nil +} + +func (h *RoomHandler) ClipboardRead(w http.ResponseWriter, r *http.Request) { + // TODO: error check? + text := h.remote.ReadClipboard() + + render.JSON(w, r, ClipboardData{ + Text: text, + }) +} + +func (h *RoomHandler) ClipboardWrite(w http.ResponseWriter, r *http.Request) { + data := &ClipboardData{} + if err := render.Bind(r, data); err != nil { + render.Render(w, r, utils.ErrBadRequest(err)) + return + } + + // TODO: error check? + h.remote.WriteClipboard(data.Text) + + w.WriteHeader(http.StatusNoContent) +} diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 2dbbb455..2a3caa83 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -43,5 +43,10 @@ func (h *RoomHandler) Router( r.With(adminsOnly).Get("/configurations", h.ScreenConfigurationsList) }) + r.With(adminsOnly).Route("/clipboard", func(r chi.Router) { + r.Get("/", h.ClipboardRead) + r.Post("/", h.ClipboardWrite) + }) + return r } From e852afcf2a58807a522895e8c06c30f22d3f944b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 16:40:33 +0100 Subject: [PATCH 049/876] start file refactor. --- cmd/root.go | 4 +-- cmd/serve.go | 10 +++---- neko.go | 85 +++++++++++++++++++++++++++++++--------------------- 3 files changed, 58 insertions(+), 41 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 78af80df..172cd652 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -117,10 +117,10 @@ func init() { logger.Info().Msg("preflight complete") } - neko.Service.Root.Set() + neko.Service.Configs.Root.Set() }) - if err := neko.Service.Root.Init(root); err != nil { + if err := neko.Service.Configs.Root.Init(root); err != nil { log.Panic().Err(err).Msg("unable to run root command") } diff --git a/cmd/serve.go b/cmd/serve.go index 520080c8..f1729c41 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -17,11 +17,11 @@ func init() { } configs := []config.Config{ - neko.Service.Server, - neko.Service.WebRTC, - neko.Service.Remote, - neko.Service.Broadcast, - neko.Service.WebSocket, + neko.Service.Configs.Server, + neko.Service.Configs.WebRTC, + neko.Service.Configs.Remote, + neko.Service.Configs.Broadcast, + neko.Service.Configs.WebSocket, } cobra.OnInitialize(func() { diff --git a/neko.go b/neko.go index 6c631dee..62ef3fe0 100644 --- a/neko.go +++ b/neko.go @@ -59,12 +59,14 @@ func init() { Compiler: runtime.Compiler, Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), }, - Root: &config.Root{}, - Server: &config.Server{}, - Remote: &config.Remote{}, - Broadcast: &config.Broadcast{}, - WebRTC: &config.WebRTC{}, - WebSocket: &config.WebSocket{}, + Configs: &Configs{ + Root: &config.Root{}, + Server: &config.Server{}, + Remote: &config.Remote{}, + Broadcast: &config.Broadcast{}, + WebRTC: &config.WebRTC{}, + WebSocket: &config.WebSocket{}, + }, } } @@ -97,14 +99,18 @@ func (i *Version) Details() string { ) } -type Neko struct { - Version *Version +type Configs struct { Root *config.Root Remote *config.Remote Broadcast *config.Broadcast Server *config.Server WebRTC *config.WebRTC WebSocket *config.WebSocket +} + +type Neko struct { + Version *Version + Configs *Configs logger zerolog.Logger server *http.Server @@ -120,34 +126,45 @@ func (neko *Neko) Preflight() { } func (neko *Neko) Start() { - broadcastManager := broadcast.New(neko.Remote, neko.Broadcast) - - remoteManager := remote.New(neko.Remote, broadcastManager) - remoteManager.Start() - - sessionManager := session.New(remoteManager) - - webRTCManager := webrtc.New(sessionManager, remoteManager, neko.WebRTC) - webRTCManager.Start() - - webSocketHandler := websocket.New(sessionManager, remoteManager, broadcastManager, webRTCManager, neko.WebSocket) - webSocketHandler.Start() - - server := http.New( - sessionManager, - remoteManager, - broadcastManager, - webSocketHandler, - neko.Server, + neko.broadcastManager = broadcast.New( + neko.Configs.Remote, + neko.Configs.Broadcast, ) - server.Start() - neko.sessionManager = sessionManager - neko.remoteManager = remoteManager - neko.broadcastManager = broadcastManager - neko.webRTCManager = webRTCManager - neko.webSocketHandler = webSocketHandler - neko.server = server + neko.remoteManager = remote.New( + neko.Configs.Remote, + neko.broadcastManager, + ) + neko.remoteManager.Start() + + neko.sessionManager = session.New( + neko.remoteManager, + ) + + neko.webRTCManager = webrtc.New( + neko.sessionManager, + neko.remoteManager, + neko.Configs.WebRTC, + ) + neko.webRTCManager.Start() + + neko.webSocketHandler = websocket.New( + neko.sessionManager, + neko.remoteManager, + neko.broadcastManager, + neko.webRTCManager, + neko.Configs.WebSocket, + ) + neko.webSocketHandler.Start() + + neko.server = http.New( + neko.sessionManager, + neko.remoteManager, + neko.broadcastManager, + neko.webSocketHandler, + neko.Configs.Server, + ) + neko.server.Start() } func (neko *Neko) Shutdown() { From 06282d806465d9af99ed75ffe1e1c045be067c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 19:59:17 +0100 Subject: [PATCH 050/876] remove unused websocket functions. --- internal/session/manager.go | 4 ---- internal/session/session.go | 7 ------- internal/types/session.go | 2 -- 3 files changed, 13 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 33829f7a..6871e6e9 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -135,10 +135,6 @@ func (manager *SessionManager) Destroy(id string) error { return nil } -func (manager *SessionManager) Clear() error { - return nil -} - func (manager *SessionManager) Broadcast(v interface{}, exclude interface{}) error { for id, session := range manager.members { if !session.connected { diff --git a/internal/session/session.go b/internal/session/session.go index 869d7fda..c760f53b 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -104,13 +104,6 @@ func (session *Session) Send(v interface{}) error { return session.socket.Send(v) } -func (session *Session) Write(v interface{}) error { - if session.socket == nil { - return nil - } - return session.socket.Send(v) -} - func (session *Session) SignalAnswer(sdp string) error { if session.peer == nil { return nil diff --git a/internal/types/session.go b/internal/types/session.go index acdcac64..95f4f876 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -21,7 +21,6 @@ type Session interface { SetPeer(peer Peer) error Address() string Kick(message string) error - Write(v interface{}) error Send(v interface{}) error SignalAnswer(sdp string) error } @@ -38,7 +37,6 @@ type SessionManager interface { Members() []*Member Admins() []*Member Destroy(id string) error - Clear() error Broadcast(v interface{}, exclude interface{}) error OnHost(listener func(id string)) OnHostCleared(listener func(id string)) From dadac4f145e62d13fbecd8658fb6f1ac6daf2e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 20:11:32 +0100 Subject: [PATCH 051/876] webrtc removed unused function. --- internal/types/webrtc.go | 1 - internal/webrtc/peer.go | 9 --------- 2 files changed, 10 deletions(-) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index d0da61e7..d22253bd 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -13,6 +13,5 @@ type WebRTCManager interface { type Peer interface { SignalAnswer(sdp string) error - WriteData(v interface{}) error Destroy() error } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index f82c4fa7..59f66dbd 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -1,8 +1,6 @@ package webrtc import ( - "sync" - "github.com/pion/webrtc/v2" ) @@ -14,19 +12,12 @@ type Peer struct { settings *webrtc.SettingEngine connection *webrtc.PeerConnection configuration *webrtc.Configuration - mu sync.Mutex } func (peer *Peer) SignalAnswer(sdp string) error { return peer.connection.SetRemoteDescription(webrtc.SessionDescription{SDP: sdp, Type: webrtc.SDPTypeAnswer}) } -func (peer *Peer) WriteData(v interface{}) error { - peer.mu.Lock() - defer peer.mu.Unlock() - return nil -} - func (peer *Peer) Destroy() error { if peer.connection != nil && peer.connection.ConnectionState() == webrtc.PeerConnectionStateConnected { if err := peer.connection.Close(); err != nil { From b1b5a70c64df1fdcebd55f2e68b2c5f442ca1710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 21:20:42 +0100 Subject: [PATCH 052/876] WebRTC refactor -> session dependency removal. --- internal/session/session.go | 12 ++++++++---- internal/types/session.go | 5 +++-- internal/webrtc/handle.go | 6 ++++-- internal/webrtc/webrtc.go | 17 ++++------------- internal/websocket/admin.go | 4 ++-- neko.go | 9 ++++----- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index c760f53b..9c74e105 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -36,6 +36,10 @@ func (session *Session) Muted() bool { return session.muted } +func (session *Session) IsHost() bool { + return session.manager.host == session.id +} + func (session *Session) Connected() bool { return session.connected } @@ -75,18 +79,18 @@ func (session *Session) SetPeer(peer types.Peer) error { return nil } -func (session *Session) SetConnected(connected bool) error { +func (session *Session) SetConnected(connected bool) { session.connected = connected if connected { session.manager.emmiter.Emit("connected", session.id, session) } - return nil } -func (session *Session) Kick(reason string) error { +func (session *Session) Disconnect(reason string) error { if session.socket == nil { return nil } + if err := session.socket.Send(&message.Disconnect{ Event: event.SYSTEM_DISCONNECT, Message: reason, @@ -94,7 +98,7 @@ func (session *Session) Kick(reason string) error { return err } - return session.destroy() + return session.manager.Destroy(session.id) } func (session *Session) Send(v interface{}) error { diff --git a/internal/types/session.go b/internal/types/session.go index 95f4f876..04a56e26 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -12,15 +12,16 @@ type Session interface { Name() string Admin() bool Muted() bool + IsHost() bool Connected() bool Member() *Member SetMuted(muted bool) SetName(name string) error - SetConnected(connected bool) error + SetConnected(connected bool) SetSocket(socket WebSocket) error SetPeer(peer Peer) error Address() string - Kick(message string) error + Disconnect(message string) error Send(v interface{}) error SignalAnswer(sdp string) error } diff --git a/internal/webrtc/handle.go b/internal/webrtc/handle.go index 57b233d2..a4a07a39 100644 --- a/internal/webrtc/handle.go +++ b/internal/webrtc/handle.go @@ -6,6 +6,8 @@ import ( "strconv" "github.com/pion/webrtc/v2" + + "demodesk/neko/internal/types" ) const OP_MOVE = 0x01 @@ -36,8 +38,8 @@ type PayloadKey struct { Key uint64 } -func (manager *WebRTCManager) handle(id string, msg webrtc.DataChannelMessage) error { - if !manager.sessions.IsHost(id) { +func (manager *WebRTCManager) handle(session types.Session, msg webrtc.DataChannelMessage) error { + if !session.IsHost() { return nil } diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index 6b6afe7d..8f85eb5f 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -15,11 +15,10 @@ import ( "demodesk/neko/internal/types/config" ) -func New(sessions types.SessionManager, remote types.RemoteManager, config *config.WebRTC) *WebRTCManager { +func New(remote types.RemoteManager, config *config.WebRTC) *WebRTCManager { return &WebRTCManager{ logger: log.With().Str("module", "webrtc").Logger(), remote: remote, - sessions: sessions, config: config, } } @@ -30,7 +29,6 @@ type WebRTCManager struct { audioTrack *webrtc.Track videoCodec *webrtc.RTPCodec audioCodec *webrtc.RTPCodec - sessions types.SessionManager remote types.RemoteManager config *config.WebRTC } @@ -136,7 +134,7 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri connection.OnDataChannel(func(d *webrtc.DataChannel) { d.OnMessage(func(msg webrtc.DataChannelMessage) { - if err = manager.handle(id, msg); err != nil { + if err = manager.handle(session, msg); err != nil { manager.logger.Warn().Err(err).Msg("data handle failed") } }) @@ -151,17 +149,10 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri case webrtc.PeerConnectionStateDisconnected: case webrtc.PeerConnectionStateFailed: manager.logger.Info().Str("id", id).Msg("peer disconnected") - if err = manager.sessions.Destroy(id); err != nil { - manager.logger.Warn().Err(err).Msg("error while destroying session") - } + session.Disconnect("peer connection state failed") case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", id).Msg("peer connected") - if err = session.SetConnected(true); err != nil { - manager.logger.Warn().Err(err).Msg("unable to set connected on peer") - if err = manager.sessions.Destroy(id); err != nil { - manager.logger.Warn().Err(err).Msg("error while destroying session") - } - } + session.SetConnected(true) } }) diff --git a/internal/websocket/admin.go b/internal/websocket/admin.go index cc3e6f05..13c6f7bb 100644 --- a/internal/websocket/admin.go +++ b/internal/websocket/admin.go @@ -236,7 +236,7 @@ func (h *MessageHandler) adminKick(id string, session types.Session, payload *me return nil } - if err := target.Kick("kicked"); err != nil { + if err := target.Disconnect("kicked"); err != nil { return err } @@ -286,7 +286,7 @@ func (h *MessageHandler) adminBan(id string, session types.Session, payload *mes h.banned[address[0]] = true - if err := target.Kick("banned"); err != nil { + if err := target.Disconnect("banned"); err != nil { return err } diff --git a/neko.go b/neko.go index 62ef3fe0..96853d25 100644 --- a/neko.go +++ b/neko.go @@ -137,17 +137,16 @@ func (neko *Neko) Start() { ) neko.remoteManager.Start() - neko.sessionManager = session.New( - neko.remoteManager, - ) - neko.webRTCManager = webrtc.New( - neko.sessionManager, neko.remoteManager, neko.Configs.WebRTC, ) neko.webRTCManager.Start() + neko.sessionManager = session.New( + neko.remoteManager, + ) + neko.webSocketHandler = websocket.New( neko.sessionManager, neko.remoteManager, From cca147859d3a094573d675e448f64f8ebd604db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 21:46:29 +0100 Subject: [PATCH 053/876] refactor WebRTC antipatterns. --- internal/session/session.go | 20 +++++++++----------- internal/types/session.go | 8 ++++---- internal/webrtc/webrtc.go | 8 +++----- internal/websocket/signal.go | 4 +--- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 9c74e105..c1e2b429 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -48,6 +48,7 @@ func (session *Session) Address() string { if session.socket == nil { return "" } + return session.socket.Address() } @@ -64,26 +65,21 @@ func (session *Session) SetMuted(muted bool) { session.muted = muted } -func (session *Session) SetName(name string) error { +func (session *Session) SetName(name string) { session.name = name - return nil } -func (session *Session) SetSocket(socket types.WebSocket) error { +func (session *Session) SetSocket(socket types.WebSocket) { session.socket = socket - return nil } -func (session *Session) SetPeer(peer types.Peer) error { +func (session *Session) SetPeer(peer types.Peer) { session.peer = peer - return nil } -func (session *Session) SetConnected(connected bool) { - session.connected = connected - if connected { - session.manager.emmiter.Emit("connected", session.id, session) - } +func (session *Session) SetConnected() { + session.connected = true + session.manager.emmiter.Emit("connected", session.id, session) } func (session *Session) Disconnect(reason string) error { @@ -105,6 +101,7 @@ func (session *Session) Send(v interface{}) error { if session.socket == nil { return nil } + return session.socket.Send(v) } @@ -112,6 +109,7 @@ func (session *Session) SignalAnswer(sdp string) error { if session.peer == nil { return nil } + return session.peer.SignalAnswer(sdp) } diff --git a/internal/types/session.go b/internal/types/session.go index 04a56e26..e72ac5dc 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -16,10 +16,10 @@ type Session interface { Connected() bool Member() *Member SetMuted(muted bool) - SetName(name string) error - SetConnected(connected bool) - SetSocket(socket WebSocket) error - SetPeer(peer Peer) error + SetName(name string) + SetConnected() + SetSocket(socket WebSocket) + SetPeer(peer Peer) Address() string Disconnect(message string) error Send(v interface{}) error diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index 8f85eb5f..77ae0775 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -152,11 +152,11 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri session.Disconnect("peer connection state failed") case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", id).Msg("peer connected") - session.SetConnected(true) + session.SetConnected() } }) - if err := session.SetPeer(&Peer{ + session.SetPeer(&Peer{ id: id, api: api, engine: &engine, @@ -164,9 +164,7 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri settings: &settings, connection: connection, configuration: configuration, - }); err != nil { - return "", manager.config.ICELite, manager.config.ICEServers, err - } + }) return description.SDP, manager.config.ICELite, manager.config.ICEServers, nil } diff --git a/internal/websocket/signal.go b/internal/websocket/signal.go index 50b4446d..2ea7a307 100644 --- a/internal/websocket/signal.go +++ b/internal/websocket/signal.go @@ -26,9 +26,7 @@ func (h *MessageHandler) signalProvide(id string, session types.Session) error { } func (h *MessageHandler) signalAnswer(id string, session types.Session, payload *message.SignalAnswer) error { - if err := session.SetName(payload.DisplayName); err != nil { - return err - } + session.SetName(payload.DisplayName) if err := session.SignalAnswer(payload.SDP); err != nil { return err From 5a25aefa34edd9b10807786f7c2f97910f013ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 21:56:20 +0100 Subject: [PATCH 054/876] webRTC WS disconnect error handling. --- internal/webrtc/webrtc.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index 77ae0775..d2839780 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -149,7 +149,9 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri case webrtc.PeerConnectionStateDisconnected: case webrtc.PeerConnectionStateFailed: manager.logger.Info().Str("id", id).Msg("peer disconnected") - session.Disconnect("peer connection state failed") + if err:= session.Disconnect("peer connection state failed"); err != nil { + manager.logger.Warn().Err(err).Msg("error while disconnecting session") + } case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", id).Msg("peer connected") session.SetConnected() From b6393c4396ef08c0a9848716aa67631cbc79980c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 21:58:57 +0100 Subject: [PATCH 055/876] API lint fix. --- internal/api/room/clipboard.go | 2 +- internal/api/room/screen.go | 10 +++++----- internal/api/utils/auth.go | 16 +++++++++++----- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index aaf7d2b2..0cc4beb6 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -36,7 +36,7 @@ func (h *RoomHandler) ClipboardRead(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) ClipboardWrite(w http.ResponseWriter, r *http.Request) { data := &ClipboardData{} if err := render.Bind(r, data); err != nil { - render.Render(w, r, utils.ErrBadRequest(err)) + _ = render.Render(w, r, utils.ErrBadRequest(err)) return } diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 30932939..aa29be0c 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -31,7 +31,7 @@ func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request size := h.remote.GetScreenSize() if size == nil { - render.Render(w, r, utils.ErrMessage(500, "Unable to get screen configuration.")) + _ = render.Render(w, r, utils.ErrMessage(500, "Unable to get screen configuration.")) return } @@ -45,17 +45,17 @@ func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.Request) { data := &ScreenConfiguration{} if err := render.Bind(r, data); err != nil { - render.Render(w, r, utils.ErrBadRequest(err)) + _ = render.Render(w, r, utils.ErrBadRequest(err)) return } if err := h.remote.ChangeResolution(data.Width, data.Height, data.Rate); err != nil { - render.Render(w, r, utils.ErrUnprocessableEntity(err)) + _ = render.Render(w, r, utils.ErrUnprocessableEntity(err)) return } if err := broadcast.ScreenConfiguration(h.sessions, "-todo-session-id-", data.Width, data.Height, data.Rate); err != nil { - render.Render(w, r, utils.ErrInternalServer(err)) + _ = render.Render(w, r, utils.ErrInternalServer(err)) return } @@ -76,5 +76,5 @@ func (h *RoomHandler) ScreenConfigurationsList(w http.ResponseWriter, r *http.Re } } - render.RenderList(w, r, list) + _ = render.RenderList(w, r, list) } diff --git a/internal/api/utils/auth.go b/internal/api/utils/auth.go index 03f80dbb..8d25bbfe 100644 --- a/internal/api/utils/auth.go +++ b/internal/api/utils/auth.go @@ -10,8 +10,14 @@ import ( "github.com/dgrijalva/jwt-go" ) +type key int + +const ( + keyPrincipalID key = iota +) + func GetUserName(r *http.Request) interface{} { - props, _ := r.Context().Value("props").(jwt.MapClaims) + props, _ := r.Context().Value(keyPrincipalID).(jwt.MapClaims) return props["user_name"] } @@ -21,7 +27,7 @@ func AuthMiddleware(next http.Handler, jwtSecrets ...[]byte) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { authHeader := strings.Split(r.Header.Get("Authorization"), "Bearer ") if len(authHeader) != 2 { - render.Render(w, r, ErrMessage(401, "Malformed JWT token.")) + _ = render.Render(w, r, ErrMessage(401, "Malformed JWT token.")) return } @@ -43,17 +49,17 @@ func AuthMiddleware(next http.Handler, jwtSecrets ...[]byte) http.Handler { } if err != nil { - render.Render(w, r, ErrMessage(401, "Invalid JWT token.")) + _ = render.Render(w, r, ErrMessage(401, "Invalid JWT token.")) return } if claims, ok := jwtVerified.Claims.(jwt.MapClaims); ok && jwtVerified.Valid { - ctx := context.WithValue(r.Context(), "props", claims) + ctx := context.WithValue(r.Context(), keyPrincipalID, claims) // Access context values in handlers like this // props, _ := r.Context().Value("props").(jwt.MapClaims) next.ServeHTTP(w, r.WithContext(ctx)) } else { - render.Render(w, r, ErrMessage(401, "Unauthorized.")) + _ = render.Render(w, r, ErrMessage(401, "Unauthorized.")) } }) } From b61495ac0b0574a96bffa8fa25360fc464920a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 22:43:47 +0100 Subject: [PATCH 056/876] remove redundant ID parameter in websockets. --- internal/websocket/admin.go | 42 ++++++++++++++++----------------- internal/websocket/control.go | 41 ++++++++++++++++---------------- internal/websocket/handler.go | 36 ++++++++++++++-------------- internal/websocket/screen.go | 8 +++---- internal/websocket/session.go | 14 +++++------ internal/websocket/signal.go | 8 +++---- internal/websocket/websocket.go | 4 ++-- 7 files changed, 76 insertions(+), 77 deletions(-) diff --git a/internal/websocket/admin.go b/internal/websocket/admin.go index 13c6f7bb..6061a330 100644 --- a/internal/websocket/admin.go +++ b/internal/websocket/admin.go @@ -8,7 +8,7 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandler) adminLock(id string, session types.Session) error { +func (h *MessageHandler) adminLock(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -24,7 +24,7 @@ func (h *MessageHandler) adminLock(id string, session types.Session) error { if err := h.sessions.Broadcast( message.Admin{ Event: event.ADMIN_LOCK, - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_LOCK) return err @@ -33,7 +33,7 @@ func (h *MessageHandler) adminLock(id string, session types.Session) error { return nil } -func (h *MessageHandler) adminUnlock(id string, session types.Session) error { +func (h *MessageHandler) adminUnlock(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -49,7 +49,7 @@ func (h *MessageHandler) adminUnlock(id string, session types.Session) error { if err := h.sessions.Broadcast( message.Admin{ Event: event.ADMIN_UNLOCK, - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_UNLOCK) return err @@ -58,7 +58,7 @@ func (h *MessageHandler) adminUnlock(id string, session types.Session) error { return nil } -func (h *MessageHandler) adminControl(id string, session types.Session) error { +func (h *MessageHandler) adminControl(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -66,7 +66,7 @@ func (h *MessageHandler) adminControl(id string, session types.Session) error { host, ok := h.sessions.GetHost() - if err := h.sessions.SetHost(id); err != nil { + if err := h.sessions.SetHost(session.ID()); err != nil { h.logger.Warn().Err(err).Msgf("SetHost failed") return err } @@ -75,7 +75,7 @@ func (h *MessageHandler) adminControl(id string, session types.Session) error { if err := h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_CONTROL, - ID: id, + ID: session.ID(), Target: host.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_CONTROL) @@ -85,7 +85,7 @@ func (h *MessageHandler) adminControl(id string, session types.Session) error { if err := h.sessions.Broadcast( message.Admin{ Event: event.ADMIN_CONTROL, - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_CONTROL) return err @@ -95,7 +95,7 @@ func (h *MessageHandler) adminControl(id string, session types.Session) error { return nil } -func (h *MessageHandler) adminRelease(id string, session types.Session) error { +func (h *MessageHandler) adminRelease(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -109,7 +109,7 @@ func (h *MessageHandler) adminRelease(id string, session types.Session) error { if err := h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_RELEASE, - ID: id, + ID: session.ID(), Target: host.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_RELEASE) @@ -119,7 +119,7 @@ func (h *MessageHandler) adminRelease(id string, session types.Session) error { if err := h.sessions.Broadcast( message.Admin{ Event: event.ADMIN_RELEASE, - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_RELEASE) return err @@ -129,7 +129,7 @@ func (h *MessageHandler) adminRelease(id string, session types.Session) error { return nil } -func (h *MessageHandler) adminGive(id string, session types.Session, payload *message.Admin) error { +func (h *MessageHandler) adminGive(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -150,7 +150,7 @@ func (h *MessageHandler) adminGive(id string, session types.Session, payload *me if err := h.sessions.Broadcast( message.AdminTarget{ Event: event.CONTROL_GIVE, - ID: id, + ID: session.ID(), Target: payload.ID, }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) @@ -160,7 +160,7 @@ func (h *MessageHandler) adminGive(id string, session types.Session, payload *me return nil } -func (h *MessageHandler) adminMute(id string, session types.Session, payload *message.Admin) error { +func (h *MessageHandler) adminMute(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -183,7 +183,7 @@ func (h *MessageHandler) adminMute(id string, session types.Session, payload *me message.AdminTarget{ Event: event.ADMIN_MUTE, Target: target.ID(), - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_UNMUTE) return err @@ -192,7 +192,7 @@ func (h *MessageHandler) adminMute(id string, session types.Session, payload *me return nil } -func (h *MessageHandler) adminUnmute(id string, session types.Session, payload *message.Admin) error { +func (h *MessageHandler) adminUnmute(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -210,7 +210,7 @@ func (h *MessageHandler) adminUnmute(id string, session types.Session, payload * message.AdminTarget{ Event: event.ADMIN_UNMUTE, Target: target.ID(), - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_UNMUTE) return err @@ -219,7 +219,7 @@ func (h *MessageHandler) adminUnmute(id string, session types.Session, payload * return nil } -func (h *MessageHandler) adminKick(id string, session types.Session, payload *message.Admin) error { +func (h *MessageHandler) adminKick(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -244,7 +244,7 @@ func (h *MessageHandler) adminKick(id string, session types.Session, payload *me message.AdminTarget{ Event: event.ADMIN_KICK, Target: target.ID(), - ID: id, + ID: session.ID(), }, []string{payload.ID}); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_KICK) return err @@ -253,7 +253,7 @@ func (h *MessageHandler) adminKick(id string, session types.Session, payload *me return nil } -func (h *MessageHandler) adminBan(id string, session types.Session, payload *message.Admin) error { +func (h *MessageHandler) adminBan(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -294,7 +294,7 @@ func (h *MessageHandler) adminBan(id string, session types.Session, payload *mes message.AdminTarget{ Event: event.ADMIN_BAN, Target: target.ID(), - ID: id, + ID: session.ID(), }, []string{payload.ID}); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_BAN) return err diff --git a/internal/websocket/control.go b/internal/websocket/control.go index b02fe6c8..9d3b39cd 100644 --- a/internal/websocket/control.go +++ b/internal/websocket/control.go @@ -6,23 +6,22 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandler) controlRelease(id string, session types.Session) error { - +func (h *MessageHandler) controlRelease(session types.Session) error { // check if session is host - if !h.sessions.IsHost(id) { - h.logger.Debug().Str("id", id).Msg("is not the host") + if !h.sessions.IsHost(session.ID()) { + h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } // release host - h.logger.Debug().Str("id", id).Msgf("host called %s", event.CONTROL_RELEASE) + h.logger.Debug().Str("id", session.ID()).Msgf("host called %s", event.CONTROL_RELEASE) h.sessions.ClearHost() // tell everyone if err := h.sessions.Broadcast( message.Control{ Event: event.CONTROL_RELEASE, - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) return err @@ -31,11 +30,11 @@ func (h *MessageHandler) controlRelease(id string, session types.Session) error return nil } -func (h *MessageHandler) controlRequest(id string, session types.Session) error { +func (h *MessageHandler) controlRequest(session types.Session) error { // check for host if !h.sessions.HasHost() { // set host - if err := h.sessions.SetHost(id); err != nil { + if err := h.sessions.SetHost(session.ID()); err != nil { h.logger.Warn().Err(err).Msgf("SetHost failed") return err } @@ -44,7 +43,7 @@ func (h *MessageHandler) controlRequest(id string, session types.Session) error if err := h.sessions.Broadcast( message.Control{ Event: event.CONTROL_LOCKED, - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) return err @@ -62,14 +61,14 @@ func (h *MessageHandler) controlRequest(id string, session types.Session) error Event: event.CONTROL_REQUEST, ID: host.ID(), }); err != nil { - h.logger.Warn().Err(err).Str("id", id).Msgf("sending event %s has failed", event.CONTROL_REQUEST) + h.logger.Warn().Err(err).Str("id", session.ID()).Msgf("sending event %s has failed", event.CONTROL_REQUEST) return err } // tell host session wants to be host if err := host.Send(message.Control{ Event: event.CONTROL_REQUESTING, - ID: id, + ID: session.ID(), }); err != nil { h.logger.Warn().Err(err).Str("id", host.ID()).Msgf("sending event %s has failed", event.CONTROL_REQUESTING) return err @@ -79,10 +78,10 @@ func (h *MessageHandler) controlRequest(id string, session types.Session) error return nil } -func (h *MessageHandler) controlGive(id string, session types.Session, payload *message.Control) error { +func (h *MessageHandler) controlGive(session types.Session, payload *message.Control) error { // check if session is host - if !h.sessions.IsHost(id) { - h.logger.Debug().Str("id", id).Msg("is not the host") + if !h.sessions.IsHost(session.ID()) { + h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } @@ -101,7 +100,7 @@ func (h *MessageHandler) controlGive(id string, session types.Session, payload * if err := h.sessions.Broadcast( message.ControlTarget{ Event: event.CONTROL_GIVE, - ID: id, + ID: session.ID(), Target: payload.ID, }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) @@ -111,10 +110,10 @@ func (h *MessageHandler) controlGive(id string, session types.Session, payload * return nil } -func (h *MessageHandler) controlClipboard(id string, session types.Session, payload *message.Clipboard) error { +func (h *MessageHandler) controlClipboard(session types.Session, payload *message.Clipboard) error { // check if session is host - if !h.sessions.IsHost(id) { - h.logger.Debug().Str("id", id).Msg("is not the host") + if !h.sessions.IsHost(session.ID()) { + h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } @@ -122,10 +121,10 @@ func (h *MessageHandler) controlClipboard(id string, session types.Session, payl return nil } -func (h *MessageHandler) controlKeyboard(id string, session types.Session, payload *message.Keyboard) error { +func (h *MessageHandler) controlKeyboard(session types.Session, payload *message.Keyboard) error { // check if session is host - if !h.sessions.IsHost(id) { - h.logger.Debug().Str("id", id).Msg("is not the host") + if !h.sessions.IsHost(session.ID()) { + h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } diff --git a/internal/websocket/handler.go b/internal/websocket/handler.go index 86038711..54379989 100644 --- a/internal/websocket/handler.go +++ b/internal/websocket/handler.go @@ -70,43 +70,43 @@ func (h *MessageHandler) Message(id string, raw []byte) error { payload := &message.SignalAnswer{} return errors.Wrapf( utils.Unmarshal(payload, raw, func() error { - return h.signalAnswer(id, session, payload) + return h.signalAnswer(session, payload) }), "%s failed", header.Event) // Control Events case event.CONTROL_RELEASE: - return errors.Wrapf(h.controlRelease(id, session), "%s failed", header.Event) + return errors.Wrapf(h.controlRelease(session), "%s failed", header.Event) case event.CONTROL_REQUEST: - return errors.Wrapf(h.controlRequest(id, session), "%s failed", header.Event) + return errors.Wrapf(h.controlRequest(session), "%s failed", header.Event) case event.CONTROL_GIVE: payload := &message.Control{} return errors.Wrapf( utils.Unmarshal(payload, raw, func() error { - return h.controlGive(id, session, payload) + return h.controlGive(session, payload) }), "%s failed", header.Event) case event.CONTROL_CLIPBOARD: payload := &message.Clipboard{} return errors.Wrapf( utils.Unmarshal(payload, raw, func() error { - return h.controlClipboard(id, session, payload) + return h.controlClipboard(session, payload) }), "%s failed", header.Event) case event.CONTROL_KEYBOARD: payload := &message.Keyboard{} return errors.Wrapf( utils.Unmarshal(payload, raw, func() error { - return h.controlKeyboard(id, session, payload) + return h.controlKeyboard(session, payload) }), "%s failed", header.Event) // Screen Events case event.SCREEN_RESOLUTION: - return errors.Wrapf(h.screenResolution(id, session), "%s failed", header.Event) + return errors.Wrapf(h.screenResolution(session), "%s failed", header.Event) case event.SCREEN_CONFIGURATIONS: - return errors.Wrapf(h.screenConfigurations(id, session), "%s failed", header.Event) + return errors.Wrapf(h.screenConfigurations(session), "%s failed", header.Event) case event.SCREEN_SET: payload := &message.ScreenResolution{} return errors.Wrapf( utils.Unmarshal(payload, raw, func() error { - return h.screenSet(id, session, payload) + return h.screenSet(session, payload) }), "%s failed", header.Event) // Boradcast Events @@ -121,42 +121,42 @@ func (h *MessageHandler) Message(id string, raw []byte) error { // Admin Events case event.ADMIN_LOCK: - return errors.Wrapf(h.adminLock(id, session), "%s failed", header.Event) + return errors.Wrapf(h.adminLock(session), "%s failed", header.Event) case event.ADMIN_UNLOCK: - return errors.Wrapf(h.adminUnlock(id, session), "%s failed", header.Event) + return errors.Wrapf(h.adminUnlock(session), "%s failed", header.Event) case event.ADMIN_CONTROL: - return errors.Wrapf(h.adminControl(id, session), "%s failed", header.Event) + return errors.Wrapf(h.adminControl(session), "%s failed", header.Event) case event.ADMIN_RELEASE: - return errors.Wrapf(h.adminRelease(id, session), "%s failed", header.Event) + return errors.Wrapf(h.adminRelease(session), "%s failed", header.Event) case event.ADMIN_GIVE: payload := &message.Admin{} return errors.Wrapf( utils.Unmarshal(payload, raw, func() error { - return h.adminGive(id, session, payload) + return h.adminGive(session, payload) }), "%s failed", header.Event) case event.ADMIN_BAN: payload := &message.Admin{} return errors.Wrapf( utils.Unmarshal(payload, raw, func() error { - return h.adminBan(id, session, payload) + return h.adminBan(session, payload) }), "%s failed", header.Event) case event.ADMIN_KICK: payload := &message.Admin{} return errors.Wrapf( utils.Unmarshal(payload, raw, func() error { - return h.adminKick(id, session, payload) + return h.adminKick(session, payload) }), "%s failed", header.Event) case event.ADMIN_MUTE: payload := &message.Admin{} return errors.Wrapf( utils.Unmarshal(payload, raw, func() error { - return h.adminMute(id, session, payload) + return h.adminMute(session, payload) }), "%s failed", header.Event) case event.ADMIN_UNMUTE: payload := &message.Admin{} return errors.Wrapf( utils.Unmarshal(payload, raw, func() error { - return h.adminUnmute(id, session, payload) + return h.adminUnmute(session, payload) }), "%s failed", header.Event) default: return errors.Errorf("unknown message event %s", header.Event) diff --git a/internal/websocket/screen.go b/internal/websocket/screen.go index 26a6fa71..b9a1328d 100644 --- a/internal/websocket/screen.go +++ b/internal/websocket/screen.go @@ -7,7 +7,7 @@ import ( "demodesk/neko/internal/websocket/broadcast" ) -func (h *MessageHandler) screenSet(id string, session types.Session, payload *message.ScreenResolution) error { +func (h *MessageHandler) screenSet(session types.Session, payload *message.ScreenResolution) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -18,7 +18,7 @@ func (h *MessageHandler) screenSet(id string, session types.Session, payload *me return err } - if err := broadcast.ScreenConfiguration(h.sessions, id, payload.Width, payload.Height, payload.Rate); err != nil { + if err := broadcast.ScreenConfiguration(h.sessions, session.ID(), payload.Width, payload.Height, payload.Rate); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.SCREEN_RESOLUTION) return err } @@ -26,7 +26,7 @@ func (h *MessageHandler) screenSet(id string, session types.Session, payload *me return nil } -func (h *MessageHandler) screenResolution(id string, session types.Session) error { +func (h *MessageHandler) screenResolution(session types.Session) error { if size := h.remote.GetScreenSize(); size != nil { if err := session.Send(message.ScreenResolution{ Event: event.SCREEN_RESOLUTION, @@ -42,7 +42,7 @@ func (h *MessageHandler) screenResolution(id string, session types.Session) erro return nil } -func (h *MessageHandler) screenConfigurations(id string, session types.Session) error { +func (h *MessageHandler) screenConfigurations(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil diff --git a/internal/websocket/session.go b/internal/websocket/session.go index 8bb0d053..ea10e0bb 100644 --- a/internal/websocket/session.go +++ b/internal/websocket/session.go @@ -6,15 +6,15 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandler) SessionCreated(id string, session types.Session) error { +func (h *MessageHandler) SessionCreated(session types.Session) error { // send sdp and id over to client - if err := h.signalProvide(id, session); err != nil { + if err := h.signalProvide(session); err != nil { return err } if session.Admin() { // send screen configurations if admin - if err := h.screenConfigurations(id, session); err != nil { + if err := h.screenConfigurations(session); err != nil { return err } @@ -27,18 +27,18 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error return nil } -func (h *MessageHandler) SessionConnected(id string, session types.Session) error { +func (h *MessageHandler) SessionConnected(session types.Session) error { // send list of members to session if err := session.Send(message.MembersList{ Event: event.MEMBER_LIST, Memebers: h.sessions.Members(), }); err != nil { - h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST) + h.logger.Warn().Str("id", session.ID()).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST) return err } // send screen current resolution - if err := h.screenResolution(id, session); err != nil { + if err := h.screenResolution(session); err != nil { return err } @@ -49,7 +49,7 @@ func (h *MessageHandler) SessionConnected(id string, session types.Session) erro Event: event.CONTROL_LOCKED, ID: host.ID(), }); err != nil { - h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.CONTROL_LOCKED) + h.logger.Warn().Str("id", session.ID()).Err(err).Msgf("sending event %s has failed", event.CONTROL_LOCKED) return err } } diff --git a/internal/websocket/signal.go b/internal/websocket/signal.go index 2ea7a307..9c001beb 100644 --- a/internal/websocket/signal.go +++ b/internal/websocket/signal.go @@ -6,15 +6,15 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandler) signalProvide(id string, session types.Session) error { - sdp, lite, ice, err := h.webrtc.CreatePeer(id, session) +func (h *MessageHandler) signalProvide(session types.Session) error { + sdp, lite, ice, err := h.webrtc.CreatePeer(session.ID(), session) if err != nil { return err } if err := session.Send(message.SignalProvide{ Event: event.SIGNAL_PROVIDE, - ID: id, + ID: session.ID(), SDP: sdp, Lite: lite, ICE: ice, @@ -25,7 +25,7 @@ func (h *MessageHandler) signalProvide(id string, session types.Session) error { return nil } -func (h *MessageHandler) signalAnswer(id string, session types.Session, payload *message.SignalAnswer) error { +func (h *MessageHandler) signalAnswer(session types.Session, payload *message.SignalAnswer) error { session.SetName(payload.DisplayName) if err := session.SignalAnswer(payload.SDP); err != nil { diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index 20390dcb..3bad5c29 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -56,7 +56,7 @@ type WebSocketHandler struct { func (ws *WebSocketHandler) Start() { ws.sessions.OnCreated(func(id string, session types.Session) { - if err := ws.handler.SessionCreated(id, session); err != nil { + if err := ws.handler.SessionCreated(session); err != nil { ws.logger.Warn().Str("id", id).Err(err).Msg("session created with and error") } else { ws.logger.Debug().Str("id", id).Msg("session created") @@ -64,7 +64,7 @@ func (ws *WebSocketHandler) Start() { }) ws.sessions.OnConnected(func(id string, session types.Session) { - if err := ws.handler.SessionConnected(id, session); err != nil { + if err := ws.handler.SessionConnected(session); err != nil { ws.logger.Warn().Str("id", id).Err(err).Msg("session connected with and error") } else { ws.logger.Debug().Str("id", id).Msg("session connected") From e150203b5469ebae1990e188254c4722828e2c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 23:03:37 +0100 Subject: [PATCH 057/876] refactor session remove redundant IDs. --- internal/session/manager.go | 42 ++++++++++++++++----------------- internal/session/session.go | 2 +- internal/types/session.go | 11 ++++----- internal/websocket/control.go | 8 +++---- internal/websocket/session.go | 8 +++---- internal/websocket/websocket.go | 20 ++++++++-------- 6 files changed, 44 insertions(+), 47 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 6871e6e9..67095db9 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -40,7 +40,7 @@ func (manager *SessionManager) New(id string, admin bool, socket types.WebSocket } manager.members[id] = session - manager.emmiter.Emit("created", id, session) + manager.emmiter.Emit("created", session) if !manager.remote.Streaming() && len(manager.members) > 0 { manager.remote.StartStream() @@ -53,15 +53,11 @@ func (manager *SessionManager) HasHost() bool { return manager.host != "" } -func (manager *SessionManager) IsHost(id string) bool { - return manager.host == id -} - func (manager *SessionManager) SetHost(id string) error { - _, ok := manager.members[id] + host, ok := manager.GetHost() if ok { manager.host = id - manager.emmiter.Emit("host", id) + manager.emmiter.Emit("host", host) return nil } return fmt.Errorf("invalid session id %s", id) @@ -73,9 +69,11 @@ func (manager *SessionManager) GetHost() (types.Session, bool) { } func (manager *SessionManager) ClearHost() { - id := manager.host + host, ok := manager.GetHost() manager.host = "" - manager.emmiter.Emit("host_cleared", id) + if ok { + manager.emmiter.Emit("host_cleared", host) + } } func (manager *SessionManager) Has(id string) bool { @@ -122,13 +120,13 @@ func (manager *SessionManager) Destroy(id string) error { session, ok := manager.members[id] if ok { err := session.destroy() - delete(manager.members, id) if !manager.remote.Streaming() && len(manager.members) <= 0 { manager.remote.StopStream() } - manager.emmiter.Emit("destroyed", id, session) + manager.emmiter.Emit("before_destroy", session) + delete(manager.members, id) return err } @@ -154,32 +152,32 @@ func (manager *SessionManager) Broadcast(v interface{}, exclude interface{}) err return nil } -func (manager *SessionManager) OnHost(listener func(id string)) { +func (manager *SessionManager) OnHost(listener func(session types.Session)) { manager.emmiter.On("host", func(payload ...interface{}) { - listener(payload[0].(string)) + listener(payload[0].(*Session)) }) } -func (manager *SessionManager) OnHostCleared(listener func(id string)) { +func (manager *SessionManager) OnHostCleared(listener func(session types.Session)) { manager.emmiter.On("host_cleared", func(payload ...interface{}) { - listener(payload[0].(string)) + listener(payload[0].(*Session)) }) } -func (manager *SessionManager) OnDestroy(listener func(id string, session types.Session)) { - manager.emmiter.On("destroyed", func(payload ...interface{}) { - listener(payload[0].(string), payload[1].(*Session)) +func (manager *SessionManager) OnBeforeDestroy(listener func(session types.Session)) { + manager.emmiter.On("before_destroy", func(payload ...interface{}) { + listener(payload[0].(*Session)) }) } -func (manager *SessionManager) OnCreated(listener func(id string, session types.Session)) { +func (manager *SessionManager) OnCreated(listener func(session types.Session)) { manager.emmiter.On("created", func(payload ...interface{}) { - listener(payload[0].(string), payload[1].(*Session)) + listener(payload[0].(*Session)) }) } -func (manager *SessionManager) OnConnected(listener func(id string, session types.Session)) { +func (manager *SessionManager) OnConnected(listener func(session types.Session)) { manager.emmiter.On("connected", func(payload ...interface{}) { - listener(payload[0].(string), payload[1].(*Session)) + listener(payload[0].(*Session)) }) } diff --git a/internal/session/session.go b/internal/session/session.go index c1e2b429..4074f4f8 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -79,7 +79,7 @@ func (session *Session) SetPeer(peer types.Peer) { func (session *Session) SetConnected() { session.connected = true - session.manager.emmiter.Emit("connected", session.id, session) + session.manager.emmiter.Emit("connected", session) } func (session *Session) Disconnect(reason string) error { diff --git a/internal/types/session.go b/internal/types/session.go index e72ac5dc..f7a75e42 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -29,7 +29,6 @@ type Session interface { type SessionManager interface { New(id string, admin bool, socket WebSocket) Session HasHost() bool - IsHost(id string) bool SetHost(id string) error GetHost() (Session, bool) ClearHost() @@ -39,9 +38,9 @@ type SessionManager interface { Admins() []*Member Destroy(id string) error Broadcast(v interface{}, exclude interface{}) error - OnHost(listener func(id string)) - OnHostCleared(listener func(id string)) - OnDestroy(listener func(id string, session Session)) - OnCreated(listener func(id string, session Session)) - OnConnected(listener func(id string, session Session)) + OnHost(listener func(session Session)) + OnHostCleared(listener func(session Session)) + OnBeforeDestroy(listener func(session Session)) + OnCreated(listener func(session Session)) + OnConnected(listener func(session Session)) } diff --git a/internal/websocket/control.go b/internal/websocket/control.go index 9d3b39cd..828e3de1 100644 --- a/internal/websocket/control.go +++ b/internal/websocket/control.go @@ -8,7 +8,7 @@ import ( func (h *MessageHandler) controlRelease(session types.Session) error { // check if session is host - if !h.sessions.IsHost(session.ID()) { + if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } @@ -80,7 +80,7 @@ func (h *MessageHandler) controlRequest(session types.Session) error { func (h *MessageHandler) controlGive(session types.Session, payload *message.Control) error { // check if session is host - if !h.sessions.IsHost(session.ID()) { + if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } @@ -112,7 +112,7 @@ func (h *MessageHandler) controlGive(session types.Session, payload *message.Con func (h *MessageHandler) controlClipboard(session types.Session, payload *message.Clipboard) error { // check if session is host - if !h.sessions.IsHost(session.ID()) { + if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } @@ -123,7 +123,7 @@ func (h *MessageHandler) controlClipboard(session types.Session, payload *messag func (h *MessageHandler) controlKeyboard(session types.Session, payload *message.Keyboard) error { // check if session is host - if !h.sessions.IsHost(session.ID()) { + if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } diff --git a/internal/websocket/session.go b/internal/websocket/session.go index ea10e0bb..5f2e000e 100644 --- a/internal/websocket/session.go +++ b/internal/websocket/session.go @@ -67,13 +67,13 @@ func (h *MessageHandler) SessionConnected(session types.Session) error { return nil } -func (h *MessageHandler) SessionDestroyed(id string) error { +func (h *MessageHandler) SessionDestroyed(session types.Session) error { // clear host if exists - if h.sessions.IsHost(id) { + if session.IsHost() { h.sessions.ClearHost() if err := h.sessions.Broadcast(message.Control{ Event: event.CONTROL_RELEASE, - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) } @@ -83,7 +83,7 @@ func (h *MessageHandler) SessionDestroyed(id string) error { if err := h.sessions.Broadcast( message.MemberDisconnected{ Event: event.MEMBER_DISCONNECTED, - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.MEMBER_DISCONNECTED) return err diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index 3bad5c29..fef8a888 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -55,27 +55,27 @@ type WebSocketHandler struct { } func (ws *WebSocketHandler) Start() { - ws.sessions.OnCreated(func(id string, session types.Session) { + ws.sessions.OnCreated(func(session types.Session) { if err := ws.handler.SessionCreated(session); err != nil { - ws.logger.Warn().Str("id", id).Err(err).Msg("session created with and error") + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with and error") } else { - ws.logger.Debug().Str("id", id).Msg("session created") + ws.logger.Debug().Str("id", session.ID()).Msg("session created") } }) - ws.sessions.OnConnected(func(id string, session types.Session) { + ws.sessions.OnConnected(func(session types.Session) { if err := ws.handler.SessionConnected(session); err != nil { - ws.logger.Warn().Str("id", id).Err(err).Msg("session connected with and error") + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with and error") } else { - ws.logger.Debug().Str("id", id).Msg("session connected") + ws.logger.Debug().Str("id", session.ID()).Msg("session connected") } }) - ws.sessions.OnDestroy(func(id string, session types.Session) { - if err := ws.handler.SessionDestroyed(id); err != nil { - ws.logger.Warn().Str("id", id).Err(err).Msg("session destroyed with and error") + ws.sessions.OnBeforeDestroy(func(session types.Session) { + if err := ws.handler.SessionDestroyed(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session destroyed with and error") } else { - ws.logger.Debug().Str("id", id).Msg("session destroyed") + ws.logger.Debug().Str("id", session.ID()).Msg("session destroyed") } }) From 5c92b75cf7081e1843244c505a723cefaeda8a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 31 Oct 2020 23:53:19 +0100 Subject: [PATCH 058/876] Refactor: session remove duplicate ID in endpoints. --- internal/session/manager.go | 42 +++++++++++++-------------------- internal/session/session.go | 2 +- internal/types/session.go | 6 ++--- internal/websocket/admin.go | 27 ++++++++------------- internal/websocket/control.go | 31 ++++++++---------------- internal/websocket/session.go | 13 +++++----- internal/websocket/websocket.go | 12 +++++----- 7 files changed, 53 insertions(+), 80 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 67095db9..987783ce 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -1,8 +1,6 @@ package session import ( - "fmt" - "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -14,7 +12,7 @@ import ( func New(remote types.RemoteManager) *SessionManager { return &SessionManager{ logger: log.With().Str("module", "session").Logger(), - host: "", + host: nil, remote: remote, members: make(map[string]*Session), emmiter: events.New(), @@ -23,7 +21,7 @@ func New(remote types.RemoteManager) *SessionManager { type SessionManager struct { logger zerolog.Logger - host string + host types.Session remote types.RemoteManager members map[string]*Session emmiter events.EventEmmiter @@ -50,30 +48,22 @@ func (manager *SessionManager) New(id string, admin bool, socket types.WebSocket } func (manager *SessionManager) HasHost() bool { - return manager.host != "" + return manager.host != nil } -func (manager *SessionManager) SetHost(id string) error { - host, ok := manager.GetHost() - if ok { - manager.host = id - manager.emmiter.Emit("host", host) - return nil - } - return fmt.Errorf("invalid session id %s", id) +func (manager *SessionManager) SetHost(host types.Session) { + manager.host = host + manager.emmiter.Emit("host", host) } -func (manager *SessionManager) GetHost() (types.Session, bool) { - host, ok := manager.members[manager.host] - return host, ok +func (manager *SessionManager) GetHost() types.Session { + return manager.host } func (manager *SessionManager) ClearHost() { - host, ok := manager.GetHost() - manager.host = "" - if ok { - manager.emmiter.Emit("host_cleared", host) - } + host := manager.host + manager.host = nil + manager.emmiter.Emit("host_cleared", host) } func (manager *SessionManager) Has(id string) bool { @@ -119,14 +109,14 @@ func (manager *SessionManager) Members() []*types.Member { func (manager *SessionManager) Destroy(id string) error { session, ok := manager.members[id] if ok { + delete(manager.members, id) err := session.destroy() if !manager.remote.Streaming() && len(manager.members) <= 0 { manager.remote.StopStream() } - manager.emmiter.Emit("before_destroy", session) - delete(manager.members, id) + manager.emmiter.Emit("destroy", id) return err } @@ -164,9 +154,9 @@ func (manager *SessionManager) OnHostCleared(listener func(session types.Session }) } -func (manager *SessionManager) OnBeforeDestroy(listener func(session types.Session)) { - manager.emmiter.On("before_destroy", func(payload ...interface{}) { - listener(payload[0].(*Session)) +func (manager *SessionManager) OnDestroy(listener func(id string)) { + manager.emmiter.On("destroy", func(payload ...interface{}) { + listener(payload[0].(string)) }) } diff --git a/internal/session/session.go b/internal/session/session.go index 4074f4f8..41865f02 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -37,7 +37,7 @@ func (session *Session) Muted() bool { } func (session *Session) IsHost() bool { - return session.manager.host == session.id + return session.manager.host != nil && session.manager.host.ID() == session.ID() } func (session *Session) Connected() bool { diff --git a/internal/types/session.go b/internal/types/session.go index f7a75e42..ce973950 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -29,8 +29,8 @@ type Session interface { type SessionManager interface { New(id string, admin bool, socket WebSocket) Session HasHost() bool - SetHost(id string) error - GetHost() (Session, bool) + SetHost(Session) + GetHost() Session ClearHost() Has(id string) bool Get(id string) (Session, bool) @@ -40,7 +40,7 @@ type SessionManager interface { Broadcast(v interface{}, exclude interface{}) error OnHost(listener func(session Session)) OnHostCleared(listener func(session Session)) - OnBeforeDestroy(listener func(session Session)) + OnDestroy(listener func(id string)) OnCreated(listener func(session Session)) OnConnected(listener func(session Session)) } diff --git a/internal/websocket/admin.go b/internal/websocket/admin.go index 6061a330..eeea2db8 100644 --- a/internal/websocket/admin.go +++ b/internal/websocket/admin.go @@ -64,14 +64,10 @@ func (h *MessageHandler) adminControl(session types.Session) error { return nil } - host, ok := h.sessions.GetHost() + host := h.sessions.GetHost() + h.sessions.SetHost(session) - if err := h.sessions.SetHost(session.ID()); err != nil { - h.logger.Warn().Err(err).Msgf("SetHost failed") - return err - } - - if ok { + if host != nil { if err := h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_CONTROL, @@ -101,11 +97,10 @@ func (h *MessageHandler) adminRelease(session types.Session) error { return nil } - host, ok := h.sessions.GetHost() - + host := h.sessions.GetHost() h.sessions.ClearHost() - if ok { + if host != nil { if err := h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_RELEASE, @@ -135,23 +130,21 @@ func (h *MessageHandler) adminGive(session types.Session, payload *message.Admin return nil } - if !h.sessions.Has(payload.ID) { - h.logger.Debug().Str("id", payload.ID).Msg("user does not exist") + target, ok := h.sessions.Get(payload.ID) + if !ok { + h.logger.Debug().Str("id", target.ID()).Msg("user does not exist") return nil } // set host - if err := h.sessions.SetHost(payload.ID); err != nil { - h.logger.Warn().Err(err).Msgf("SetHost failed") - return err - } + h.sessions.SetHost(target) // let everyone know if err := h.sessions.Broadcast( message.AdminTarget{ Event: event.CONTROL_GIVE, ID: session.ID(), - Target: payload.ID, + Target: target.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) return err diff --git a/internal/websocket/control.go b/internal/websocket/control.go index 828e3de1..f05afc2b 100644 --- a/internal/websocket/control.go +++ b/internal/websocket/control.go @@ -31,13 +31,11 @@ func (h *MessageHandler) controlRelease(session types.Session) error { } func (h *MessageHandler) controlRequest(session types.Session) error { - // check for host - if !h.sessions.HasHost() { + host := h.sessions.GetHost() + + if host == nil { // set host - if err := h.sessions.SetHost(session.ID()); err != nil { - h.logger.Warn().Err(err).Msgf("SetHost failed") - return err - } + h.sessions.SetHost(session) // let everyone know if err := h.sessions.Broadcast( @@ -48,14 +46,7 @@ func (h *MessageHandler) controlRequest(session types.Session) error { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) return err } - - return nil - } - - // get host - host, ok := h.sessions.GetHost() - if ok { - + } else { // tell session there is a host if err := session.Send(message.Control{ Event: event.CONTROL_REQUEST, @@ -85,23 +76,21 @@ func (h *MessageHandler) controlGive(session types.Session, payload *message.Con return nil } - if !h.sessions.Has(payload.ID) { - h.logger.Debug().Str("id", payload.ID).Msg("user does not exist") + target, ok := h.sessions.Get(payload.ID) + if !ok { + h.logger.Debug().Str("id", target.ID()).Msg("user does not exist") return nil } // set host - if err := h.sessions.SetHost(payload.ID); err != nil { - h.logger.Warn().Err(err).Msgf("SetHost failed") - return err - } + h.sessions.SetHost(target) // let everyone know if err := h.sessions.Broadcast( message.ControlTarget{ Event: event.CONTROL_GIVE, ID: session.ID(), - Target: payload.ID, + Target: target.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) return err diff --git a/internal/websocket/session.go b/internal/websocket/session.go index 5f2e000e..0a7ecbad 100644 --- a/internal/websocket/session.go +++ b/internal/websocket/session.go @@ -43,8 +43,8 @@ func (h *MessageHandler) SessionConnected(session types.Session) error { } // tell session there is a host - host, ok := h.sessions.GetHost() - if ok { + host := h.sessions.GetHost() + if host != nil { if err := session.Send(message.Control{ Event: event.CONTROL_LOCKED, ID: host.ID(), @@ -67,13 +67,14 @@ func (h *MessageHandler) SessionConnected(session types.Session) error { return nil } -func (h *MessageHandler) SessionDestroyed(session types.Session) error { +func (h *MessageHandler) SessionDestroyed(id string) error { // clear host if exists - if session.IsHost() { + host := h.sessions.GetHost() + if host != nil && host.ID() == id { h.sessions.ClearHost() if err := h.sessions.Broadcast(message.Control{ Event: event.CONTROL_RELEASE, - ID: session.ID(), + ID: id, }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) } @@ -83,7 +84,7 @@ func (h *MessageHandler) SessionDestroyed(session types.Session) error { if err := h.sessions.Broadcast( message.MemberDisconnected{ Event: event.MEMBER_DISCONNECTED, - ID: session.ID(), + ID: id, }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.MEMBER_DISCONNECTED) return err diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index fef8a888..248f5f78 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -71,11 +71,11 @@ func (ws *WebSocketHandler) Start() { } }) - ws.sessions.OnBeforeDestroy(func(session types.Session) { - if err := ws.handler.SessionDestroyed(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session destroyed with and error") + ws.sessions.OnDestroy(func(id string) { + if err := ws.handler.SessionDestroyed(id); err != nil { + ws.logger.Warn().Str("id", id).Err(err).Msg("session destroyed with and error") } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session destroyed") + ws.logger.Debug().Str("id", id).Msg("session destroyed") } }) @@ -94,8 +94,8 @@ func (ws *WebSocketHandler) Start() { if ws.sessions.HasHost() { text := ws.remote.ReadClipboard() if text != current { - session, ok := ws.sessions.GetHost() - if ok { + session := ws.sessions.GetHost() + if session != nil { if err := session.Send(message.Clipboard{ Event: event.CONTROL_CLIPBOARD, Text: text, From 5d906e0a8b33bb09d3ca4160304107e3c5fdbf1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 16:09:48 +0100 Subject: [PATCH 059/876] major refactor. --- cmd/serve.go | 5 +- internal/broadcast/manager.go | 83 ------ internal/capture/broadcast.go | 60 ++++ internal/{ => capture}/gst/gst.c | 0 internal/{ => capture}/gst/gst.go | 21 -- internal/{ => capture}/gst/gst.h | 0 internal/capture/manager.go | 175 +++++++++++ .../config/remote.go => config/capture.go} | 15 +- internal/{types => }/config/config.go | 0 internal/{types => }/config/root.go | 0 internal/{types => }/config/server.go | 0 internal/{types => }/config/webrtc.go | 0 internal/{types => }/config/websocket.go | 0 internal/desktop/clipboard.go | 13 + internal/desktop/clipboard/clipboard.c | 21 ++ internal/desktop/clipboard/clipboard.go | 36 +++ internal/desktop/clipboard/clipboard.h | 9 + internal/desktop/manager.go | 53 ++++ internal/desktop/xorg.go | 54 ++++ internal/{ => desktop}/xorg/xorg.c | 18 -- internal/{ => desktop}/xorg/xorg.go | 22 +- internal/desktop/xorg/xorg.h | 41 +++ internal/http/http.go | 25 +- internal/remote/manager.go | 233 --------------- internal/session/manager.go | 159 +++++----- internal/session/session.go | 46 ++- internal/types/broadcast.go | 10 - internal/types/capture.go | 29 ++ internal/types/config/broadcast.go | 23 -- internal/types/{remote.go => desktop.go} | 35 ++- internal/types/keys.go | 14 - internal/types/message/messages.go | 14 +- internal/types/session.go | 29 +- internal/types/webrtc.go | 7 +- internal/types/{webscoket.go => websocket.go} | 2 +- internal/types/xorg.go | 13 - internal/webrtc/handle.go | 32 +- internal/webrtc/logger.go | 48 ++- internal/webrtc/peer.go | 23 +- internal/webrtc/webrtc.go | 45 +-- internal/websocket/broadcast/screen.go | 17 -- internal/websocket/{ => handler}/admin.go | 20 +- internal/websocket/{ => handler}/broadcast.go | 16 +- internal/websocket/{ => handler}/control.go | 18 +- internal/websocket/{ => handler}/handler.go | 47 ++- internal/websocket/{ => handler}/screen.go | 25 +- internal/websocket/{ => handler}/session.go | 28 +- internal/websocket/{ => handler}/signal.go | 8 +- internal/websocket/manager.go | 270 +++++++++++++++++ internal/websocket/socket.go | 55 ---- internal/websocket/websocket.go | 275 ++---------------- internal/xorg/xorg.h | 46 --- neko.go | 84 +++--- 53 files changed, 1189 insertions(+), 1133 deletions(-) delete mode 100644 internal/broadcast/manager.go create mode 100644 internal/capture/broadcast.go rename internal/{ => capture}/gst/gst.c (100%) rename internal/{ => capture}/gst/gst.go (92%) rename internal/{ => capture}/gst/gst.h (100%) create mode 100644 internal/capture/manager.go rename internal/{types/config/remote.go => config/capture.go} (89%) rename internal/{types => }/config/config.go (100%) rename internal/{types => }/config/root.go (100%) rename internal/{types => }/config/server.go (100%) rename internal/{types => }/config/webrtc.go (100%) rename internal/{types => }/config/websocket.go (100%) create mode 100644 internal/desktop/clipboard.go create mode 100644 internal/desktop/clipboard/clipboard.c create mode 100644 internal/desktop/clipboard/clipboard.go create mode 100644 internal/desktop/clipboard/clipboard.h create mode 100644 internal/desktop/manager.go create mode 100644 internal/desktop/xorg.go rename internal/{ => desktop}/xorg/xorg.c (91%) rename internal/{ => desktop}/xorg/xorg.go (89%) create mode 100644 internal/desktop/xorg/xorg.h delete mode 100644 internal/remote/manager.go delete mode 100644 internal/types/broadcast.go create mode 100644 internal/types/capture.go delete mode 100644 internal/types/config/broadcast.go rename internal/types/{remote.go => desktop.go} (53%) delete mode 100644 internal/types/keys.go rename internal/types/{webscoket.go => websocket.go} (86%) delete mode 100644 internal/types/xorg.go delete mode 100644 internal/websocket/broadcast/screen.go rename internal/websocket/{ => handler}/admin.go (88%) rename internal/websocket/{ => handler}/broadcast.go (64%) rename internal/websocket/{ => handler}/control.go (83%) rename internal/websocket/{ => handler}/handler.go (83%) rename internal/websocket/{ => handler}/screen.go (54%) rename internal/websocket/{ => handler}/session.go (75%) rename internal/websocket/{ => handler}/signal.go (65%) create mode 100644 internal/websocket/manager.go delete mode 100644 internal/websocket/socket.go delete mode 100644 internal/xorg/xorg.h diff --git a/cmd/serve.go b/cmd/serve.go index f1729c41..f26f472f 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" "demodesk/neko" - "demodesk/neko/internal/types/config" + "demodesk/neko/internal/config" ) func init() { @@ -17,10 +17,9 @@ func init() { } configs := []config.Config{ + neko.Service.Configs.Capture, neko.Service.Configs.Server, neko.Service.Configs.WebRTC, - neko.Service.Configs.Remote, - neko.Service.Configs.Broadcast, neko.Service.Configs.WebSocket, } diff --git a/internal/broadcast/manager.go b/internal/broadcast/manager.go deleted file mode 100644 index 6b28e3c2..00000000 --- a/internal/broadcast/manager.go +++ /dev/null @@ -1,83 +0,0 @@ -package broadcast - -import ( - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" - - "demodesk/neko/internal/gst" - "demodesk/neko/internal/types/config" -) - -type BroadcastManager struct { - logger zerolog.Logger - pipeline *gst.Pipeline - remote *config.Remote - config *config.Broadcast - enabled bool - url string -} - -func New(remote *config.Remote, config *config.Broadcast) *BroadcastManager { - return &BroadcastManager{ - logger: log.With().Str("module", "remote").Logger(), - remote: remote, - config: config, - enabled: false, - url: "", - } -} - -func (manager *BroadcastManager) Start() { - if !manager.enabled || manager.IsActive() { - return - } - - var err error - manager.pipeline, err = gst.CreateRTMPPipeline( - manager.remote.Device, - manager.remote.Display, - manager.config.Pipeline, - manager.url, - ) - - manager.logger.Info(). - Str("audio_device", manager.remote.Device). - Str("video_display", manager.remote.Display). - Str("rtmp_pipeline_src", manager.pipeline.Src). - Msgf("RTMP pipeline is starting...") - - if err != nil { - manager.logger.Panic().Err(err).Msg("unable to create rtmp pipeline") - return - } - - manager.pipeline.Play() -} - -func (manager *BroadcastManager) Stop() { - if !manager.IsActive() { - return - } - - manager.pipeline.Stop() - manager.pipeline = nil -} - -func (manager *BroadcastManager) IsActive() bool { - return manager.pipeline != nil -} - -func (manager *BroadcastManager) Create(url string) { - manager.url = url - manager.enabled = true - manager.Start() -} - -func (manager *BroadcastManager) Destroy() { - manager.Stop() - manager.enabled = false -} - -func (manager *BroadcastManager) GetUrl() string { - return manager.url -} diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go new file mode 100644 index 00000000..692a2c26 --- /dev/null +++ b/internal/capture/broadcast.go @@ -0,0 +1,60 @@ +package capture + +import ( + "demodesk/neko/internal/capture/gst" +) + +func (manager *CaptureManagerCtx) StartBroadcastPipeline() { + var err error + + if manager.IsBoradcasting() || manager.broadcast_url == "" { + return + } + + manager.logger.Info(). + Str("audio_device", manager.config.Device). + Str("video_display", manager.config.Display). + Str("rtmp_pipeline_src", manager.broadcast.Src). + Msgf("Creating broadcast pipeline...") + + manager.broadcast, err = gst.CreateRTMPPipeline( + manager.config.Device, + manager.config.Display, + manager.config.BroadcastPipeline, + manager.broadcast_url, + ) + + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to create broadcast pipeline") + } + + manager.broadcast.Play() + manager.logger.Info().Msgf("Starting broadcast pipeline...") +} + +func (manager *CaptureManagerCtx) StopBroadcastPipeline() { + if !manager.IsBoradcasting() { + return + } + + manager.broadcast.DestroyPipeline() + manager.broadcast = nil +} + +func (manager *CaptureManagerCtx) StartBroadcast(url string) { + manager.broadcast_url = url + manager.StartBroadcastPipeline() +} + +func (manager *CaptureManagerCtx) StopBroadcast() { + manager.broadcast_url = "" + manager.StopBroadcastPipeline() +} + +func (manager *CaptureManagerCtx) IsBoradcasting() bool { + return manager.broadcast != nil +} + +func (manager *CaptureManagerCtx) BroadcastUrl() string { + return manager.broadcast_url +} diff --git a/internal/gst/gst.c b/internal/capture/gst/gst.c similarity index 100% rename from internal/gst/gst.c rename to internal/capture/gst/gst.c diff --git a/internal/gst/gst.go b/internal/capture/gst/gst.go similarity index 92% rename from internal/gst/gst.go rename to internal/capture/gst/gst.go index a147d472..2a138a2d 100644 --- a/internal/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -4,7 +4,6 @@ package gst #cgo pkg-config: gstreamer-1.0 gstreamer-app-1.0 #include "gst.h" - */ import "C" import ( @@ -17,26 +16,6 @@ import ( "demodesk/neko/internal/types" ) -/* - apt-get install \ - libgstreamer1.0-0 \ - gstreamer1.0-plugins-base \ - gstreamer1.0-plugins-good \ - gstreamer1.0-plugins-bad \ - gstreamer1.0-plugins-ugly\ - gstreamer1.0-libav \ - gstreamer1.0-doc \ - gstreamer1.0-tools \ - gstreamer1.0-x \ - gstreamer1.0-alsa \ - gstreamer1.0-pulseaudio - - gst-inspect-1.0 --version - gst-inspect-1.0 plugin - gst-launch-1.0 ximagesrc show-pointer=true use-damage=false ! video/x-raw,framerate=30/1 ! videoconvert ! queue ! vp8enc error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true cpu-used=5 deadline=1 ! autovideosink - gst-launch-1.0 pulsesrc ! audioconvert ! opusenc ! autoaudiosink -*/ - // Pipeline is a wrapper for a GStreamer Pipeline type Pipeline struct { Pipeline *C.GstElement diff --git a/internal/gst/gst.h b/internal/capture/gst/gst.h similarity index 100% rename from internal/gst/gst.h rename to internal/capture/gst/gst.h diff --git a/internal/capture/manager.go b/internal/capture/manager.go new file mode 100644 index 00000000..889e3ec1 --- /dev/null +++ b/internal/capture/manager.go @@ -0,0 +1,175 @@ +package capture + +import ( + "fmt" + + "github.com/kataras/go-events" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "demodesk/neko/internal/types" + "demodesk/neko/internal/config" + "demodesk/neko/internal/capture/gst" +) + +type CaptureManagerCtx struct { + logger zerolog.Logger + video *gst.Pipeline + audio *gst.Pipeline + broadcast *gst.Pipeline + config *config.Capture + shutdown chan bool + emmiter events.EventEmmiter + streaming bool + broadcast_url string + desktop types.DesktopManager +} + +func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { + return &CaptureManagerCtx{ + logger: log.With().Str("module", "capture").Logger(), + shutdown: make(chan bool), + emmiter: events.New(), + config: config, + streaming: false, + broadcast_url: "", + desktop: desktop, + } +} + +func (manager *CaptureManagerCtx) Start() { + manager.logger.Info(). + Str("screen_resolution", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). + Msgf("Setting screen resolution...") + + if err := manager.desktop.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { + manager.logger.Warn().Err(err).Msg("unable to change screen size") + } + + manager.CreateVideoPipeline() + manager.CreateAudioPipeline() + manager.StartBroadcastPipeline() + + go func() { + defer func() { + manager.logger.Info().Msg("shutdown") + }() + + for { + select { + case <-manager.shutdown: + return + case sample := <-manager.video.Sample: + manager.emmiter.Emit("video", sample) + case sample := <-manager.audio.Sample: + manager.emmiter.Emit("audio", sample) + } + } + }() +} + +func (manager *CaptureManagerCtx) Shutdown() error { + manager.logger.Info().Msgf("capture shutting down") + manager.video.DestroyPipeline() + manager.audio.DestroyPipeline() + manager.StopBroadcastPipeline() + + manager.shutdown <- true + return nil +} + +func (manager *CaptureManagerCtx) VideoCodec() string { + return manager.config.VideoCodec +} + +func (manager *CaptureManagerCtx) AudioCodec() string { + return manager.config.AudioCodec +} + +func (manager *CaptureManagerCtx) OnVideoFrame(listener func(sample types.Sample)) { + manager.emmiter.On("video", func(payload ...interface{}) { + listener(payload[0].(types.Sample)) + }) +} + +func (manager *CaptureManagerCtx) OnAudioFrame(listener func(sample types.Sample)) { + manager.emmiter.On("audio", func(payload ...interface{}) { + listener(payload[0].(types.Sample)) + }) +} + +func (manager *CaptureManagerCtx) StartStream() { + manager.logger.Info().Msgf("Pipelines starting...") + + manager.video.Start() + manager.audio.Start() + manager.streaming = true +} + +func (manager *CaptureManagerCtx) StopStream() { + manager.logger.Info().Msgf("Pipelines shutting down...") + + manager.video.Stop() + manager.audio.Stop() + manager.streaming = false +} + +func (manager *CaptureManagerCtx) Streaming() bool { + return manager.streaming +} + +func (manager *CaptureManagerCtx) CreateVideoPipeline() { + var err error + + manager.logger.Info(). + Str("video_codec", manager.config.VideoCodec). + Str("video_display", manager.config.Display). + Str("video_params", manager.config.VideoParams). + Msgf("Creating video pipeline...") + + manager.video, err = gst.CreateAppPipeline( + manager.config.VideoCodec, + manager.config.Display, + manager.config.VideoParams, + ) + + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to create video pipeline") + } +} + +func (manager *CaptureManagerCtx) CreateAudioPipeline() { + var err error + + manager.logger.Info(). + Str("audio_codec", manager.config.AudioCodec). + Str("audio_display", manager.config.Device). + Str("audio_params", manager.config.AudioParams). + Msgf("Creating audio pipeline...") + + manager.audio, err = gst.CreateAppPipeline( + manager.config.AudioCodec, + manager.config.Device, + manager.config.AudioParams, + ) + + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to create audio pipeline") + } +} + +func (manager *CaptureManagerCtx) ChangeResolution(width int, height int, rate int) error { + manager.video.DestroyPipeline() + manager.StopBroadcastPipeline() + + defer func() { + manager.CreateVideoPipeline() + + manager.video.Start() + manager.logger.Info().Msg("starting video pipeline...") + + manager.StartBroadcastPipeline() + }() + + return manager.desktop.ChangeScreenSize(width, height, rate) +} diff --git a/internal/types/config/remote.go b/internal/config/capture.go similarity index 89% rename from internal/types/config/remote.go rename to internal/config/capture.go index 045a840b..500f7df5 100644 --- a/internal/types/config/remote.go +++ b/internal/config/capture.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/viper" ) -type Remote struct { +type Capture struct { Display string Device string AudioCodec string @@ -19,9 +19,10 @@ type Remote struct { ScreenWidth int ScreenHeight int ScreenRate int + BroadcastPipeline string } -func (Remote) Init(cmd *cobra.Command) error { +func (Capture) Init(cmd *cobra.Command) error { cmd.PersistentFlags().String("display", ":99.0", "XDisplay to capture") if err := viper.BindPFlag("display", cmd.PersistentFlags().Lookup("display")); err != nil { return err @@ -84,10 +85,16 @@ func (Remote) Init(cmd *cobra.Command) error { return err } + // broadcast + cmd.PersistentFlags().String("broadcast_pipeline", "", "audio video codec parameters to use for broadcasting") + if err := viper.BindPFlag("broadcast_pipeline", cmd.PersistentFlags().Lookup("broadcast_pipeline")); err != nil { + return err + } + return nil } -func (s *Remote) Set() { +func (s *Capture) Set() { videoCodec := webrtc.VP8 if viper.GetBool("vp8") { videoCodec = webrtc.VP8 @@ -133,4 +140,6 @@ func (s *Remote) Set() { s.ScreenRate = int(rate) } } + + s.BroadcastPipeline = viper.GetString("broadcast_pipeline") } diff --git a/internal/types/config/config.go b/internal/config/config.go similarity index 100% rename from internal/types/config/config.go rename to internal/config/config.go diff --git a/internal/types/config/root.go b/internal/config/root.go similarity index 100% rename from internal/types/config/root.go rename to internal/config/root.go diff --git a/internal/types/config/server.go b/internal/config/server.go similarity index 100% rename from internal/types/config/server.go rename to internal/config/server.go diff --git a/internal/types/config/webrtc.go b/internal/config/webrtc.go similarity index 100% rename from internal/types/config/webrtc.go rename to internal/config/webrtc.go diff --git a/internal/types/config/websocket.go b/internal/config/websocket.go similarity index 100% rename from internal/types/config/websocket.go rename to internal/config/websocket.go diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go new file mode 100644 index 00000000..9171bdbd --- /dev/null +++ b/internal/desktop/clipboard.go @@ -0,0 +1,13 @@ +package desktop + +import ( + "demodesk/neko/internal/desktop/clipboard" +) + +func (manager *DesktopManagerCtx) ReadClipboard() string { + return clipboard.ReadClipboard() +} + +func (manager *DesktopManagerCtx) WriteClipboard(data string) { + clipboard.WriteClipboard(data) +} diff --git a/internal/desktop/clipboard/clipboard.c b/internal/desktop/clipboard/clipboard.c new file mode 100644 index 00000000..c500b33e --- /dev/null +++ b/internal/desktop/clipboard/clipboard.c @@ -0,0 +1,21 @@ +#include "clipboard.h" + +static clipboard_c *CLIPBOARD = NULL; + +clipboard_c *getClipboard(void) { + if (CLIPBOARD == NULL) { + CLIPBOARD = clipboard_new(NULL); + } + + return CLIPBOARD; +} + +void ClipboardSet(char *src) { + clipboard_c *cb = getClipboard(); + clipboard_set_text_ex(cb, src, strlen(src), 0); +} + +char *ClipboardGet() { + clipboard_c *cb = getClipboard(); + return clipboard_text_ex(cb, NULL, 0); +} diff --git a/internal/desktop/clipboard/clipboard.go b/internal/desktop/clipboard/clipboard.go new file mode 100644 index 00000000..b01c2958 --- /dev/null +++ b/internal/desktop/clipboard/clipboard.go @@ -0,0 +1,36 @@ +package clipboard + +/* +#cgo linux CFLAGS: -I/usr/src -I/usr/local/include/ +#cgo linux LDFLAGS: /usr/local/lib/libclipboard.a -L/usr/src -L/usr/local/lib -lxcb + +#include "clipboard.h" +*/ +import "C" + +import ( + "sync" + "unsafe" +) + +var mu = sync.Mutex{} + +func ReadClipboard() string { + mu.Lock() + defer mu.Unlock() + + clipboardUnsafe := C.ClipboardGet() + defer C.free(unsafe.Pointer(clipboardUnsafe)) + + return C.GoString(clipboardUnsafe) +} + +func WriteClipboard(data string) { + mu.Lock() + defer mu.Unlock() + + clipboardUnsafe := C.CString(data) + defer C.free(unsafe.Pointer(clipboardUnsafe)) + + C.ClipboardSet(clipboardUnsafe) +} diff --git a/internal/desktop/clipboard/clipboard.h b/internal/desktop/clipboard/clipboard.h new file mode 100644 index 00000000..5f5cf36a --- /dev/null +++ b/internal/desktop/clipboard/clipboard.h @@ -0,0 +1,9 @@ +#pragma once + +#include +#include + +clipboard_c *getClipboard(void); + +void ClipboardSet(char *src); +char *ClipboardGet(); diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go new file mode 100644 index 00000000..3982ee86 --- /dev/null +++ b/internal/desktop/manager.go @@ -0,0 +1,53 @@ +package desktop + +import ( + "time" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "demodesk/neko/internal/desktop/xorg" +) + +type DesktopManagerCtx struct { + logger zerolog.Logger + cleanup *time.Ticker + shutdown chan bool + display string +} + +func New(display string) *DesktopManagerCtx { + return &DesktopManagerCtx{ + logger: log.With().Str("module", "desktop").Logger(), + cleanup: time.NewTicker(1 * time.Second), + shutdown: make(chan bool), + display: display, + } +} + +func (manager *DesktopManagerCtx) Start() { + xorg.Display(manager.display) + + go func() { + defer func() { + manager.logger.Info().Msg("shutdown") + }() + + for { + select { + case <-manager.shutdown: + return + case <-manager.cleanup.C: + xorg.CheckKeys(time.Second * 10) + } + } + }() +} + +func (manager *DesktopManagerCtx) Shutdown() error { + manager.logger.Info().Msgf("remote shutting down") + + manager.cleanup.Stop() + manager.shutdown <- true + return nil +} diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go new file mode 100644 index 00000000..59e8643b --- /dev/null +++ b/internal/desktop/xorg.go @@ -0,0 +1,54 @@ +package desktop + +import ( + "demodesk/neko/internal/types" + "demodesk/neko/internal/desktop/xorg" +) + +func (manager *DesktopManagerCtx) ChangeScreenSize(width int, height int, rate int) error { + return xorg.ChangeScreenSize(width, height, rate) +} + +func (manager *DesktopManagerCtx) Move(x, y int) { + xorg.Move(x, y) +} + +func (manager *DesktopManagerCtx) Scroll(x, y int) { + xorg.Scroll(x, y) +} + +func (manager *DesktopManagerCtx) ButtonDown(code int) error { + return xorg.ButtonDown(code) +} + +func (manager *DesktopManagerCtx) KeyDown(code uint64) error { + return xorg.KeyDown(code) +} + +func (manager *DesktopManagerCtx) ButtonUp(code int) error { + return xorg.ButtonUp(code) +} + +func (manager *DesktopManagerCtx) KeyUp(code uint64) error { + return xorg.KeyUp(code) +} + +func (manager *DesktopManagerCtx) ResetKeys() { + xorg.ResetKeys() +} + +func (manager *DesktopManagerCtx) ScreenConfigurations() map[int]types.ScreenConfiguration { + return xorg.ScreenConfigurations +} + +func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize { + return xorg.GetScreenSize() +} + +func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string) { + xorg.SetKeyboardLayout(layout) +} + +func (manager *DesktopManagerCtx) SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) { + xorg.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) +} diff --git a/internal/xorg/xorg.c b/internal/desktop/xorg/xorg.c similarity index 91% rename from internal/xorg/xorg.c rename to internal/desktop/xorg/xorg.c index 6c7b72eb..ace9a1ff 100644 --- a/internal/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -1,6 +1,5 @@ #include "xorg.h" -static clipboard_c *CLIPBOARD = NULL; static Display *DISPLAY = NULL; static char *NAME = ":0.0"; static int REGISTERED = 0; @@ -33,13 +32,6 @@ Display *getXDisplay(void) { return DISPLAY; } -clipboard_c *getClipboard(void) { - if (CLIPBOARD == NULL) { - CLIPBOARD = clipboard_new(NULL); - } - return CLIPBOARD; -} - void XDisplayClose(void) { if (DISPLAY != NULL) { XCloseDisplay(DISPLAY); @@ -118,16 +110,6 @@ void XKey(unsigned long key, int down) { } } -void XClipboardSet(char *src) { - clipboard_c *cb = getClipboard(); - clipboard_set_text_ex(cb, src, strlen(src), 0); -} - -char *XClipboardGet() { - clipboard_c *cb = getClipboard(); - return clipboard_text_ex(cb, NULL, 0); -} - void XGetScreenConfigurations() { Display *display = getXDisplay(); Window root = RootWindow(display, 0); diff --git a/internal/xorg/xorg.go b/internal/desktop/xorg/xorg.go similarity index 89% rename from internal/xorg/xorg.go rename to internal/desktop/xorg/xorg.go index b4bd10dd..4063d352 100644 --- a/internal/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -2,7 +2,7 @@ package xorg /* #cgo linux CFLAGS: -I/usr/src -I/usr/local/include/ -#cgo linux LDFLAGS: /usr/local/lib/libclipboard.a -L/usr/src -L/usr/local/lib -lX11 -lXtst -lXrandr -lxcb +#cgo linux LDFLAGS: -L/usr/src -L/usr/local/lib -lX11 -lXtst -lXrandr -lxcb #include "xorg.h" */ @@ -108,26 +108,6 @@ func KeyUp(code uint64) error { return nil } -func ReadClipboard() string { - mu.Lock() - defer mu.Unlock() - - clipboardUnsafe := C.XClipboardGet() - defer C.free(unsafe.Pointer(clipboardUnsafe)) - - return C.GoString(clipboardUnsafe) -} - -func WriteClipboard(data string) { - mu.Lock() - defer mu.Unlock() - - clipboardUnsafe := C.CString(data) - defer C.free(unsafe.Pointer(clipboardUnsafe)) - - C.XClipboardSet(clipboardUnsafe) -} - func ResetKeys() { for code := range debounce_button { //nolint diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h new file mode 100644 index 00000000..4a7b49a2 --- /dev/null +++ b/internal/desktop/xorg/xorg.h @@ -0,0 +1,41 @@ +#pragma once + +#ifndef XDISPLAY_H +#define XDISPLAY_H + +#include +#include +#include +#include +#include +#include +#include /* For fputs() */ +#include /* For strdup() */ + +extern void goCreateScreenSize(int index, int width, int height, int mwidth, int mheight); +extern void goSetScreenRates(int index, int rate_index, short rate); + +/* Returns the main display, closed either on exit or when closeMainDisplay() +* is invoked. This removes a bit of the overhead of calling XOpenDisplay() & +* XCloseDisplay() everytime the main display needs to be used. +* +* Note that this is almost certainly not thread safe. */ +Display *getXDisplay(void); + +void XMove(int x, int y); +void XScroll(int x, int y); +void XButton(unsigned int button, int down); +void XKey(unsigned long key, int down); + +void XGetScreenConfigurations(); +void XSetScreenConfiguration(int index, short rate); +int XGetScreenSize(); +short XGetScreenRate(); + +void XDisplayClose(void); +void XDisplaySet(char *input); + +void SetKeyboardLayout(char *layout); +void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock); + +#endif diff --git a/internal/http/http.go b/internal/http/http.go index 9136d85e..22f1b83e 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -11,26 +11,19 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/api" - "demodesk/neko/internal/http/endpoint" "demodesk/neko/internal/types" - "demodesk/neko/internal/types/config" + "demodesk/neko/internal/config" + "demodesk/neko/internal/http/endpoint" ) -type Server struct { +type ServerCtx struct { logger zerolog.Logger router *chi.Mux http *http.Server conf *config.Server } -func New( - sessions types.SessionManager, - remote types.RemoteManager, - broadcast types.BroadcastManager, - webSocketHandler types.WebSocketHandler, - conf *config.Server, -) *Server { +func New(webSocketHandler types.WebSocketManager, conf *config.Server) *ServerCtx { logger := log.With().Str("module", "http").Logger() router := chi.NewRouter() @@ -38,10 +31,6 @@ func New( router.Use(middleware.RequestID) // Create a request ID for each request router.Use(Logger) // Log API request calls using custom logger function - // Mount REST API - apiManager := api.New(sessions, remote, broadcast, webSocketHandler, conf) - apiManager.Mount(router) - router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { if webSocketHandler.Upgrade(w, r) != nil { //nolint @@ -70,7 +59,7 @@ func New( Handler: router, } - return &Server{ + return &ServerCtx{ logger: logger, router: router, http: http, @@ -78,7 +67,7 @@ func New( } } -func (s *Server) Start() { +func (s *ServerCtx) Start() { if s.conf.Cert != "" && s.conf.Key != "" { go func() { if err := s.http.ListenAndServeTLS(s.conf.Cert, s.conf.Key); err != http.ErrServerClosed { @@ -96,6 +85,6 @@ func (s *Server) Start() { } } -func (s *Server) Shutdown() error { +func (s *ServerCtx) Shutdown() error { return s.http.Shutdown(context.Background()) } diff --git a/internal/remote/manager.go b/internal/remote/manager.go deleted file mode 100644 index ca01f7e6..00000000 --- a/internal/remote/manager.go +++ /dev/null @@ -1,233 +0,0 @@ -package remote - -import ( - "fmt" - "time" - - "github.com/kataras/go-events" - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" - - "demodesk/neko/internal/gst" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/config" - "demodesk/neko/internal/xorg" -) - -type RemoteManager struct { - logger zerolog.Logger - video *gst.Pipeline - audio *gst.Pipeline - config *config.Remote - broadcast types.BroadcastManager - cleanup *time.Ticker - shutdown chan bool - emmiter events.EventEmmiter - streaming bool -} - -func New(config *config.Remote, broadcast types.BroadcastManager) *RemoteManager { - return &RemoteManager{ - logger: log.With().Str("module", "remote").Logger(), - cleanup: time.NewTicker(1 * time.Second), - shutdown: make(chan bool), - emmiter: events.New(), - config: config, - broadcast: broadcast, - streaming: false, - } -} - -func (manager *RemoteManager) VideoCodec() string { - return manager.config.VideoCodec -} - -func (manager *RemoteManager) AudioCodec() string { - return manager.config.AudioCodec -} - -func (manager *RemoteManager) Start() { - xorg.Display(manager.config.Display) - - manager.logger.Info(). - Str("screen_resolution", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). - Msgf("Setting screen resolution...") - - if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { - manager.logger.Warn().Err(err).Msg("unable to change screen size") - } - - manager.CreateVideoPipeline() - manager.CreateAudioPipeline() - manager.broadcast.Start() - - go func() { - defer func() { - manager.logger.Info().Msg("shutdown") - }() - - for { - select { - case <-manager.shutdown: - return - case sample := <-manager.video.Sample: - manager.emmiter.Emit("video", sample) - case sample := <-manager.audio.Sample: - manager.emmiter.Emit("audio", sample) - case <-manager.cleanup.C: - xorg.CheckKeys(time.Second * 10) - } - } - }() -} - -func (manager *RemoteManager) Shutdown() error { - manager.logger.Info().Msgf("remote shutting down") - manager.video.DestroyPipeline() - manager.audio.DestroyPipeline() - manager.broadcast.Stop() - - manager.cleanup.Stop() - manager.shutdown <- true - return nil -} - -func (manager *RemoteManager) OnVideoFrame(listener func(sample types.Sample)) { - manager.emmiter.On("video", func(payload ...interface{}) { - listener(payload[0].(types.Sample)) - }) -} - -func (manager *RemoteManager) OnAudioFrame(listener func(sample types.Sample)) { - manager.emmiter.On("audio", func(payload ...interface{}) { - listener(payload[0].(types.Sample)) - }) -} - -func (manager *RemoteManager) StartStream() { - manager.logger.Info().Msgf("Pipelines starting...") - - manager.video.Start() - manager.audio.Start() - manager.streaming = true -} - -func (manager *RemoteManager) StopStream() { - manager.logger.Info().Msgf("Pipelines shutting down...") - - manager.video.Stop() - manager.audio.Stop() - manager.streaming = false -} - -func (manager *RemoteManager) Streaming() bool { - return manager.streaming -} - -func (manager *RemoteManager) CreateVideoPipeline() { - var err error - - manager.logger.Info(). - Str("video_codec", manager.config.VideoCodec). - Str("video_display", manager.config.Display). - Str("video_params", manager.config.VideoParams). - Msgf("Creating video pipeline...") - - manager.video, err = gst.CreateAppPipeline( - manager.config.VideoCodec, - manager.config.Display, - manager.config.VideoParams, - ) - - if err != nil { - manager.logger.Panic().Err(err).Msg("unable to create video pipeline") - } -} - -func (manager *RemoteManager) CreateAudioPipeline() { - var err error - - manager.logger.Info(). - Str("audio_codec", manager.config.AudioCodec). - Str("audio_display", manager.config.Device). - Str("audio_params", manager.config.AudioParams). - Msgf("Creating audio pipeline...") - - manager.audio, err = gst.CreateAppPipeline( - manager.config.AudioCodec, - manager.config.Device, - manager.config.AudioParams, - ) - - if err != nil { - manager.logger.Panic().Err(err).Msg("unable to create audio pipeline") - } -} - -func (manager *RemoteManager) ChangeResolution(width int, height int, rate int) error { - manager.video.DestroyPipeline() - manager.broadcast.Stop() - - defer func() { - manager.CreateVideoPipeline() - - manager.video.Start() - manager.broadcast.Start() - - manager.logger.Info().Msg("starting video pipeline...") - }() - - return xorg.ChangeScreenSize(width, height, rate) -} - -func (manager *RemoteManager) Move(x, y int) { - xorg.Move(x, y) -} - -func (manager *RemoteManager) Scroll(x, y int) { - xorg.Scroll(x, y) -} - -func (manager *RemoteManager) ButtonDown(code int) error { - return xorg.ButtonDown(code) -} - -func (manager *RemoteManager) KeyDown(code uint64) error { - return xorg.KeyDown(code) -} - -func (manager *RemoteManager) ButtonUp(code int) error { - return xorg.ButtonUp(code) -} - -func (manager *RemoteManager) KeyUp(code uint64) error { - return xorg.KeyUp(code) -} - -func (manager *RemoteManager) ReadClipboard() string { - return xorg.ReadClipboard() -} - -func (manager *RemoteManager) WriteClipboard(data string) { - xorg.WriteClipboard(data) -} - -func (manager *RemoteManager) ResetKeys() { - xorg.ResetKeys() -} - -func (manager *RemoteManager) ScreenConfigurations() map[int]types.ScreenConfiguration { - return xorg.ScreenConfigurations -} - -func (manager *RemoteManager) GetScreenSize() *types.ScreenSize { - return xorg.GetScreenSize() -} - -func (manager *RemoteManager) SetKeyboardLayout(layout string) { - xorg.SetKeyboardLayout(layout) -} - -func (manager *RemoteManager) SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) { - xorg.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) -} diff --git a/internal/session/manager.go b/internal/session/manager.go index 987783ce..9a882c37 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -9,26 +9,26 @@ import ( "demodesk/neko/internal/utils" ) -func New(remote types.RemoteManager) *SessionManager { - return &SessionManager{ +func New(capture types.CaptureManager) *SessionManagerCtx { + return &SessionManagerCtx{ logger: log.With().Str("module", "session").Logger(), host: nil, - remote: remote, - members: make(map[string]*Session), + capture: capture, + members: make(map[string]*SessionCtx), emmiter: events.New(), } } -type SessionManager struct { +type SessionManagerCtx struct { logger zerolog.Logger host types.Session - remote types.RemoteManager - members map[string]*Session + capture types.CaptureManager + members map[string]*SessionCtx emmiter events.EventEmmiter } -func (manager *SessionManager) New(id string, admin bool, socket types.WebSocket) types.Session { - session := &Session{ +func (manager *SessionManagerCtx) New(id string, admin bool, socket types.WebSocket) types.Session { + session := &SessionCtx{ id: id, admin: admin, manager: manager, @@ -40,80 +40,31 @@ func (manager *SessionManager) New(id string, admin bool, socket types.WebSocket manager.members[id] = session manager.emmiter.Emit("created", session) - if !manager.remote.Streaming() && len(manager.members) > 0 { - manager.remote.StartStream() + if !manager.capture.Streaming() && len(manager.members) > 0 { + manager.capture.StartStream() } return session } -func (manager *SessionManager) HasHost() bool { - return manager.host != nil -} - -func (manager *SessionManager) SetHost(host types.Session) { - manager.host = host - manager.emmiter.Emit("host", host) -} - -func (manager *SessionManager) GetHost() types.Session { - return manager.host -} - -func (manager *SessionManager) ClearHost() { - host := manager.host - manager.host = nil - manager.emmiter.Emit("host_cleared", host) -} - -func (manager *SessionManager) Has(id string) bool { - _, ok := manager.members[id] - return ok -} - -func (manager *SessionManager) Get(id string) (types.Session, bool) { +func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { session, ok := manager.members[id] return session, ok } -func (manager *SessionManager) Admins() []*types.Member { - members := []*types.Member{} - for _, session := range manager.members { - if !session.connected || !session.admin { - continue - } - - member := session.Member() - if member != nil { - members = append(members, member) - } - } - return members +func (manager *SessionManagerCtx) Has(id string) bool { + _, ok := manager.members[id] + return ok } -func (manager *SessionManager) Members() []*types.Member { - members := []*types.Member{} - for _, session := range manager.members { - if !session.connected { - continue - } - - member := session.Member() - if member != nil { - members = append(members, member) - } - } - return members -} - -func (manager *SessionManager) Destroy(id string) error { +func (manager *SessionManagerCtx) Destroy(id string) error { session, ok := manager.members[id] if ok { delete(manager.members, id) err := session.destroy() - if !manager.remote.Streaming() && len(manager.members) <= 0 { - manager.remote.StopStream() + if !manager.capture.Streaming() && len(manager.members) <= 0 { + manager.capture.StopStream() } manager.emmiter.Emit("destroy", id) @@ -123,7 +74,58 @@ func (manager *SessionManager) Destroy(id string) error { return nil } -func (manager *SessionManager) Broadcast(v interface{}, exclude interface{}) error { +// --- +// host +// --- +func (manager *SessionManagerCtx) HasHost() bool { + return manager.host != nil +} + +func (manager *SessionManagerCtx) SetHost(host types.Session) { + manager.host = host + manager.emmiter.Emit("host", host) +} + +func (manager *SessionManagerCtx) GetHost() types.Session { + return manager.host +} + +func (manager *SessionManagerCtx) ClearHost() { + host := manager.host + manager.host = nil + manager.emmiter.Emit("host_cleared", host) +} + +// --- +// members list +// --- +func (manager *SessionManagerCtx) Admins() []types.Session { + var sessions []types.Session + for _, session := range manager.members { + if !session.connected || !session.admin { + continue + } + + sessions = append(sessions, session) + } + + return sessions +} + +func (manager *SessionManagerCtx) Members() []types.Session { + var sessions []types.Session + for _, session := range manager.members { + if !session.connected { + continue + } + + sessions = append(sessions, session) + } + + return sessions +} + +func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) error { for id, session := range manager.members { if !session.connected { continue @@ -142,32 +144,35 @@ func (manager *SessionManager) Broadcast(v interface{}, exclude interface{}) err return nil } -func (manager *SessionManager) OnHost(listener func(session types.Session)) { +// --- +// events +// --- +func (manager *SessionManagerCtx) OnHost(listener func(session types.Session)) { manager.emmiter.On("host", func(payload ...interface{}) { - listener(payload[0].(*Session)) + listener(payload[0].(*SessionCtx)) }) } -func (manager *SessionManager) OnHostCleared(listener func(session types.Session)) { +func (manager *SessionManagerCtx) OnHostCleared(listener func(session types.Session)) { manager.emmiter.On("host_cleared", func(payload ...interface{}) { - listener(payload[0].(*Session)) + listener(payload[0].(*SessionCtx)) }) } -func (manager *SessionManager) OnDestroy(listener func(id string)) { +func (manager *SessionManagerCtx) OnDestroy(listener func(id string)) { manager.emmiter.On("destroy", func(payload ...interface{}) { listener(payload[0].(string)) }) } -func (manager *SessionManager) OnCreated(listener func(session types.Session)) { +func (manager *SessionManagerCtx) OnCreated(listener func(session types.Session)) { manager.emmiter.On("created", func(payload ...interface{}) { - listener(payload[0].(*Session)) + listener(payload[0].(*SessionCtx)) }) } -func (manager *SessionManager) OnConnected(listener func(session types.Session)) { +func (manager *SessionManagerCtx) OnConnected(listener func(session types.Session)) { manager.emmiter.On("connected", func(payload ...interface{}) { - listener(payload[0].(*Session)) + listener(payload[0].(*SessionCtx)) }) } diff --git a/internal/session/session.go b/internal/session/session.go index 41865f02..574d79bb 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -8,43 +8,43 @@ import ( "demodesk/neko/internal/types/message" ) -type Session struct { +type SessionCtx struct { logger zerolog.Logger id string name string admin bool muted bool connected bool - manager *SessionManager + manager *SessionManagerCtx socket types.WebSocket peer types.Peer } -func (session *Session) ID() string { +func (session *SessionCtx) ID() string { return session.id } -func (session *Session) Name() string { +func (session *SessionCtx) Name() string { return session.name } -func (session *Session) Admin() bool { +func (session *SessionCtx) Admin() bool { return session.admin } -func (session *Session) Muted() bool { +func (session *SessionCtx) Muted() bool { return session.muted } -func (session *Session) IsHost() bool { +func (session *SessionCtx) IsHost() bool { return session.manager.host != nil && session.manager.host.ID() == session.ID() } -func (session *Session) Connected() bool { +func (session *SessionCtx) Connected() bool { return session.connected } -func (session *Session) Address() string { +func (session *SessionCtx) Address() string { if session.socket == nil { return "" } @@ -52,41 +52,33 @@ func (session *Session) Address() string { return session.socket.Address() } -func (session *Session) Member() *types.Member { - return &types.Member{ - ID: session.id, - Name: session.name, - Admin: session.admin, - Muted: session.muted, - } -} - -func (session *Session) SetMuted(muted bool) { +func (session *SessionCtx) SetMuted(muted bool) { session.muted = muted } -func (session *Session) SetName(name string) { +func (session *SessionCtx) SetName(name string) { session.name = name } -func (session *Session) SetSocket(socket types.WebSocket) { +func (session *SessionCtx) SetSocket(socket types.WebSocket) { session.socket = socket } -func (session *Session) SetPeer(peer types.Peer) { +func (session *SessionCtx) SetPeer(peer types.Peer) { session.peer = peer } -func (session *Session) SetConnected() { +func (session *SessionCtx) SetConnected() { session.connected = true session.manager.emmiter.Emit("connected", session) } -func (session *Session) Disconnect(reason string) error { +func (session *SessionCtx) Disconnect(reason string) error { if session.socket == nil { return nil } + // TODO: Refcator if err := session.socket.Send(&message.Disconnect{ Event: event.SYSTEM_DISCONNECT, Message: reason, @@ -97,7 +89,7 @@ func (session *Session) Disconnect(reason string) error { return session.manager.Destroy(session.id) } -func (session *Session) Send(v interface{}) error { +func (session *SessionCtx) Send(v interface{}) error { if session.socket == nil { return nil } @@ -105,7 +97,7 @@ func (session *Session) Send(v interface{}) error { return session.socket.Send(v) } -func (session *Session) SignalAnswer(sdp string) error { +func (session *SessionCtx) SignalAnswer(sdp string) error { if session.peer == nil { return nil } @@ -113,7 +105,7 @@ func (session *Session) SignalAnswer(sdp string) error { return session.peer.SignalAnswer(sdp) } -func (session *Session) destroy() error { +func (session *SessionCtx) destroy() error { if session.socket != nil { if err := session.socket.Destroy(); err != nil { return err diff --git a/internal/types/broadcast.go b/internal/types/broadcast.go deleted file mode 100644 index fee3fd52..00000000 --- a/internal/types/broadcast.go +++ /dev/null @@ -1,10 +0,0 @@ -package types - -type BroadcastManager interface { - Start() - Stop() - IsActive() bool - Create(url string) - Destroy() - GetUrl() string -} diff --git a/internal/types/capture.go b/internal/types/capture.go new file mode 100644 index 00000000..7ad3dfee --- /dev/null +++ b/internal/types/capture.go @@ -0,0 +1,29 @@ +package types + +type Sample struct { + Data []byte + Samples uint32 +} + +type CaptureManager interface { + Start() + Shutdown() error + + VideoCodec() string + AudioCodec() string + + OnVideoFrame(listener func(sample Sample)) + OnAudioFrame(listener func(sample Sample)) + + StartStream() + StopStream() + Streaming() bool + + ChangeResolution(width int, height int, rate int) error + + // broacast + StartBroadcast(url string) + StopBroadcast() + IsBoradcasting() bool + BroadcastUrl() string +} diff --git a/internal/types/config/broadcast.go b/internal/types/config/broadcast.go deleted file mode 100644 index 22ef94ac..00000000 --- a/internal/types/config/broadcast.go +++ /dev/null @@ -1,23 +0,0 @@ -package config - -import ( - "github.com/spf13/cobra" - "github.com/spf13/viper" -) - -type Broadcast struct { - Pipeline string -} - -func (Broadcast) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().String("broadcast_pipeline", "", "audio codec parameters to use for broadcasting") - if err := viper.BindPFlag("broadcast_pipeline", cmd.PersistentFlags().Lookup("broadcast_pipeline")); err != nil { - return err - } - - return nil -} - -func (s *Broadcast) Set() { - s.Pipeline = viper.GetString("broadcast_pipeline") -} diff --git a/internal/types/remote.go b/internal/types/desktop.go similarity index 53% rename from internal/types/remote.go rename to internal/types/desktop.go index b437d108..34f81647 100644 --- a/internal/types/remote.go +++ b/internal/types/desktop.go @@ -1,27 +1,36 @@ package types -type RemoteManager interface { - VideoCodec() string - AudioCodec() string +type ScreenSize struct { + Width int `json:"width"` + Height int `json:"height"` + Rate int16 `json:"rate"` +} + +type ScreenConfiguration struct { + Width int `json:"width"` + Height int `json:"height"` + Rates map[int]int16 `json:"rates"` +} + +type DesktopManager interface { Start() Shutdown() error - OnVideoFrame(listener func(sample Sample)) - OnAudioFrame(listener func(sample Sample)) - StartStream() - StopStream() - Streaming() bool - ChangeResolution(width int, height int, rate int) error - GetScreenSize() *ScreenSize - ScreenConfigurations() map[int]ScreenConfiguration + + // xorg + ChangeScreenSize(width int, height int, rate int) error Move(x, y int) Scroll(x, y int) ButtonDown(code int) error KeyDown(code uint64) error ButtonUp(code int) error KeyUp(code uint64) error - ReadClipboard() string - WriteClipboard(data string) ResetKeys() + ScreenConfigurations() map[int]ScreenConfiguration + GetScreenSize() *ScreenSize SetKeyboardLayout(layout string) SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) + + // clipboard + ReadClipboard() string + WriteClipboard(data string) } diff --git a/internal/types/keys.go b/internal/types/keys.go deleted file mode 100644 index f8a2fd16..00000000 --- a/internal/types/keys.go +++ /dev/null @@ -1,14 +0,0 @@ -package types - -type Button struct { - Name string - Code int - Keysym int -} - -type Key struct { - Name string - Value string - Code int - Keysym int -} diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index ee7a20ba..eef0c8f5 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -28,14 +28,22 @@ type SignalAnswer struct { } type MembersList struct { - Event string `json:"event"` - Memebers []*types.Member `json:"members"` + Event string `json:"event"` + Memebers []*MembersListEntry `json:"members"` +} + +type MembersListEntry struct { + ID string `json:"id"` + Name string `json:"displayname"` + Admin bool `json:"admin"` + Muted bool `json:"muted"` } type Member struct { Event string `json:"event"` - *types.Member + Member *MembersListEntry } + type MemberDisconnected struct { Event string `json:"event"` ID string `json:"id"` diff --git a/internal/types/session.go b/internal/types/session.go index ce973950..136ebb30 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -1,12 +1,5 @@ package types -type Member struct { - ID string `json:"id"` - Name string `json:"displayname"` - Admin bool `json:"admin"` - Muted bool `json:"muted"` -} - type Session interface { ID() string Name() string @@ -14,30 +7,32 @@ type Session interface { Muted() bool IsHost() bool Connected() bool - Member() *Member + Address() string SetMuted(muted bool) SetName(name string) - SetConnected() SetSocket(socket WebSocket) SetPeer(peer Peer) - Address() string - Disconnect(message string) error + SetConnected() + Disconnect(reason string) error Send(v interface{}) error SignalAnswer(sdp string) error } type SessionManager interface { New(id string, admin bool, socket WebSocket) Session + Get(id string) (Session, bool) + Has(id string) bool + Destroy(id string) error + HasHost() bool - SetHost(Session) + SetHost(host Session) GetHost() Session ClearHost() - Has(id string) bool - Get(id string) (Session, bool) - Members() []*Member - Admins() []*Member - Destroy(id string) error + + Admins() []Session + Members() []Session Broadcast(v interface{}, exclude interface{}) error + OnHost(listener func(session Session)) OnHostCleared(listener func(session Session)) OnDestroy(listener func(id string)) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index d22253bd..aa8c8c85 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -1,14 +1,9 @@ package types -type Sample struct { - Data []byte - Samples uint32 -} - type WebRTCManager interface { Start() Shutdown() error - CreatePeer(id string, session Session) (string, bool, []string, error) + CreatePeer(session Session) (string, bool, []string, error) } type Peer interface { diff --git a/internal/types/webscoket.go b/internal/types/websocket.go similarity index 86% rename from internal/types/webscoket.go rename to internal/types/websocket.go index fd924b47..442e607b 100644 --- a/internal/types/webscoket.go +++ b/internal/types/websocket.go @@ -8,7 +8,7 @@ type WebSocket interface { Destroy() error } -type WebSocketHandler interface { +type WebSocketManager interface { Start() Shutdown() error Upgrade(w http.ResponseWriter, r *http.Request) error diff --git a/internal/types/xorg.go b/internal/types/xorg.go deleted file mode 100644 index dec51611..00000000 --- a/internal/types/xorg.go +++ /dev/null @@ -1,13 +0,0 @@ -package types - -type ScreenSize struct { - Width int `json:"width"` - Height int `json:"height"` - Rate int16 `json:"rate"` -} - -type ScreenConfiguration struct { - Width int `json:"width"` - Height int `json:"height"` - Rates map[int]int16 `json:"rates"` -} diff --git a/internal/webrtc/handle.go b/internal/webrtc/handle.go index a4a07a39..8ccb05b1 100644 --- a/internal/webrtc/handle.go +++ b/internal/webrtc/handle.go @@ -6,15 +6,15 @@ import ( "strconv" "github.com/pion/webrtc/v2" - - "demodesk/neko/internal/types" ) -const OP_MOVE = 0x01 -const OP_SCROLL = 0x02 -const OP_KEY_DOWN = 0x03 -const OP_KEY_UP = 0x04 -const OP_KEY_CLK = 0x05 +const ( + OP_MOVE = 0x01 + OP_SCROLL = 0x02 + OP_KEY_DOWN = 0x03 + OP_KEY_UP = 0x04 + OP_KEY_CLK = 0x05 +) type PayloadHeader struct { Event uint8 @@ -38,11 +38,7 @@ type PayloadKey struct { Key uint64 } -func (manager *WebRTCManager) handle(session types.Session, msg webrtc.DataChannelMessage) error { - if !session.IsHost() { - return nil - } - +func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { buffer := bytes.NewBuffer(msg.Data) header := &PayloadHeader{} hbytes := make([]byte, 3) @@ -64,7 +60,7 @@ func (manager *WebRTCManager) handle(session types.Session, msg webrtc.DataChann return err } - manager.remote.Move(int(payload.X), int(payload.Y)) + manager.desktop.Move(int(payload.X), int(payload.Y)) case OP_SCROLL: payload := &PayloadScroll{} if err := binary.Read(buffer, binary.LittleEndian, payload); err != nil { @@ -77,7 +73,7 @@ func (manager *WebRTCManager) handle(session types.Session, msg webrtc.DataChann Str("y", strconv.Itoa(int(payload.Y))). Msg("scroll") - manager.remote.Scroll(int(payload.X), int(payload.Y)) + manager.desktop.Scroll(int(payload.X), int(payload.Y)) case OP_KEY_DOWN: payload := &PayloadKey{} if err := binary.Read(buffer, binary.LittleEndian, payload); err != nil { @@ -85,7 +81,7 @@ func (manager *WebRTCManager) handle(session types.Session, msg webrtc.DataChann } if payload.Key < 8 { - err := manager.remote.ButtonDown(int(payload.Key)) + err := manager.desktop.ButtonDown(int(payload.Key)) if err != nil { manager.logger.Warn().Err(err).Msg("button down failed") return nil @@ -93,7 +89,7 @@ func (manager *WebRTCManager) handle(session types.Session, msg webrtc.DataChann manager.logger.Debug().Msgf("button down %d", payload.Key) } else { - err := manager.remote.KeyDown(uint64(payload.Key)) + err := manager.desktop.KeyDown(uint64(payload.Key)) if err != nil { manager.logger.Warn().Err(err).Msg("key down failed") return nil @@ -109,7 +105,7 @@ func (manager *WebRTCManager) handle(session types.Session, msg webrtc.DataChann } if payload.Key < 8 { - err := manager.remote.ButtonUp(int(payload.Key)) + err := manager.desktop.ButtonUp(int(payload.Key)) if err != nil { manager.logger.Warn().Err(err).Msg("button up failed") return nil @@ -117,7 +113,7 @@ func (manager *WebRTCManager) handle(session types.Session, msg webrtc.DataChann manager.logger.Debug().Msgf("button up %d", payload.Key) } else { - err := manager.remote.KeyUp(uint64(payload.Key)) + err := manager.desktop.KeyUp(uint64(payload.Key)) if err != nil { manager.logger.Warn().Err(err).Msg("key up failed") return nil diff --git a/internal/webrtc/logger.go b/internal/webrtc/logger.go index 52764867..fd46ca88 100644 --- a/internal/webrtc/logger.go +++ b/internal/webrtc/logger.go @@ -8,17 +8,17 @@ import ( "github.com/rs/zerolog" ) -type nulllog struct{} +type nulllog struct {} -func (l nulllog) Trace(msg string) {} +func (l nulllog) Trace(msg string) {} func (l nulllog) Tracef(format string, args ...interface{}) {} -func (l nulllog) Debug(msg string) {} +func (l nulllog) Debug(msg string) {} func (l nulllog) Debugf(format string, args ...interface{}) {} -func (l nulllog) Info(msg string) {} -func (l nulllog) Infof(format string, args ...interface{}) {} -func (l nulllog) Warn(msg string) {} -func (l nulllog) Warnf(format string, args ...interface{}) {} -func (l nulllog) Error(msg string) {} +func (l nulllog) Info(msg string) {} +func (l nulllog) Infof(format string, args ...interface{}) {} +func (l nulllog) Warn(msg string) {} +func (l nulllog) Warnf(format string, args ...interface{}) {} +func (l nulllog) Error(msg string) {} func (l nulllog) Errorf(format string, args ...interface{}) {} type logger struct { @@ -26,10 +26,18 @@ type logger struct { subsystem string } -func (l logger) Trace(msg string) { l.logger.Trace().Msg(msg) } -func (l logger) Tracef(format string, args ...interface{}) { l.logger.Trace().Msgf(format, args...) } -func (l logger) Debug(msg string) { l.logger.Debug().Msg(msg) } -func (l logger) Debugf(format string, args ...interface{}) { l.logger.Debug().Msgf(format, args...) } +func (l logger) Trace(msg string) { + l.logger.Trace().Msg(msg) +} +func (l logger) Tracef(format string, args ...interface{}) { + l.logger.Trace().Msgf(format, args...) +} +func (l logger) Debug(msg string) { + l.logger.Debug().Msg(msg) +} +func (l logger) Debugf(format string, args ...interface{}) { + l.logger.Debug().Msgf(format, args...) +} func (l logger) Info(msg string) { if strings.Contains(msg, "packetio.Buffer is full") { //l.logger.Panic().Msg(msg) @@ -45,10 +53,18 @@ func (l logger) Infof(format string, args ...interface{}) { } l.logger.Info().Msg(msg) } -func (l logger) Warn(msg string) { l.logger.Warn().Msg(msg) } -func (l logger) Warnf(format string, args ...interface{}) { l.logger.Warn().Msgf(format, args...) } -func (l logger) Error(msg string) { l.logger.Error().Msg(msg) } -func (l logger) Errorf(format string, args ...interface{}) { l.logger.Error().Msgf(format, args...) } +func (l logger) Warn(msg string) { + l.logger.Warn().Msg(msg) +} +func (l logger) Warnf(format string, args ...interface{}) { + l.logger.Warn().Msgf(format, args...) +} +func (l logger) Error(msg string) { + l.logger.Error().Msg(msg) +} +func (l logger) Errorf(format string, args ...interface{}) { + l.logger.Error().Msgf(format, args...) +} type loggerFactory struct { logger zerolog.Logger diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 59f66dbd..176b838e 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -4,26 +4,25 @@ import ( "github.com/pion/webrtc/v2" ) -type Peer struct { - id string +type PeerCtx struct { api *webrtc.API engine *webrtc.MediaEngine - manager *WebRTCManager settings *webrtc.SettingEngine connection *webrtc.PeerConnection configuration *webrtc.Configuration } -func (peer *Peer) SignalAnswer(sdp string) error { - return peer.connection.SetRemoteDescription(webrtc.SessionDescription{SDP: sdp, Type: webrtc.SDPTypeAnswer}) +func (peer *PeerCtx) SignalAnswer(sdp string) error { + return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ + SDP: sdp, + Type: webrtc.SDPTypeAnswer, + }) } -func (peer *Peer) Destroy() error { - if peer.connection != nil && peer.connection.ConnectionState() == webrtc.PeerConnectionStateConnected { - if err := peer.connection.Close(); err != nil { - return err - } +func (peer *PeerCtx) Destroy() error { + if peer.connection == nil || peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { + return nil } - - return nil + + return peer.connection.Close() } diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index d2839780..b5c11a4a 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -12,46 +12,49 @@ import ( "github.com/rs/zerolog/log" "demodesk/neko/internal/types" - "demodesk/neko/internal/types/config" + "demodesk/neko/internal/config" ) -func New(remote types.RemoteManager, config *config.WebRTC) *WebRTCManager { - return &WebRTCManager{ +func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { + return &WebRTCManagerCtx{ logger: log.With().Str("module", "webrtc").Logger(), - remote: remote, + desktop: desktop, + capture: capture, config: config, } } -type WebRTCManager struct { +type WebRTCManagerCtx struct { logger zerolog.Logger videoTrack *webrtc.Track audioTrack *webrtc.Track videoCodec *webrtc.RTPCodec audioCodec *webrtc.RTPCodec - remote types.RemoteManager + desktop types.DesktopManager + capture types.CaptureManager config *config.WebRTC } -func (manager *WebRTCManager) Start() { +func (manager *WebRTCManagerCtx) Start() { var err error - manager.audioTrack, manager.audioCodec, err = manager.createTrack(manager.remote.AudioCodec()) + + manager.audioTrack, manager.audioCodec, err = manager.createTrack(manager.capture.AudioCodec()) if err != nil { manager.logger.Panic().Err(err).Msg("unable to create audio track") } - manager.remote.OnAudioFrame(func(sample types.Sample) { + manager.capture.OnAudioFrame(func(sample types.Sample) { if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") } }) - manager.videoTrack, manager.videoCodec, err = manager.createTrack(manager.remote.VideoCodec()) + manager.videoTrack, manager.videoCodec, err = manager.createTrack(manager.capture.VideoCodec()) if err != nil { manager.logger.Panic().Err(err).Msg("unable to create video track") } - manager.remote.OnVideoFrame(func(sample types.Sample) { + manager.capture.OnVideoFrame(func(sample types.Sample) { if err := manager.videoTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Msg("video pipeline failed to write") } @@ -65,12 +68,12 @@ func (manager *WebRTCManager) Start() { Msgf("webrtc starting") } -func (manager *WebRTCManager) Shutdown() error { +func (manager *WebRTCManagerCtx) Shutdown() error { manager.logger.Info().Msgf("webrtc shutting down") return nil } -func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (string, bool, []string, error) { +func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool, []string, error) { configuration := &webrtc.Configuration{ ICEServers: []webrtc.ICEServer{ { @@ -134,7 +137,11 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri connection.OnDataChannel(func(d *webrtc.DataChannel) { d.OnMessage(func(msg webrtc.DataChannelMessage) { - if err = manager.handle(session, msg); err != nil { + if !session.IsHost() { + return + } + + if err = manager.handle(msg); err != nil { manager.logger.Warn().Err(err).Msg("data handle failed") } }) @@ -148,21 +155,19 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri switch state { case webrtc.PeerConnectionStateDisconnected: case webrtc.PeerConnectionStateFailed: - manager.logger.Info().Str("id", id).Msg("peer disconnected") + manager.logger.Info().Str("id", session.ID()).Msg("peer disconnected") if err:= session.Disconnect("peer connection state failed"); err != nil { manager.logger.Warn().Err(err).Msg("error while disconnecting session") } case webrtc.PeerConnectionStateConnected: - manager.logger.Info().Str("id", id).Msg("peer connected") + manager.logger.Info().Str("id", session.ID()).Msg("peer connected") session.SetConnected() } }) - session.SetPeer(&Peer{ - id: id, + session.SetPeer(&PeerCtx{ api: api, engine: &engine, - manager: manager, settings: &settings, connection: connection, configuration: configuration, @@ -171,7 +176,7 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri return description.SDP, manager.config.ICELite, manager.config.ICEServers, nil } -func (m *WebRTCManager) createTrack(codecName string) (*webrtc.Track, *webrtc.RTPCodec, error) { +func (m *WebRTCManagerCtx) createTrack(codecName string) (*webrtc.Track, *webrtc.RTPCodec, error) { var codec *webrtc.RTPCodec switch codecName { case webrtc.VP8: diff --git a/internal/websocket/broadcast/screen.go b/internal/websocket/broadcast/screen.go deleted file mode 100644 index ead004e3..00000000 --- a/internal/websocket/broadcast/screen.go +++ /dev/null @@ -1,17 +0,0 @@ -package broadcast - -import ( - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" -) - -func ScreenConfiguration(session types.SessionManager, id string, width int, height int, rate int) error { - return session.Broadcast(message.ScreenResolution{ - Event: event.SCREEN_RESOLUTION, - ID: id, - Width: width, - Height: height, - Rate: rate, - }, nil) -} diff --git a/internal/websocket/admin.go b/internal/websocket/handler/admin.go similarity index 88% rename from internal/websocket/admin.go rename to internal/websocket/handler/admin.go index eeea2db8..e6581cf3 100644 --- a/internal/websocket/admin.go +++ b/internal/websocket/handler/admin.go @@ -1,4 +1,4 @@ -package websocket +package handler import ( "strings" @@ -8,7 +8,7 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandler) adminLock(session types.Session) error { +func (h *MessageHandlerCtx) adminLock(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -33,7 +33,7 @@ func (h *MessageHandler) adminLock(session types.Session) error { return nil } -func (h *MessageHandler) adminUnlock(session types.Session) error { +func (h *MessageHandlerCtx) adminUnlock(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -58,7 +58,7 @@ func (h *MessageHandler) adminUnlock(session types.Session) error { return nil } -func (h *MessageHandler) adminControl(session types.Session) error { +func (h *MessageHandlerCtx) adminControl(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -91,7 +91,7 @@ func (h *MessageHandler) adminControl(session types.Session) error { return nil } -func (h *MessageHandler) adminRelease(session types.Session) error { +func (h *MessageHandlerCtx) adminRelease(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -124,7 +124,7 @@ func (h *MessageHandler) adminRelease(session types.Session) error { return nil } -func (h *MessageHandler) adminGive(session types.Session, payload *message.Admin) error { +func (h *MessageHandlerCtx) adminGive(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -153,7 +153,7 @@ func (h *MessageHandler) adminGive(session types.Session, payload *message.Admin return nil } -func (h *MessageHandler) adminMute(session types.Session, payload *message.Admin) error { +func (h *MessageHandlerCtx) adminMute(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -185,7 +185,7 @@ func (h *MessageHandler) adminMute(session types.Session, payload *message.Admin return nil } -func (h *MessageHandler) adminUnmute(session types.Session, payload *message.Admin) error { +func (h *MessageHandlerCtx) adminUnmute(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -212,7 +212,7 @@ func (h *MessageHandler) adminUnmute(session types.Session, payload *message.Adm return nil } -func (h *MessageHandler) adminKick(session types.Session, payload *message.Admin) error { +func (h *MessageHandlerCtx) adminKick(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -246,7 +246,7 @@ func (h *MessageHandler) adminKick(session types.Session, payload *message.Admin return nil } -func (h *MessageHandler) adminBan(session types.Session, payload *message.Admin) error { +func (h *MessageHandlerCtx) adminBan(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil diff --git a/internal/websocket/broadcast.go b/internal/websocket/handler/broadcast.go similarity index 64% rename from internal/websocket/broadcast.go rename to internal/websocket/handler/broadcast.go index d62aa798..953c8654 100644 --- a/internal/websocket/broadcast.go +++ b/internal/websocket/handler/broadcast.go @@ -1,4 +1,4 @@ -package websocket +package handler import ( "demodesk/neko/internal/types" @@ -6,13 +6,13 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandler) boradcastCreate(session types.Session, payload *message.BroadcastCreate) error { +func (h *MessageHandlerCtx) boradcastCreate(session types.Session, payload *message.BroadcastCreate) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil } - h.broadcast.Create(payload.URL) + h.capture.StartBroadcast(payload.URL) if err := h.boradcastStatus(session); err != nil { return err @@ -21,13 +21,13 @@ func (h *MessageHandler) boradcastCreate(session types.Session, payload *message return nil } -func (h *MessageHandler) boradcastDestroy(session types.Session) error { +func (h *MessageHandlerCtx) boradcastDestroy(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil } - h.broadcast.Destroy() + h.capture.StopBroadcast() if err := h.boradcastStatus(session); err != nil { return err @@ -36,7 +36,7 @@ func (h *MessageHandler) boradcastDestroy(session types.Session) error { return nil } -func (h *MessageHandler) boradcastStatus(session types.Session) error { +func (h *MessageHandlerCtx) boradcastStatus(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -45,8 +45,8 @@ func (h *MessageHandler) boradcastStatus(session types.Session) error { if err := session.Send( message.BroadcastStatus{ Event: event.BORADCAST_STATUS, - IsActive: h.broadcast.IsActive(), - URL: h.broadcast.GetUrl(), + IsActive: h.capture.IsBoradcasting(), + URL: h.capture.BroadcastUrl(), }); err != nil { h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.BORADCAST_STATUS) return err diff --git a/internal/websocket/control.go b/internal/websocket/handler/control.go similarity index 83% rename from internal/websocket/control.go rename to internal/websocket/handler/control.go index f05afc2b..1ad0a9c9 100644 --- a/internal/websocket/control.go +++ b/internal/websocket/handler/control.go @@ -1,4 +1,4 @@ -package websocket +package handler import ( "demodesk/neko/internal/types" @@ -6,7 +6,7 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandler) controlRelease(session types.Session) error { +func (h *MessageHandlerCtx) controlRelease(session types.Session) error { // check if session is host if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") @@ -30,7 +30,7 @@ func (h *MessageHandler) controlRelease(session types.Session) error { return nil } -func (h *MessageHandler) controlRequest(session types.Session) error { +func (h *MessageHandlerCtx) controlRequest(session types.Session) error { host := h.sessions.GetHost() if host == nil { @@ -69,7 +69,7 @@ func (h *MessageHandler) controlRequest(session types.Session) error { return nil } -func (h *MessageHandler) controlGive(session types.Session, payload *message.Control) error { +func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message.Control) error { // check if session is host if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") @@ -99,18 +99,18 @@ func (h *MessageHandler) controlGive(session types.Session, payload *message.Con return nil } -func (h *MessageHandler) controlClipboard(session types.Session, payload *message.Clipboard) error { +func (h *MessageHandlerCtx) controlClipboard(session types.Session, payload *message.Clipboard) error { // check if session is host if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } - h.remote.WriteClipboard(payload.Text) + h.desktop.WriteClipboard(payload.Text) return nil } -func (h *MessageHandler) controlKeyboard(session types.Session, payload *message.Keyboard) error { +func (h *MessageHandlerCtx) controlKeyboard(session types.Session, payload *message.Keyboard) error { // check if session is host if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") @@ -119,7 +119,7 @@ func (h *MessageHandler) controlKeyboard(session types.Session, payload *message // change layout if payload.Layout != nil { - h.remote.SetKeyboardLayout(*payload.Layout) + h.desktop.SetKeyboardLayout(*payload.Layout) } // set num lock @@ -152,6 +152,6 @@ func (h *MessageHandler) controlKeyboard(session types.Session, payload *message Int("ScrollLock", ScrollLock). Msg("setting keyboard modifiers") - h.remote.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) + h.desktop.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) return nil } diff --git a/internal/websocket/handler.go b/internal/websocket/handler/handler.go similarity index 83% rename from internal/websocket/handler.go rename to internal/websocket/handler/handler.go index 54379989..f2ae9e9a 100644 --- a/internal/websocket/handler.go +++ b/internal/websocket/handler/handler.go @@ -1,10 +1,11 @@ -package websocket +package handler import ( "encoding/json" "github.com/pkg/errors" "github.com/rs/zerolog" + "github.com/rs/zerolog/log" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" @@ -12,40 +13,60 @@ import ( "demodesk/neko/internal/utils" ) -type MessageHandler struct { +func New( + sessions types.SessionManager, + desktop types.DesktopManager, + capture types.CaptureManager, + webrtc types.WebRTCManager, +) *MessageHandlerCtx { + logger := log.With().Str("module", "handler").Logger() + + return &MessageHandlerCtx{ + logger: logger, + sessions: sessions, + desktop: desktop, + capture: capture, + webrtc: webrtc, + banned: make(map[string]bool), + locked: false, + } +} + +type MessageHandlerCtx struct { logger zerolog.Logger sessions types.SessionManager webrtc types.WebRTCManager - remote types.RemoteManager - broadcast types.BroadcastManager + desktop types.DesktopManager + capture types.CaptureManager banned map[string]bool locked bool } -func (h *MessageHandler) Connected(id string, socket *WebSocket) (bool, string, error) { +func (h *MessageHandlerCtx) Connected(id string, socket types.WebSocket) (bool, string) { address := socket.Address() - if address == "" { - h.logger.Debug().Msg("no remote address") - } else { + if address != "" { ok, banned := h.banned[address] if ok && banned { h.logger.Debug().Str("address", address).Msg("banned") - return false, "banned", nil + return false, "banned" } + } else { + h.logger.Debug().Msg("no remote address") } if h.locked { session, ok := h.sessions.Get(id) if !ok || !session.Admin() { h.logger.Debug().Msg("server locked") - return false, "locked", nil + return false, "locked" } } - return true, "", nil + return true, "" } -func (h *MessageHandler) Disconnected(id string) error { +func (h *MessageHandlerCtx) Disconnected(id string) error { + // TODO: Refactor. if h.locked && len(h.sessions.Admins()) == 0 { h.locked = false } @@ -53,7 +74,7 @@ func (h *MessageHandler) Disconnected(id string) error { return h.sessions.Destroy(id) } -func (h *MessageHandler) Message(id string, raw []byte) error { +func (h *MessageHandlerCtx) Message(id string, raw []byte) error { header := message.Message{} if err := json.Unmarshal(raw, &header); err != nil { return err diff --git a/internal/websocket/screen.go b/internal/websocket/handler/screen.go similarity index 54% rename from internal/websocket/screen.go rename to internal/websocket/handler/screen.go index b9a1328d..16417394 100644 --- a/internal/websocket/screen.go +++ b/internal/websocket/handler/screen.go @@ -1,33 +1,38 @@ -package websocket +package handler import ( "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" - "demodesk/neko/internal/websocket/broadcast" ) -func (h *MessageHandler) screenSet(session types.Session, payload *message.ScreenResolution) error { +func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenResolution) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil } - if err := h.remote.ChangeResolution(payload.Width, payload.Height, payload.Rate); err != nil { + if err := h.capture.ChangeResolution(payload.Width, payload.Height, payload.Rate); err != nil { h.logger.Warn().Err(err).Msgf("unable to change screen size") return err } - if err := broadcast.ScreenConfiguration(h.sessions, session.ID(), payload.Width, payload.Height, payload.Rate); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.SCREEN_RESOLUTION) + if err := h.sessions.Broadcast(message.ScreenResolution{ + Event: event.SCREEN_RESOLUTION, + ID: session.ID(), + Width: payload.Width, + Height: payload.Height, + Rate: payload.Rate, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_RESOLUTION) return err } return nil } -func (h *MessageHandler) screenResolution(session types.Session) error { - if size := h.remote.GetScreenSize(); size != nil { +func (h *MessageHandlerCtx) screenResolution(session types.Session) error { + if size := h.desktop.GetScreenSize(); size != nil { if err := session.Send(message.ScreenResolution{ Event: event.SCREEN_RESOLUTION, Width: size.Width, @@ -42,7 +47,7 @@ func (h *MessageHandler) screenResolution(session types.Session) error { return nil } -func (h *MessageHandler) screenConfigurations(session types.Session) error { +func (h *MessageHandlerCtx) screenConfigurations(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -50,7 +55,7 @@ func (h *MessageHandler) screenConfigurations(session types.Session) error { if err := session.Send(message.ScreenConfigurations{ Event: event.SCREEN_CONFIGURATIONS, - Configurations: h.remote.ScreenConfigurations(), + Configurations: h.desktop.ScreenConfigurations(), }); err != nil { h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_CONFIGURATIONS) return err diff --git a/internal/websocket/session.go b/internal/websocket/handler/session.go similarity index 75% rename from internal/websocket/session.go rename to internal/websocket/handler/session.go index 0a7ecbad..58d2d7f2 100644 --- a/internal/websocket/session.go +++ b/internal/websocket/handler/session.go @@ -1,4 +1,4 @@ -package websocket +package handler import ( "demodesk/neko/internal/types" @@ -6,7 +6,7 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandler) SessionCreated(session types.Session) error { +func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { // send sdp and id over to client if err := h.signalProvide(session); err != nil { return err @@ -27,11 +27,22 @@ func (h *MessageHandler) SessionCreated(session types.Session) error { return nil } -func (h *MessageHandler) SessionConnected(session types.Session) error { +func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { + // TODO: Refactor. + members := []*message.MembersListEntry{} + for _, session := range h.sessions.Members() { + members = append(members, &message.MembersListEntry{ + ID: session.ID(), + Name: session.Name(), + Admin: session.Admin(), + Muted: session.Muted(), + }) + } + // send list of members to session if err := session.Send(message.MembersList{ Event: event.MEMBER_LIST, - Memebers: h.sessions.Members(), + Memebers: members, }); err != nil { h.logger.Warn().Str("id", session.ID()).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST) return err @@ -58,7 +69,12 @@ func (h *MessageHandler) SessionConnected(session types.Session) error { if err := h.sessions.Broadcast( message.Member{ Event: event.MEMBER_CONNECTED, - Member: session.Member(), + Member: &message.MembersListEntry{ + ID: session.ID(), + Name: session.Name(), + Admin: session.Admin(), + Muted: session.Muted(), + }, }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) return err @@ -67,7 +83,7 @@ func (h *MessageHandler) SessionConnected(session types.Session) error { return nil } -func (h *MessageHandler) SessionDestroyed(id string) error { +func (h *MessageHandlerCtx) SessionDestroyed(id string) error { // clear host if exists host := h.sessions.GetHost() if host != nil && host.ID() == id { diff --git a/internal/websocket/signal.go b/internal/websocket/handler/signal.go similarity index 65% rename from internal/websocket/signal.go rename to internal/websocket/handler/signal.go index 9c001beb..b9b76d42 100644 --- a/internal/websocket/signal.go +++ b/internal/websocket/handler/signal.go @@ -1,4 +1,4 @@ -package websocket +package handler import ( "demodesk/neko/internal/types" @@ -6,8 +6,8 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandler) signalProvide(session types.Session) error { - sdp, lite, ice, err := h.webrtc.CreatePeer(session.ID(), session) +func (h *MessageHandlerCtx) signalProvide(session types.Session) error { + sdp, lite, ice, err := h.webrtc.CreatePeer(session) if err != nil { return err } @@ -25,7 +25,7 @@ func (h *MessageHandler) signalProvide(session types.Session) error { return nil } -func (h *MessageHandler) signalAnswer(session types.Session, payload *message.SignalAnswer) error { +func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { session.SetName(payload.DisplayName) if err := session.SignalAnswer(payload.SDP); err != nil { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go new file mode 100644 index 00000000..7b33ea2c --- /dev/null +++ b/internal/websocket/manager.go @@ -0,0 +1,270 @@ +package websocket + +import ( + "fmt" + "net/http" + "time" + + "github.com/gorilla/websocket" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "demodesk/neko/internal/websocket/handler" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" + + "demodesk/neko/internal/types" + "demodesk/neko/internal/config" + "demodesk/neko/internal/utils" +) + +func New( + sessions types.SessionManager, + desktop types.DesktopManager, + capture types.CaptureManager, + webrtc types.WebRTCManager, + conf *config.WebSocket, +) *WebSocketManagerCtx { + logger := log.With().Str("module", "websocket").Logger() + + return &WebSocketManagerCtx{ + logger: logger, + conf: conf, + sessions: sessions, + desktop: desktop, + upgrader: websocket.Upgrader{ + CheckOrigin: func(r *http.Request) bool { + return true + }, + }, + handler: handler.New(sessions, desktop, capture, webrtc), + } +} + +// Send pings to peer with this period. Must be less than pongWait. +const pingPeriod = 60 * time.Second + +type WebSocketManagerCtx struct { + logger zerolog.Logger + upgrader websocket.Upgrader + sessions types.SessionManager + desktop types.DesktopManager + conf *config.WebSocket + handler *handler.MessageHandlerCtx + shutdown chan bool +} + +func (ws *WebSocketManagerCtx) Start() { + ws.sessions.OnCreated(func(session types.Session) { + if err := ws.handler.SessionCreated(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with and error") + } else { + ws.logger.Debug().Str("id", session.ID()).Msg("session created") + } + }) + + ws.sessions.OnConnected(func(session types.Session) { + if err := ws.handler.SessionConnected(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with and error") + } else { + ws.logger.Debug().Str("id", session.ID()).Msg("session connected") + } + }) + + ws.sessions.OnDestroy(func(id string) { + if err := ws.handler.SessionDestroyed(id); err != nil { + ws.logger.Warn().Str("id", id).Err(err).Msg("session destroyed with and error") + } else { + ws.logger.Debug().Str("id", id).Msg("session destroyed") + } + }) + + go func() { + defer func() { + ws.logger.Info().Msg("shutdown") + }() + + current := ws.desktop.ReadClipboard() + + for { + select { + case <-ws.shutdown: + return + default: + session := ws.sessions.GetHost() + if session != nil { + break + } + + text := ws.desktop.ReadClipboard() + if text == current { + break + } + + // TODO: Refactor + if err := session.Send(message.Clipboard{ + Event: event.CONTROL_CLIPBOARD, + Text: text, + }); err != nil { + ws.logger.Warn().Err(err).Msg("could not sync clipboard") + } + + current = text + } + + time.Sleep(100 * time.Millisecond) + } + }() +} + +func (ws *WebSocketManagerCtx) Shutdown() error { + ws.shutdown <- true + return nil +} + +func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) error { + ws.logger.Debug().Msg("attempting to upgrade connection") + + connection, err := ws.upgrader.Upgrade(w, r, nil) + if err != nil { + ws.logger.Error().Err(err).Msg("failed to upgrade connection") + return err + } + + id, ip, admin, err := ws.authenticate(r) + if err != nil { + ws.logger.Warn().Err(err).Msg("authentication failed") + + // TODO: Refactor + if err = connection.WriteJSON(message.Disconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: "invalid_password", + }); err != nil { + ws.logger.Error().Err(err).Msg("failed to send disconnect") + } + + return connection.Close() + } + + socket := &WebSocketCtx{ + id: id, + ws: ws, + address: ip, + connection: connection, + } + + ok, reason := ws.handler.Connected(id, socket) + if !ok { + // TODO: Refactor + if err = connection.WriteJSON(message.Disconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: reason, + }); err != nil { + ws.logger.Error().Err(err).Msg("failed to send disconnect") + } + + return connection.Close() + } + + ws.sessions.New(id, admin, socket) + + ws.logger. + Debug(). + Str("session", id). + Str("address", connection.RemoteAddr().String()). + Msg("new connection created") + + defer func() { + ws.logger. + Debug(). + Str("session", id). + Str("address", connection.RemoteAddr().String()). + Msg("session ended") + }() + + ws.handle(connection, id) + return nil +} + +// TODO: Refactor +func (ws *WebSocketManagerCtx) authenticate(r *http.Request) (string, string, bool, error) { + ip := r.RemoteAddr + + if ws.conf.Proxy { + ip = utils.ReadUserIP(r) + } + + id, err := utils.NewUID(32) + if err != nil { + return "", ip, false, err + } + + passwords, ok := r.URL.Query()["password"] + if !ok || len(passwords[0]) < 1 { + return "", ip, false, fmt.Errorf("no password provided") + } + + if passwords[0] == ws.conf.AdminPassword { + return id, ip, true, nil + } + + if passwords[0] == ws.conf.Password { + return id, ip, false, nil + } + + return "", ip, false, fmt.Errorf("invalid password: %s", passwords[0]) +} + +func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, id string) { + bytes := make(chan []byte) + cancel := make(chan struct{}) + ticker := time.NewTicker(pingPeriod) + + go func() { + defer func() { + ticker.Stop() + ws.logger.Debug().Str("address", connection.RemoteAddr().String()).Msg("handle socket ending") + if err := ws.handler.Disconnected(id); err != nil { + ws.logger.Warn().Err(err).Msg("socket disconnected with error") + } + }() + + for { + _, raw, err := connection.ReadMessage() + if err == nil { + bytes <- raw + continue + } + + if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { + ws.logger.Warn().Err(err).Msg("read message error") + } else { + ws.logger.Debug().Err(err).Msg("read message error") + } + + close(cancel) + } + }() + + for { + select { + case raw := <-bytes: + ws.logger.Debug(). + Str("session", id). + Str("address", connection.RemoteAddr().String()). + Str("raw", string(raw)). + Msg("received message from client") + + if err := ws.handler.Message(id, raw); err != nil { + ws.logger.Error().Err(err).Msg("message handler has failed") + } + case <-cancel: + return + case <-ticker.C: + if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { + ws.logger.Error().Err(err).Msg("ping message has failed") + return + } + } + } +} diff --git a/internal/websocket/socket.go b/internal/websocket/socket.go deleted file mode 100644 index c9875bfd..00000000 --- a/internal/websocket/socket.go +++ /dev/null @@ -1,55 +0,0 @@ -package websocket - -import ( - "encoding/json" - "strings" - "sync" - - "github.com/gorilla/websocket" -) - -type WebSocket struct { - id string - address string - ws *WebSocketHandler - connection *websocket.Conn - mu sync.Mutex -} - -func (socket *WebSocket) Address() string { - //remote := socket.connection.RemoteAddr() - address := strings.SplitN(socket.address, ":", -1) - if len(address[0]) < 1 { - return socket.address - } - return address[0] -} - -func (socket *WebSocket) Send(v interface{}) error { - socket.mu.Lock() - defer socket.mu.Unlock() - if socket.connection == nil { - return nil - } - - raw, err := json.Marshal(v) - if err != nil { - return err - } - - socket.ws.logger.Debug(). - Str("session", socket.id). - Str("address", socket.connection.RemoteAddr().String()). - Str("raw", string(raw)). - Msg("sending message to client") - - return socket.connection.WriteMessage(websocket.TextMessage, raw) -} - -func (socket *WebSocket) Destroy() error { - if socket.connection == nil { - return nil - } - - return socket.connection.Close() -} diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index 248f5f78..6dd01327 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -1,270 +1,57 @@ package websocket import ( - "fmt" - "net/http" - "time" + "encoding/json" + "strings" + "sync" "github.com/gorilla/websocket" - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" - - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/config" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" ) -func New(sessions types.SessionManager, remote types.RemoteManager, broadcast types.BroadcastManager, webrtc types.WebRTCManager, conf *config.WebSocket) *WebSocketHandler { - logger := log.With().Str("module", "websocket").Logger() - - return &WebSocketHandler{ - logger: logger, - conf: conf, - sessions: sessions, - remote: remote, - upgrader: websocket.Upgrader{ - CheckOrigin: func(r *http.Request) bool { - return true - }, - }, - handler: &MessageHandler{ - logger: logger.With().Str("subsystem", "handler").Logger(), - remote: remote, - broadcast: broadcast, - sessions: sessions, - webrtc: webrtc, - banned: make(map[string]bool), - locked: false, - }, - } +type WebSocketCtx struct { + id string + address string + ws *WebSocketManagerCtx + connection *websocket.Conn + mu sync.Mutex } -// Send pings to peer with this period. Must be less than pongWait. -const pingPeriod = 60 * time.Second - -type WebSocketHandler struct { - logger zerolog.Logger - upgrader websocket.Upgrader - sessions types.SessionManager - remote types.RemoteManager - conf *config.WebSocket - handler *MessageHandler - shutdown chan bool -} - -func (ws *WebSocketHandler) Start() { - ws.sessions.OnCreated(func(session types.Session) { - if err := ws.handler.SessionCreated(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with and error") - } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session created") - } - }) - - ws.sessions.OnConnected(func(session types.Session) { - if err := ws.handler.SessionConnected(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with and error") - } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session connected") - } - }) - - ws.sessions.OnDestroy(func(id string) { - if err := ws.handler.SessionDestroyed(id); err != nil { - ws.logger.Warn().Str("id", id).Err(err).Msg("session destroyed with and error") - } else { - ws.logger.Debug().Str("id", id).Msg("session destroyed") - } - }) - - go func() { - defer func() { - ws.logger.Info().Msg("shutdown") - }() - - current := ws.remote.ReadClipboard() - - for { - select { - case <-ws.shutdown: - return - default: - if ws.sessions.HasHost() { - text := ws.remote.ReadClipboard() - if text != current { - session := ws.sessions.GetHost() - if session != nil { - if err := session.Send(message.Clipboard{ - Event: event.CONTROL_CLIPBOARD, - Text: text, - }); err != nil { - ws.logger.Warn().Err(err).Msg("could not sync clipboard") - } - } - current = text - } - } - time.Sleep(100 * time.Millisecond) - } - } - }() -} - -func (ws *WebSocketHandler) Shutdown() error { - ws.shutdown <- true - return nil -} - -func (ws *WebSocketHandler) Upgrade(w http.ResponseWriter, r *http.Request) error { - ws.logger.Debug().Msg("attempting to upgrade connection") - - connection, err := ws.upgrader.Upgrade(w, r, nil) - if err != nil { - ws.logger.Error().Err(err).Msg("failed to upgrade connection") - return err +func (socket *WebSocketCtx) Address() string { + //remote := socket.connection.RemoteAddr() + address := strings.SplitN(socket.address, ":", -1) + if len(address[0]) < 1 { + return socket.address } - id, ip, admin, err := ws.authenticate(r) - if err != nil { - ws.logger.Warn().Err(err).Msg("authentication failed") + return address[0] +} - if err = connection.WriteJSON(message.Disconnect{ - Event: event.SYSTEM_DISCONNECT, - Message: "invalid_password", - }); err != nil { - ws.logger.Error().Err(err).Msg("failed to send disconnect") - } +func (socket *WebSocketCtx) Send(v interface{}) error { + socket.mu.Lock() + defer socket.mu.Unlock() - if err = connection.Close(); err != nil { - return err - } + if socket.connection == nil { return nil } - socket := &WebSocket{ - id: id, - ws: ws, - address: ip, - connection: connection, - } - - ok, reason, err := ws.handler.Connected(id, socket) + raw, err := json.Marshal(v) if err != nil { - ws.logger.Error().Err(err).Msg("connection failed") return err } - if !ok { - if err = connection.WriteJSON(message.Disconnect{ - Event: event.SYSTEM_DISCONNECT, - Message: reason, - }); err != nil { - ws.logger.Error().Err(err).Msg("failed to send disconnect") - } + socket.ws.logger.Debug(). + Str("session", socket.id). + Str("address", socket.connection.RemoteAddr().String()). + Str("raw", string(raw)). + Msg("sending message to client") - if err = connection.Close(); err != nil { - return err - } + return socket.connection.WriteMessage(websocket.TextMessage, raw) +} +func (socket *WebSocketCtx) Destroy() error { + if socket.connection == nil { return nil } - ws.sessions.New(id, admin, socket) - - ws.logger. - Debug(). - Str("session", id). - Str("address", connection.RemoteAddr().String()). - Msg("new connection created") - - defer func() { - ws.logger. - Debug(). - Str("session", id). - Str("address", connection.RemoteAddr().String()). - Msg("session ended") - }() - - ws.handle(connection, id) - return nil -} - -func (ws *WebSocketHandler) authenticate(r *http.Request) (string, string, bool, error) { - ip := r.RemoteAddr - - if ws.conf.Proxy { - ip = utils.ReadUserIP(r) - } - - id, err := utils.NewUID(32) - if err != nil { - return "", ip, false, err - } - - passwords, ok := r.URL.Query()["password"] - if !ok || len(passwords[0]) < 1 { - return "", ip, false, fmt.Errorf("no password provided") - } - - if passwords[0] == ws.conf.AdminPassword { - return id, ip, true, nil - } - - if passwords[0] == ws.conf.Password { - return id, ip, false, nil - } - - return "", ip, false, fmt.Errorf("invalid password: %s", passwords[0]) -} - -func (ws *WebSocketHandler) handle(connection *websocket.Conn, id string) { - bytes := make(chan []byte) - cancel := make(chan struct{}) - ticker := time.NewTicker(pingPeriod) - - go func() { - defer func() { - ticker.Stop() - ws.logger.Debug().Str("address", connection.RemoteAddr().String()).Msg("handle socket ending") - if err := ws.handler.Disconnected(id); err != nil { - ws.logger.Warn().Err(err).Msg("socket disconnected with error") - } - }() - - for { - _, raw, err := connection.ReadMessage() - if err != nil { - if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { - ws.logger.Warn().Err(err).Msg("read message error") - } else { - ws.logger.Debug().Err(err).Msg("read message error") - } - close(cancel) - break - } - bytes <- raw - } - }() - - for { - select { - case raw := <-bytes: - ws.logger.Debug(). - Str("session", id). - Str("address", connection.RemoteAddr().String()). - Str("raw", string(raw)). - Msg("received message from client") - if err := ws.handler.Message(id, raw); err != nil { - ws.logger.Error().Err(err).Msg("message handler has failed") - } - case <-cancel: - return - case <-ticker.C: - if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { - return - } - } - } + return socket.connection.Close() } diff --git a/internal/xorg/xorg.h b/internal/xorg/xorg.h deleted file mode 100644 index 88eca160..00000000 --- a/internal/xorg/xorg.h +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -#ifndef XDISPLAY_H - #define XDISPLAY_H - - #include - #include - #include - #include - #include - #include - #include - #include /* For fputs() */ - #include /* For strdup() */ - - extern void goCreateScreenSize(int index, int width, int height, int mwidth, int mheight); - extern void goSetScreenRates(int index, int rate_index, short rate); - - /* Returns the main display, closed either on exit or when closeMainDisplay() - * is invoked. This removes a bit of the overhead of calling XOpenDisplay() & - * XCloseDisplay() everytime the main display needs to be used. - * - * Note that this is almost certainly not thread safe. */ - Display *getXDisplay(void); - clipboard_c *getClipboard(void); - - void XMove(int x, int y); - void XScroll(int x, int y); - void XButton(unsigned int button, int down); - void XKey(unsigned long key, int down); - - void XClipboardSet(char *src); - char *XClipboardGet(); - - void XGetScreenConfigurations(); - void XSetScreenConfiguration(int index, short rate); - int XGetScreenSize(); - short XGetScreenRate(); - - void XDisplayClose(void); - void XDisplaySet(char *input); - - void SetKeyboardLayout(char *layout); - void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock); -#endif - diff --git a/neko.go b/neko.go index 96853d25..b845cc69 100644 --- a/neko.go +++ b/neko.go @@ -6,13 +6,13 @@ import ( "os/signal" "runtime" - "demodesk/neko/internal/broadcast" - "demodesk/neko/internal/http" - "demodesk/neko/internal/remote" - "demodesk/neko/internal/session" - "demodesk/neko/internal/types/config" + "demodesk/neko/internal/config" + "demodesk/neko/internal/desktop" + "demodesk/neko/internal/capture" "demodesk/neko/internal/webrtc" + "demodesk/neko/internal/session" "demodesk/neko/internal/websocket" + "demodesk/neko/internal/http" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -61,10 +61,9 @@ func init() { }, Configs: &Configs{ Root: &config.Root{}, - Server: &config.Server{}, - Remote: &config.Remote{}, - Broadcast: &config.Broadcast{}, + Capture: &config.Capture{}, WebRTC: &config.WebRTC{}, + Server: &config.Server{}, WebSocket: &config.WebSocket{}, }, } @@ -101,10 +100,9 @@ func (i *Version) Details() string { type Configs struct { Root *config.Root - Remote *config.Remote - Broadcast *config.Broadcast - Server *config.Server + Capture *config.Capture WebRTC *config.WebRTC + Server *config.Server WebSocket *config.WebSocket } @@ -112,13 +110,13 @@ type Neko struct { Version *Version Configs *Configs - logger zerolog.Logger - server *http.Server - sessionManager *session.SessionManager - remoteManager *remote.RemoteManager - broadcastManager *broadcast.BroadcastManager - webRTCManager *webrtc.WebRTCManager - webSocketHandler *websocket.WebSocketHandler + logger zerolog.Logger + desktopManager *desktop.DesktopManagerCtx + captureManager *capture.CaptureManagerCtx + webRTCManager *webrtc.WebRTCManagerCtx + sessionManager *session.SessionManagerCtx + webSocketManager *websocket.WebSocketManagerCtx + server *http.ServerCtx } func (neko *Neko) Preflight() { @@ -126,51 +124,55 @@ func (neko *Neko) Preflight() { } func (neko *Neko) Start() { - neko.broadcastManager = broadcast.New( - neko.Configs.Remote, - neko.Configs.Broadcast, + neko.desktopManager = desktop.New( + neko.Configs.Capture.Display, ) + neko.desktopManager.Start() - neko.remoteManager = remote.New( - neko.Configs.Remote, - neko.broadcastManager, + neko.captureManager = capture.New( + neko.desktopManager, + neko.Configs.Capture, ) - neko.remoteManager.Start() + neko.captureManager.Start() neko.webRTCManager = webrtc.New( - neko.remoteManager, + neko.desktopManager, + neko.captureManager, neko.Configs.WebRTC, ) neko.webRTCManager.Start() neko.sessionManager = session.New( - neko.remoteManager, + neko.captureManager, ) - neko.webSocketHandler = websocket.New( + neko.webSocketManager = websocket.New( neko.sessionManager, - neko.remoteManager, - neko.broadcastManager, + neko.desktopManager, + neko.captureManager, neko.webRTCManager, neko.Configs.WebSocket, ) - neko.webSocketHandler.Start() + neko.webSocketManager.Start() neko.server = http.New( - neko.sessionManager, - neko.remoteManager, - neko.broadcastManager, - neko.webSocketHandler, + neko.webSocketManager, neko.Configs.Server, ) neko.server.Start() } func (neko *Neko) Shutdown() { - if err := neko.remoteManager.Shutdown(); err != nil { - neko.logger.Err(err).Msg("remote manager shutdown with an error") + if err := neko.desktopManager.Shutdown(); err != nil { + neko.logger.Err(err).Msg("desktop manager shutdown with an error") } else { - neko.logger.Debug().Msg("remote manager shutdown") + neko.logger.Debug().Msg("desktop manager shutdown") + } + + if err := neko.captureManager.Shutdown(); err != nil { + neko.logger.Err(err).Msg("capture manager shutdown with an error") + } else { + neko.logger.Debug().Msg("capture manager shutdown") } if err := neko.webRTCManager.Shutdown(); err != nil { @@ -179,10 +181,10 @@ func (neko *Neko) Shutdown() { neko.logger.Debug().Msg("webrtc manager shutdown") } - if err := neko.webSocketHandler.Shutdown(); err != nil { - neko.logger.Err(err).Msg("websocket handler shutdown with an error") + if err := neko.webSocketManager.Shutdown(); err != nil { + neko.logger.Err(err).Msg("websocket manager shutdown with an error") } else { - neko.logger.Debug().Msg("websocket handler shutdown") + neko.logger.Debug().Msg("websocket manager shutdown") } if err := neko.server.Shutdown(); err != nil { From 9559edf4d4717738a622b42e1eb50b5e05ecca81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 16:37:00 +0100 Subject: [PATCH 060/876] bug fixes. --- internal/types/message/messages.go | 5 ++++- internal/websocket/handler/session.go | 10 ++++------ internal/websocket/manager.go | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index eef0c8f5..91c3b927 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -41,7 +41,10 @@ type MembersListEntry struct { type Member struct { Event string `json:"event"` - Member *MembersListEntry + ID string `json:"id"` + Name string `json:"displayname"` + Admin bool `json:"admin"` + Muted bool `json:"muted"` } type MemberDisconnected struct { diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 58d2d7f2..530b5f1c 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -69,12 +69,10 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { if err := h.sessions.Broadcast( message.Member{ Event: event.MEMBER_CONNECTED, - Member: &message.MembersListEntry{ - ID: session.ID(), - Name: session.Name(), - Admin: session.Admin(), - Muted: session.Muted(), - }, + ID: session.ID(), + Name: session.Name(), + Admin: session.Admin(), + Muted: session.Muted(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) return err diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 7b33ea2c..80f8d8ee 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -231,18 +231,18 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, id string) { for { _, raw, err := connection.ReadMessage() - if err == nil { - bytes <- raw - continue + if err != nil { + if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { + ws.logger.Warn().Err(err).Msg("read message error") + } else { + ws.logger.Debug().Err(err).Msg("read message error") + } + + close(cancel) + break } - if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { - ws.logger.Warn().Err(err).Msg("read message error") - } else { - ws.logger.Debug().Err(err).Msg("read message error") - } - - close(cancel) + bytes <- raw } }() From 507fce7862f88a27d7d7f9d830f56426f1da04aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 16:54:06 +0100 Subject: [PATCH 061/876] port new API back to refactor. --- internal/api/member/handler.go | 7 ++----- internal/api/room/clipboard.go | 4 ++-- internal/api/room/handler.go | 19 ++++++++----------- internal/api/room/screen.go | 12 ++++-------- internal/api/router.go | 31 ++++++++++++++----------------- internal/http/http.go | 6 ++++-- internal/types/api.go | 9 +++++++++ neko.go | 10 ++++++++++ 8 files changed, 53 insertions(+), 45 deletions(-) create mode 100644 internal/types/api.go diff --git a/internal/api/member/handler.go b/internal/api/member/handler.go index 1330bbe8..82383fed 100644 --- a/internal/api/member/handler.go +++ b/internal/api/member/handler.go @@ -8,19 +8,16 @@ import ( ) type MemberHandler struct { - sessions types.SessionManager - websocket types.WebSocketHandler + sessions types.SessionManager } func New( sessions types.SessionManager, - websocket types.WebSocketHandler, ) *MemberHandler { // Init return &MemberHandler{ - sessions: sessions, - websocket: websocket, + sessions: sessions, } } diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 0cc4beb6..cef06f33 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -26,7 +26,7 @@ func (a *ClipboardData) Render(w http.ResponseWriter, r *http.Request) error { func (h *RoomHandler) ClipboardRead(w http.ResponseWriter, r *http.Request) { // TODO: error check? - text := h.remote.ReadClipboard() + text := h.desktop.ReadClipboard() render.JSON(w, r, ClipboardData{ Text: text, @@ -41,7 +41,7 @@ func (h *RoomHandler) ClipboardWrite(w http.ResponseWriter, r *http.Request) { } // TODO: error check? - h.remote.WriteClipboard(data.Text) + h.desktop.WriteClipboard(data.Text) w.WriteHeader(http.StatusNoContent) } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 2a3caa83..7be10bcc 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -8,25 +8,22 @@ import ( ) type RoomHandler struct { - sessions types.SessionManager - remote types.RemoteManager - broadcast types.BroadcastManager - websocket types.WebSocketHandler + sessions types.SessionManager + desktop types.DesktopManager + capture types.CaptureManager } func New( sessions types.SessionManager, - remote types.RemoteManager, - broadcast types.BroadcastManager, - websocket types.WebSocketHandler, + desktop types.DesktopManager, + capture types.CaptureManager, ) *RoomHandler { // Init return &RoomHandler{ - sessions: sessions, - remote: remote, - broadcast: broadcast, - websocket: websocket, + sessions: sessions, + desktop: desktop, + capture: capture, } } diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index aa29be0c..6f762d5e 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -6,7 +6,6 @@ import ( "github.com/go-chi/render" "demodesk/neko/internal/api/utils" - "demodesk/neko/internal/websocket/broadcast" ) type ScreenConfiguration struct { @@ -28,7 +27,7 @@ func (a *ScreenConfiguration) Render(w http.ResponseWriter, r *http.Request) err } func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request) { - size := h.remote.GetScreenSize() + size := h.desktop.GetScreenSize() if size == nil { _ = render.Render(w, r, utils.ErrMessage(500, "Unable to get screen configuration.")) @@ -49,15 +48,12 @@ func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.R return } - if err := h.remote.ChangeResolution(data.Width, data.Height, data.Rate); err != nil { + if err := h.capture.ChangeResolution(data.Width, data.Height, data.Rate); err != nil { _ = render.Render(w, r, utils.ErrUnprocessableEntity(err)) return } - if err := broadcast.ScreenConfiguration(h.sessions, "-todo-session-id-", data.Width, data.Height, data.Rate); err != nil { - _ = render.Render(w, r, utils.ErrInternalServer(err)) - return - } + // TODO: Broadcast change to all sessions. render.JSON(w, r, data) } @@ -65,7 +61,7 @@ func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.R func (h *RoomHandler) ScreenConfigurationsList(w http.ResponseWriter, r *http.Request) { list := []render.Renderer{} - ScreenConfigurations := h.remote.ScreenConfigurations() + ScreenConfigurations := h.desktop.ScreenConfigurations() for _, size := range ScreenConfigurations { for _, fps := range size.Rates { list = append(list, &ScreenConfiguration{ diff --git a/internal/api/router.go b/internal/api/router.go index 551c1ba1..247144b9 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -8,15 +8,14 @@ import ( "demodesk/neko/internal/api/member" "demodesk/neko/internal/api/room" "demodesk/neko/internal/types" - "demodesk/neko/internal/types/config" + "demodesk/neko/internal/config" "demodesk/neko/internal/api/utils" ) -type API struct { - sessions types.SessionManager - remote types.RemoteManager - broadcast types.BroadcastManager - websocket types.WebSocketHandler +type ApiManagerCtx struct { + sessions types.SessionManager + desktop types.DesktopManager + capture types.CaptureManager } var AdminToken []byte @@ -24,27 +23,25 @@ var UserToken []byte func New( sessions types.SessionManager, - remote types.RemoteManager, - broadcast types.BroadcastManager, - websocket types.WebSocketHandler, + desktop types.DesktopManager, + capture types.CaptureManager, conf *config.Server, -) *API { +) *ApiManagerCtx { AdminToken = []byte(conf.AdminToken) UserToken = []byte(conf.UserToken) - return &API{ + return &ApiManagerCtx{ sessions: sessions, - remote: remote, - broadcast: broadcast, - websocket: websocket, + desktop: desktop, + capture: capture, } } -func (a *API) Mount(r *chi.Mux) { - memberHandler := member.New(a.sessions, a.websocket) +func (a *ApiManagerCtx) Mount(r *chi.Mux) { + memberHandler := member.New(a.sessions) r.Mount("/member", memberHandler.Router(UsersOnly, AdminsOnly)) - roomHandler := room.New(a.sessions, a.remote, a.broadcast, a.websocket) + roomHandler := room.New(a.sessions, a.desktop, a.capture) r.Mount("/room", roomHandler.Router(UsersOnly, AdminsOnly)) } diff --git a/internal/http/http.go b/internal/http/http.go index 22f1b83e..172ccffa 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -23,7 +23,7 @@ type ServerCtx struct { conf *config.Server } -func New(webSocketHandler types.WebSocketManager, conf *config.Server) *ServerCtx { +func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, conf *config.Server) *ServerCtx { logger := log.With().Str("module", "http").Logger() router := chi.NewRouter() @@ -31,8 +31,10 @@ func New(webSocketHandler types.WebSocketManager, conf *config.Server) *ServerCt router.Use(middleware.RequestID) // Create a request ID for each request router.Use(Logger) // Log API request calls using custom logger function + ApiManager.Mount(router) + router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { - if webSocketHandler.Upgrade(w, r) != nil { + if WebSocketManager.Upgrade(w, r) != nil { //nolint w.Write([]byte("unable to upgrade your connection to a websocket")) } diff --git a/internal/types/api.go b/internal/types/api.go new file mode 100644 index 00000000..f0efae68 --- /dev/null +++ b/internal/types/api.go @@ -0,0 +1,9 @@ +package types + +import ( + "github.com/go-chi/chi" +) + +type ApiManager interface { + Mount(r *chi.Mux) +} diff --git a/neko.go b/neko.go index b845cc69..1ba5117b 100644 --- a/neko.go +++ b/neko.go @@ -12,6 +12,7 @@ import ( "demodesk/neko/internal/webrtc" "demodesk/neko/internal/session" "demodesk/neko/internal/websocket" + "demodesk/neko/internal/api" "demodesk/neko/internal/http" "github.com/rs/zerolog" @@ -116,6 +117,7 @@ type Neko struct { webRTCManager *webrtc.WebRTCManagerCtx sessionManager *session.SessionManagerCtx webSocketManager *websocket.WebSocketManagerCtx + apiManager *api.ApiManagerCtx server *http.ServerCtx } @@ -155,8 +157,16 @@ func (neko *Neko) Start() { ) neko.webSocketManager.Start() + neko.apiManager = api.New( + neko.sessionManager, + neko.desktopManager, + neko.captureManager, + neko.Configs.Server, + ) + neko.server = http.New( neko.webSocketManager, + neko.apiManager, neko.Configs.Server, ) neko.server.Start() From 7fb977faa49ccbb38798474428714dda857c736c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 17:34:47 +0100 Subject: [PATCH 062/876] edit broadcast. --- internal/capture/broadcast.go | 14 ++++++++------ internal/capture/manager.go | 2 ++ internal/types/capture.go | 2 +- internal/websocket/handler/broadcast.go | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 692a2c26..ef7e35b5 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -7,14 +7,14 @@ import ( func (manager *CaptureManagerCtx) StartBroadcastPipeline() { var err error - if manager.IsBoradcasting() || manager.broadcast_url == "" { + if manager.broadcast != nil || !manager.BroadcastEnabled() { return } manager.logger.Info(). Str("audio_device", manager.config.Device). Str("video_display", manager.config.Display). - Str("rtmp_pipeline_src", manager.broadcast.Src). + Str("broadcast_pipeline", manager.config.BroadcastPipeline). Msgf("Creating broadcast pipeline...") manager.broadcast, err = gst.CreateRTMPPipeline( @@ -33,26 +33,28 @@ func (manager *CaptureManagerCtx) StartBroadcastPipeline() { } func (manager *CaptureManagerCtx) StopBroadcastPipeline() { - if !manager.IsBoradcasting() { + if manager.broadcast == nil { return } manager.broadcast.DestroyPipeline() + manager.logger.Info().Msgf("Stopping broadcast pipeline...") manager.broadcast = nil } func (manager *CaptureManagerCtx) StartBroadcast(url string) { manager.broadcast_url = url + manager.broadcasting = true manager.StartBroadcastPipeline() } func (manager *CaptureManagerCtx) StopBroadcast() { - manager.broadcast_url = "" + manager.broadcasting = false manager.StopBroadcastPipeline() } -func (manager *CaptureManagerCtx) IsBoradcasting() bool { - return manager.broadcast != nil +func (manager *CaptureManagerCtx) BroadcastEnabled() bool { + return manager.broadcasting } func (manager *CaptureManagerCtx) BroadcastUrl() string { diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 889e3ec1..678d0ecf 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -21,6 +21,7 @@ type CaptureManagerCtx struct { shutdown chan bool emmiter events.EventEmmiter streaming bool + broadcasting bool broadcast_url string desktop types.DesktopManager } @@ -32,6 +33,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt emmiter: events.New(), config: config, streaming: false, + broadcasting: false, broadcast_url: "", desktop: desktop, } diff --git a/internal/types/capture.go b/internal/types/capture.go index 7ad3dfee..f54f3191 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -24,6 +24,6 @@ type CaptureManager interface { // broacast StartBroadcast(url string) StopBroadcast() - IsBoradcasting() bool + BroadcastEnabled() bool BroadcastUrl() string } diff --git a/internal/websocket/handler/broadcast.go b/internal/websocket/handler/broadcast.go index 953c8654..1fa0c766 100644 --- a/internal/websocket/handler/broadcast.go +++ b/internal/websocket/handler/broadcast.go @@ -45,7 +45,7 @@ func (h *MessageHandlerCtx) boradcastStatus(session types.Session) error { if err := session.Send( message.BroadcastStatus{ Event: event.BORADCAST_STATUS, - IsActive: h.capture.IsBoradcasting(), + IsActive: h.capture.BroadcastEnabled(), URL: h.capture.BroadcastUrl(), }); err != nil { h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.BORADCAST_STATUS) From d78f98e78e0549e361b13ca7d8f8b29ba16f0806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 17:40:22 +0100 Subject: [PATCH 063/876] make serving files as optional feature. --- internal/config/server.go | 2 +- internal/http/http.go | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/internal/config/server.go b/internal/config/server.go index 627e3061..2f2bc39c 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -30,7 +30,7 @@ func (Server) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().String("static", "./www", "path to neko client files to serve") + cmd.PersistentFlags().String("static", "", "path to neko client files to serve") if err := viper.BindPFlag("static", cmd.PersistentFlags().Lookup("static")); err != nil { return err } diff --git a/internal/http/http.go b/internal/http/http.go index 172ccffa..7ffe76dc 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -40,14 +40,16 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c } }) - fs := http.FileServer(http.Dir(conf.Static)) - router.Get("/*", func(w http.ResponseWriter, r *http.Request) { - if _, err := os.Stat(conf.Static + r.RequestURI); os.IsNotExist(err) { - http.StripPrefix(r.RequestURI, fs).ServeHTTP(w, r) - } else { - fs.ServeHTTP(w, r) - } - }) + if conf.Static != "" { + fs := http.FileServer(http.Dir(conf.Static)) + router.Get("/*", func(w http.ResponseWriter, r *http.Request) { + if _, err := os.Stat(conf.Static + r.RequestURI); os.IsNotExist(err) { + http.StripPrefix(r.RequestURI, fs).ServeHTTP(w, r) + } else { + fs.ServeHTTP(w, r) + } + }) + } router.NotFound(endpoint.Handle(func(w http.ResponseWriter, r *http.Request) error { return &endpoint.HandlerError{ From c53ae281966ea42adde0369a0ec020a9cde34e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 17:56:06 +0100 Subject: [PATCH 064/876] remove emotes structs. --- internal/types/message/messages.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 91c3b927..9e88d476 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -76,17 +76,6 @@ type ControlTarget struct { Target string `json:"target"` } -type EmoteReceive struct { - Event string `json:"event"` - Emote string `json:"emote"` -} - -type EmoteSend struct { - Event string `json:"event"` - ID string `json:"id"` - Emote string `json:"emote"` -} - type Admin struct { Event string `json:"event"` ID string `json:"id"` From 3ea979ed47314e0b577c312d784ae3c25f73ee8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 18:12:16 +0100 Subject: [PATCH 065/876] minor changes. --- internal/websocket/handler/admin.go | 8 +++----- internal/websocket/handler/control.go | 13 +------------ internal/websocket/handler/screen.go | 24 ++++++++++++++---------- internal/websocket/handler/session.go | 4 ++-- 4 files changed, 20 insertions(+), 29 deletions(-) diff --git a/internal/websocket/handler/admin.go b/internal/websocket/handler/admin.go index e6581cf3..f0404e05 100644 --- a/internal/websocket/handler/admin.go +++ b/internal/websocket/handler/admin.go @@ -132,14 +132,12 @@ func (h *MessageHandlerCtx) adminGive(session types.Session, payload *message.Ad target, ok := h.sessions.Get(payload.ID) if !ok { - h.logger.Debug().Str("id", target.ID()).Msg("user does not exist") + h.logger.Debug().Str("id", payload.ID).Msg("can't find target session") return nil } - // set host h.sessions.SetHost(target) - // let everyone know if err := h.sessions.Broadcast( message.AdminTarget{ Event: event.CONTROL_GIVE, @@ -220,7 +218,7 @@ func (h *MessageHandlerCtx) adminKick(session types.Session, payload *message.Ad target, ok := h.sessions.Get(payload.ID) if !ok { - h.logger.Debug().Str("id", payload.ID).Msg("can't find session id") + h.logger.Debug().Str("id", payload.ID).Msg("can't find target session") return nil } @@ -254,7 +252,7 @@ func (h *MessageHandlerCtx) adminBan(session types.Session, payload *message.Adm target, ok := h.sessions.Get(payload.ID) if !ok { - h.logger.Debug().Str("id", payload.ID).Msg("can't find session id") + h.logger.Debug().Str("id", payload.ID).Msg("can't find target session") return nil } diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 1ad0a9c9..41088eef 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -7,17 +7,14 @@ import ( ) func (h *MessageHandlerCtx) controlRelease(session types.Session) error { - // check if session is host if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } - // release host h.logger.Debug().Str("id", session.ID()).Msgf("host called %s", event.CONTROL_RELEASE) h.sessions.ClearHost() - // tell everyone if err := h.sessions.Broadcast( message.Control{ Event: event.CONTROL_RELEASE, @@ -70,7 +67,6 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { } func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message.Control) error { - // check if session is host if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil @@ -78,14 +74,12 @@ func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message. target, ok := h.sessions.Get(payload.ID) if !ok { - h.logger.Debug().Str("id", target.ID()).Msg("user does not exist") + h.logger.Debug().Str("id", payload.ID).Msg("can't find target session") return nil } - // set host h.sessions.SetHost(target) - // let everyone know if err := h.sessions.Broadcast( message.ControlTarget{ Event: event.CONTROL_GIVE, @@ -100,7 +94,6 @@ func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message. } func (h *MessageHandlerCtx) controlClipboard(session types.Session, payload *message.Clipboard) error { - // check if session is host if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil @@ -111,7 +104,6 @@ func (h *MessageHandlerCtx) controlClipboard(session types.Session, payload *mes } func (h *MessageHandlerCtx) controlKeyboard(session types.Session, payload *message.Keyboard) error { - // check if session is host if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil @@ -122,7 +114,6 @@ func (h *MessageHandlerCtx) controlKeyboard(session types.Session, payload *mess h.desktop.SetKeyboardLayout(*payload.Layout) } - // set num lock var NumLock = 0 if payload.NumLock == nil { NumLock = -1 @@ -130,7 +121,6 @@ func (h *MessageHandlerCtx) controlKeyboard(session types.Session, payload *mess NumLock = 1 } - // set caps lock var CapsLock = 0 if payload.CapsLock == nil { CapsLock = -1 @@ -138,7 +128,6 @@ func (h *MessageHandlerCtx) controlKeyboard(session types.Session, payload *mess CapsLock = 1 } - // set scroll lock var ScrollLock = 0 if payload.ScrollLock == nil { ScrollLock = -1 diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 16417394..48dd15ec 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -32,16 +32,20 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc } func (h *MessageHandlerCtx) screenResolution(session types.Session) error { - if size := h.desktop.GetScreenSize(); size != nil { - if err := session.Send(message.ScreenResolution{ - Event: event.SCREEN_RESOLUTION, - Width: size.Width, - Height: size.Height, - Rate: int(size.Rate), - }); err != nil { - h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_RESOLUTION) - return err - } + size := h.desktop.GetScreenSize() + if size == nil { + h.logger.Debug().Msg("could not get screen size") + return nil + } + + if err := session.Send(message.ScreenResolution{ + Event: event.SCREEN_RESOLUTION, + Width: size.Width, + Height: size.Height, + Rate: int(size.Rate), + }); err != nil { + h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_RESOLUTION) + return err } return nil diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 530b5f1c..923bbad6 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -28,7 +28,7 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { } func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { - // TODO: Refactor. + // create member list members := []*message.MembersListEntry{} for _, session := range h.sessions.Members() { members = append(members, &message.MembersListEntry{ @@ -48,7 +48,7 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { return err } - // send screen current resolution + // send current screen resolution if err := h.screenResolution(session); err != nil { return err } From c10b2212d1ec1e11ec27b1c5eaad8daa2710173b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 18:39:12 +0100 Subject: [PATCH 066/876] auth moved from websockets to session. --- cmd/serve.go | 4 +- internal/config/server.go | 7 ++++ internal/config/{websocket.go => session.go} | 13 ++----- internal/session/auth.go | 37 ++++++++++++++++++ internal/session/manager.go | 5 ++- internal/types/session.go | 5 +++ internal/websocket/manager.go | 41 ++------------------ neko.go | 6 +-- 8 files changed, 65 insertions(+), 53 deletions(-) rename internal/config/{websocket.go => session.go} (66%) create mode 100644 internal/session/auth.go diff --git a/cmd/serve.go b/cmd/serve.go index f26f472f..81d2cdd0 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -18,9 +18,9 @@ func init() { configs := []config.Config{ neko.Service.Configs.Capture, - neko.Service.Configs.Server, neko.Service.Configs.WebRTC, - neko.Service.Configs.WebSocket, + neko.Service.Configs.Session, + neko.Service.Configs.Server, } cobra.OnInitialize(func() { diff --git a/internal/config/server.go b/internal/config/server.go index 2f2bc39c..eab02938 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -10,6 +10,7 @@ type Server struct { Key string Bind string Static string + //Proxy bool UserToken string AdminToken string } @@ -35,6 +36,11 @@ func (Server) Init(cmd *cobra.Command) error { return err } + //cmd.PersistentFlags().Bool("proxy", false, "allow reverse proxies") + //if err := viper.BindPFlag("proxy", cmd.PersistentFlags().Lookup("proxy")); err != nil { + // return err + //} + cmd.PersistentFlags().String("user_token", "user_secret", "JWT token for users") if err := viper.BindPFlag("user_token", cmd.PersistentFlags().Lookup("user_token")); err != nil { return err @@ -53,6 +59,7 @@ func (s *Server) Set() { s.Key = viper.GetString("key") s.Bind = viper.GetString("bind") s.Static = viper.GetString("static") + //s.Proxy = viper.GetBool("proxy") s.UserToken = viper.GetString("user_token") s.AdminToken = viper.GetString("admin_token") } diff --git a/internal/config/websocket.go b/internal/config/session.go similarity index 66% rename from internal/config/websocket.go rename to internal/config/session.go index 099f34bd..2b06895f 100644 --- a/internal/config/websocket.go +++ b/internal/config/session.go @@ -5,13 +5,12 @@ import ( "github.com/spf13/viper" ) -type WebSocket struct { +type Session struct { Password string AdminPassword string - Proxy bool } -func (WebSocket) Init(cmd *cobra.Command) error { +func (Session) Init(cmd *cobra.Command) error { cmd.PersistentFlags().String("password", "neko", "password for connecting to stream") if err := viper.BindPFlag("password", cmd.PersistentFlags().Lookup("password")); err != nil { return err @@ -22,16 +21,10 @@ func (WebSocket) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().Bool("proxy", false, "enable reverse proxy mode") - if err := viper.BindPFlag("proxy", cmd.PersistentFlags().Lookup("proxy")); err != nil { - return err - } - return nil } -func (s *WebSocket) Set() { +func (s *Session) Set() { s.Password = viper.GetString("password") s.AdminPassword = viper.GetString("password_admin") - s.Proxy = viper.GetBool("proxy") } diff --git a/internal/session/auth.go b/internal/session/auth.go new file mode 100644 index 00000000..9fbb7f95 --- /dev/null +++ b/internal/session/auth.go @@ -0,0 +1,37 @@ +package session + +import ( + "fmt" + "net/http" + + "demodesk/neko/internal/utils" +) + +// TODO: Refactor +func (manager *SessionManagerCtx) Authenticate(r *http.Request) (string, string, bool, error) { + ip := r.RemoteAddr + + //if ws.conf.Proxy { + // ip = utils.ReadUserIP(r) + //} + + id, err := utils.NewUID(32) + if err != nil { + return "", ip, false, err + } + + passwords, ok := r.URL.Query()["password"] + if !ok || len(passwords[0]) < 1 { + return "", ip, false, fmt.Errorf("no password provided") + } + + if passwords[0] == manager.config.AdminPassword { + return id, ip, true, nil + } + + if passwords[0] == manager.config.Password { + return id, ip, false, nil + } + + return "", ip, false, fmt.Errorf("invalid password: %s", passwords[0]) +} diff --git a/internal/session/manager.go b/internal/session/manager.go index 9a882c37..6bb113d9 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -6,14 +6,16 @@ import ( "github.com/rs/zerolog/log" "demodesk/neko/internal/types" + "demodesk/neko/internal/config" "demodesk/neko/internal/utils" ) -func New(capture types.CaptureManager) *SessionManagerCtx { +func New(capture types.CaptureManager, config *config.Session) *SessionManagerCtx { return &SessionManagerCtx{ logger: log.With().Str("module", "session").Logger(), host: nil, capture: capture, + config: config, members: make(map[string]*SessionCtx), emmiter: events.New(), } @@ -23,6 +25,7 @@ type SessionManagerCtx struct { logger zerolog.Logger host types.Session capture types.CaptureManager + config *config.Session members map[string]*SessionCtx emmiter events.EventEmmiter } diff --git a/internal/types/session.go b/internal/types/session.go index 136ebb30..e12e53bd 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -1,5 +1,7 @@ package types +import "net/http" + type Session interface { ID() string Name() string @@ -38,4 +40,7 @@ type SessionManager interface { OnDestroy(listener func(id string)) OnCreated(listener func(session Session)) OnConnected(listener func(session Session)) + + // auth + Authenticate(r *http.Request) (string, string, bool, error) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 80f8d8ee..bef21bb4 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -1,7 +1,6 @@ package websocket import ( - "fmt" "net/http" "time" @@ -14,8 +13,6 @@ import ( "demodesk/neko/internal/types/message" "demodesk/neko/internal/types" - "demodesk/neko/internal/config" - "demodesk/neko/internal/utils" ) func New( @@ -23,13 +20,11 @@ func New( desktop types.DesktopManager, capture types.CaptureManager, webrtc types.WebRTCManager, - conf *config.WebSocket, ) *WebSocketManagerCtx { logger := log.With().Str("module", "websocket").Logger() return &WebSocketManagerCtx{ logger: logger, - conf: conf, sessions: sessions, desktop: desktop, upgrader: websocket.Upgrader{ @@ -49,7 +44,6 @@ type WebSocketManagerCtx struct { upgrader websocket.Upgrader sessions types.SessionManager desktop types.DesktopManager - conf *config.WebSocket handler *handler.MessageHandlerCtx shutdown chan bool } @@ -80,8 +74,10 @@ func (ws *WebSocketManagerCtx) Start() { }) go func() { + ws.logger.Info().Msg("clipboard loop started") + defer func() { - ws.logger.Info().Msg("shutdown") + ws.logger.Info().Msg("clipboard loop stopped") }() current := ws.desktop.ReadClipboard() @@ -131,7 +127,7 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return err } - id, ip, admin, err := ws.authenticate(r) + id, ip, admin, err := ws.sessions.Authenticate(r) if err != nil { ws.logger.Warn().Err(err).Msg("authentication failed") @@ -186,35 +182,6 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return nil } -// TODO: Refactor -func (ws *WebSocketManagerCtx) authenticate(r *http.Request) (string, string, bool, error) { - ip := r.RemoteAddr - - if ws.conf.Proxy { - ip = utils.ReadUserIP(r) - } - - id, err := utils.NewUID(32) - if err != nil { - return "", ip, false, err - } - - passwords, ok := r.URL.Query()["password"] - if !ok || len(passwords[0]) < 1 { - return "", ip, false, fmt.Errorf("no password provided") - } - - if passwords[0] == ws.conf.AdminPassword { - return id, ip, true, nil - } - - if passwords[0] == ws.conf.Password { - return id, ip, false, nil - } - - return "", ip, false, fmt.Errorf("invalid password: %s", passwords[0]) -} - func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, id string) { bytes := make(chan []byte) cancel := make(chan struct{}) diff --git a/neko.go b/neko.go index 1ba5117b..c91574dd 100644 --- a/neko.go +++ b/neko.go @@ -64,8 +64,8 @@ func init() { Root: &config.Root{}, Capture: &config.Capture{}, WebRTC: &config.WebRTC{}, + Session: &config.Session{}, Server: &config.Server{}, - WebSocket: &config.WebSocket{}, }, } } @@ -103,8 +103,8 @@ type Configs struct { Root *config.Root Capture *config.Capture WebRTC *config.WebRTC + Session *config.Session Server *config.Server - WebSocket *config.WebSocket } type Neko struct { @@ -146,6 +146,7 @@ func (neko *Neko) Start() { neko.sessionManager = session.New( neko.captureManager, + neko.Configs.Session, ) neko.webSocketManager = websocket.New( @@ -153,7 +154,6 @@ func (neko *Neko) Start() { neko.desktopManager, neko.captureManager, neko.webRTCManager, - neko.Configs.WebSocket, ) neko.webSocketManager.Start() From 16d762b6aedba2ce9c2f0cfe721f6b5a0336033d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 20:18:19 +0100 Subject: [PATCH 067/876] GST pipelines refactor. --- internal/capture/broadcast.go | 2 +- internal/capture/gst/gst.c | 6 +- internal/capture/gst/gst.go | 5 -- internal/capture/gst/gst.h | 1 - internal/capture/manager.go | 116 +++++++++++++++++++++------------- 5 files changed, 74 insertions(+), 56 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index ef7e35b5..3f9ce0a5 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -37,7 +37,7 @@ func (manager *CaptureManagerCtx) StopBroadcastPipeline() { return } - manager.broadcast.DestroyPipeline() + manager.broadcast.Stop() manager.logger.Info().Msgf("Stopping broadcast pipeline...") manager.broadcast = nil } diff --git a/internal/capture/gst/gst.c b/internal/capture/gst/gst.c index b68dccee..4e78974d 100644 --- a/internal/capture/gst/gst.c +++ b/internal/capture/gst/gst.c @@ -68,11 +68,6 @@ GstElement *gstreamer_send_create_pipeline(char *pipeline) { return gst_parse_launch(pipeline, &error); } -void gstreamer_send_destroy_pipeline(GstElement *pipeline) { - gst_element_set_state(pipeline, GST_STATE_NULL); - gst_object_unref(pipeline); -} - void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId) { SampleHandlerUserData *s = calloc(1, sizeof(SampleHandlerUserData)); s->pipelineId = pipelineId; @@ -95,4 +90,5 @@ void gstreamer_send_play_pipeline(GstElement *pipeline) { void gstreamer_send_stop_pipeline(GstElement *pipeline) { gst_element_set_state(pipeline, GST_STATE_NULL); + gst_object_unref(pipeline); } diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 2a138a2d..a2c884b9 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -210,11 +210,6 @@ func CreatePipeline(pipelineStr string, codecName string, clockRate float32) (*P return p, nil } -// Destroy GStreamer Pipeline -func (p *Pipeline) DestroyPipeline() { - C.gstreamer_send_destroy_pipeline(p.Pipeline) -} - // Start starts the GStreamer Pipeline func (p *Pipeline) Start() { C.gstreamer_send_start_pipeline(p.Pipeline, C.int(p.id)) diff --git a/internal/capture/gst/gst.h b/internal/capture/gst/gst.h index 19b3b5b7..7c6965f4 100644 --- a/internal/capture/gst/gst.h +++ b/internal/capture/gst/gst.h @@ -9,7 +9,6 @@ extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); GstElement *gstreamer_send_create_pipeline(char *pipeline); -void gstreamer_send_destroy_pipeline(GstElement *pipeline); void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId); void gstreamer_send_play_pipeline(GstElement *pipeline); diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 678d0ecf..cdf9d067 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -18,7 +18,8 @@ type CaptureManagerCtx struct { audio *gst.Pipeline broadcast *gst.Pipeline config *config.Capture - shutdown chan bool + audio_stop chan bool + video_stop chan bool emmiter events.EventEmmiter streaming bool broadcasting bool @@ -29,7 +30,8 @@ type CaptureManagerCtx struct { func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { return &CaptureManagerCtx{ logger: log.With().Str("module", "capture").Logger(), - shutdown: make(chan bool), + audio_stop: make(chan bool), + video_stop: make(chan bool), emmiter: events.New(), config: config, streaming: false, @@ -48,35 +50,15 @@ func (manager *CaptureManagerCtx) Start() { manager.logger.Warn().Err(err).Msg("unable to change screen size") } - manager.CreateVideoPipeline() - manager.CreateAudioPipeline() manager.StartBroadcastPipeline() - - go func() { - defer func() { - manager.logger.Info().Msg("shutdown") - }() - - for { - select { - case <-manager.shutdown: - return - case sample := <-manager.video.Sample: - manager.emmiter.Emit("video", sample) - case sample := <-manager.audio.Sample: - manager.emmiter.Emit("audio", sample) - } - } - }() } func (manager *CaptureManagerCtx) Shutdown() error { manager.logger.Info().Msgf("capture shutting down") - manager.video.DestroyPipeline() - manager.audio.DestroyPipeline() + manager.audio_stop <- true + manager.video_stop <- true manager.StopBroadcastPipeline() - manager.shutdown <- true return nil } @@ -103,16 +85,16 @@ func (manager *CaptureManagerCtx) OnAudioFrame(listener func(sample types.Sample func (manager *CaptureManagerCtx) StartStream() { manager.logger.Info().Msgf("Pipelines starting...") - manager.video.Start() - manager.audio.Start() + manager.createVideoPipeline() + manager.createAudioPipeline() manager.streaming = true } func (manager *CaptureManagerCtx) StopStream() { - manager.logger.Info().Msgf("Pipelines shutting down...") + manager.logger.Info().Msgf("Pipelines stopping...") - manager.video.Stop() - manager.audio.Stop() + manager.audio_stop <- true + manager.video_stop <- true manager.streaming = false } @@ -120,7 +102,19 @@ func (manager *CaptureManagerCtx) Streaming() bool { return manager.streaming } -func (manager *CaptureManagerCtx) CreateVideoPipeline() { +func (manager *CaptureManagerCtx) ChangeResolution(width int, height int, rate int) error { + manager.video_stop <- true + manager.StopBroadcastPipeline() + + defer func() { + manager.createVideoPipeline() + manager.StartBroadcastPipeline() + }() + + return manager.desktop.ChangeScreenSize(width, height, rate) +} + +func (manager *CaptureManagerCtx) createVideoPipeline() { var err error manager.logger.Info(). @@ -138,9 +132,34 @@ func (manager *CaptureManagerCtx) CreateVideoPipeline() { if err != nil { manager.logger.Panic().Err(err).Msg("unable to create video pipeline") } + + manager.logger.Info(). + Str("pipeline", manager.video.Src). + Msgf("Starting video pipeline...") + + manager.video.Start() + + go func() { + manager.logger.Debug().Msg("started emitting video data") + + defer func() { + manager.logger.Debug().Msg("stopped emitting video data") + }() + + for { + select { + case <-manager.video_stop: + manager.logger.Info().Msgf("Stopping video pipeline...") + manager.video.Stop() + return + case sample := <-manager.video.Sample: + manager.emmiter.Emit("video", sample) + } + } + }() } -func (manager *CaptureManagerCtx) CreateAudioPipeline() { +func (manager *CaptureManagerCtx) createAudioPipeline() { var err error manager.logger.Info(). @@ -158,20 +177,29 @@ func (manager *CaptureManagerCtx) CreateAudioPipeline() { if err != nil { manager.logger.Panic().Err(err).Msg("unable to create audio pipeline") } -} -func (manager *CaptureManagerCtx) ChangeResolution(width int, height int, rate int) error { - manager.video.DestroyPipeline() - manager.StopBroadcastPipeline() + manager.logger.Info(). + Str("pipeline", manager.audio.Src). + Msgf("Starting audio pipeline...") - defer func() { - manager.CreateVideoPipeline() - - manager.video.Start() - manager.logger.Info().Msg("starting video pipeline...") - - manager.StartBroadcastPipeline() + manager.audio.Start() + + go func() { + manager.logger.Debug().Msg("started emitting audio data") + + defer func() { + manager.logger.Debug().Msg("stopped emitting audio data") + }() + + for { + select { + case <-manager.audio_stop: + manager.logger.Info().Msgf("Stopping audio pipeline...") + manager.audio.Stop() + return + case sample := <-manager.audio.Sample: + manager.emmiter.Emit("audio", sample) + } + } }() - - return manager.desktop.ChangeScreenSize(width, height, rate) } From 311ed987d815f9453f49ddc25b0e4235d0eb9836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 20:23:09 +0100 Subject: [PATCH 068/876] refactor WS authentication. --- internal/session/auth.go | 61 +++++++++++++++++++++++------------ internal/session/manager.go | 23 +++++++------ internal/session/session.go | 1 + internal/types/session.go | 4 +-- internal/websocket/manager.go | 22 ++++++++----- 5 files changed, 68 insertions(+), 43 deletions(-) diff --git a/internal/session/auth.go b/internal/session/auth.go index 9fbb7f95..7d9e8c51 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -3,35 +3,54 @@ package session import ( "fmt" "net/http" + "strings" + "demodesk/neko/internal/types" "demodesk/neko/internal/utils" ) -// TODO: Refactor -func (manager *SessionManagerCtx) Authenticate(r *http.Request) (string, string, bool, error) { - ip := r.RemoteAddr +const ( + token_name = "password" +) - //if ws.conf.Proxy { - // ip = utils.ReadUserIP(r) - //} +func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, error) { + token := getToken(r) + if token == "" { + return nil, fmt.Errorf("no password provided") + } + + isAdmin := (token == manager.config.AdminPassword) + isUser := (token == manager.config.Password) + + if !isAdmin && !isUser { + return nil, fmt.Errorf("invalid password") + } id, err := utils.NewUID(32) if err != nil { - return "", ip, false, err + return nil, err } - passwords, ok := r.URL.Query()["password"] - if !ok || len(passwords[0]) < 1 { - return "", ip, false, fmt.Errorf("no password provided") - } - - if passwords[0] == manager.config.AdminPassword { - return id, ip, true, nil - } - - if passwords[0] == manager.config.Password { - return id, ip, false, nil - } - - return "", ip, false, fmt.Errorf("invalid password: %s", passwords[0]) + return manager.New(id, isAdmin), nil +} + +func getToken(r *http.Request) string { + // Get token from query + if token := r.URL.Query().Get(token_name); token != "" { + return token + } + + // Get token from authorization header + bearer := r.Header.Get("Authorization") + if len(bearer) > 7 && strings.ToUpper(bearer[0:6]) == "BEARER" { + return bearer[7:] + } + + // Get token from cookie + cookie, err := r.Cookie(token_name) + if err == nil { + return cookie.Value + } + + return "" } diff --git a/internal/session/manager.go b/internal/session/manager.go index 6bb113d9..53d5da5a 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -30,23 +30,16 @@ type SessionManagerCtx struct { emmiter events.EventEmmiter } -func (manager *SessionManagerCtx) New(id string, admin bool, socket types.WebSocket) types.Session { +func (manager *SessionManagerCtx) New(id string, admin bool) types.Session { session := &SessionCtx{ id: id, admin: admin, manager: manager, - socket: socket, logger: manager.logger.With().Str("id", id).Logger(), connected: false, } manager.members[id] = session - manager.emmiter.Emit("created", session) - - if !manager.capture.Streaming() && len(manager.members) > 0 { - manager.capture.StartStream() - } - return session } @@ -66,10 +59,6 @@ func (manager *SessionManagerCtx) Destroy(id string) error { delete(manager.members, id) err := session.destroy() - if !manager.capture.Streaming() && len(manager.members) <= 0 { - manager.capture.StopStream() - } - manager.emmiter.Emit("destroy", id) return err } @@ -164,12 +153,22 @@ func (manager *SessionManagerCtx) OnHostCleared(listener func(session types.Sess func (manager *SessionManagerCtx) OnDestroy(listener func(id string)) { manager.emmiter.On("destroy", func(payload ...interface{}) { + // Stop streaming, if everyone left + if manager.capture.Streaming() && len(manager.members) == 0 { + manager.capture.StopStream() + } + listener(payload[0].(string)) }) } func (manager *SessionManagerCtx) OnCreated(listener func(session types.Session)) { manager.emmiter.On("created", func(payload ...interface{}) { + // Start streaming, when first joins + if !manager.capture.Streaming() { + manager.capture.StartStream() + } + listener(payload[0].(*SessionCtx)) }) } diff --git a/internal/session/session.go b/internal/session/session.go index 574d79bb..80be221d 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -62,6 +62,7 @@ func (session *SessionCtx) SetName(name string) { func (session *SessionCtx) SetSocket(socket types.WebSocket) { session.socket = socket + session.manager.emmiter.Emit("created", session) } func (session *SessionCtx) SetPeer(peer types.Peer) { diff --git a/internal/types/session.go b/internal/types/session.go index e12e53bd..ae9b6b8b 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -21,7 +21,7 @@ type Session interface { } type SessionManager interface { - New(id string, admin bool, socket WebSocket) Session + New(id string, admin bool) Session Get(id string) (Session, bool) Has(id string) bool Destroy(id string) error @@ -42,5 +42,5 @@ type SessionManager interface { OnConnected(listener func(session Session)) // auth - Authenticate(r *http.Request) (string, string, bool, error) + Authenticate(r *http.Request) (Session, error) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index bef21bb4..1d5ba136 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -127,14 +127,14 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return err } - id, ip, admin, err := ws.sessions.Authenticate(r) + session, err := ws.sessions.Authenticate(r) if err != nil { ws.logger.Warn().Err(err).Msg("authentication failed") // TODO: Refactor if err = connection.WriteJSON(message.Disconnect{ Event: event.SYSTEM_DISCONNECT, - Message: "invalid_password", + Message: "authentication failed", }); err != nil { ws.logger.Error().Err(err).Msg("failed to send disconnect") } @@ -142,14 +142,20 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return connection.Close() } + // TODO: Refactor. + ip := r.RemoteAddr + // if allow poxy { + // ip = utils.ReadUserIP(r) + // } + socket := &WebSocketCtx{ - id: id, + id: session.ID(), ws: ws, address: ip, connection: connection, } - ok, reason := ws.handler.Connected(id, socket) + ok, reason := ws.handler.Connected(session.ID(), socket) if !ok { // TODO: Refactor if err = connection.WriteJSON(message.Disconnect{ @@ -162,23 +168,23 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return connection.Close() } - ws.sessions.New(id, admin, socket) + session.SetSocket(socket) ws.logger. Debug(). - Str("session", id). + Str("session", session.ID()). Str("address", connection.RemoteAddr().String()). Msg("new connection created") defer func() { ws.logger. Debug(). - Str("session", id). + Str("session", session.ID()). Str("address", connection.RemoteAddr().String()). Msg("session ended") }() - ws.handle(connection, id) + ws.handle(connection, session.ID()) return nil } From e51541fe015f4be87e432a4bdb411108fc0c0495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 20:53:25 +0100 Subject: [PATCH 069/876] separate disconnect from destroy. --- internal/session/manager.go | 27 ++++++++++++--------------- internal/session/session.go | 12 +++++++++++- internal/types/session.go | 3 ++- internal/webrtc/webrtc.go | 4 +--- internal/websocket/handler/session.go | 9 ++++----- internal/websocket/manager.go | 24 +++++++++++------------- 6 files changed, 41 insertions(+), 38 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 53d5da5a..c8ac91da 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -57,10 +57,7 @@ func (manager *SessionManagerCtx) Destroy(id string) error { session, ok := manager.members[id] if ok { delete(manager.members, id) - err := session.destroy() - - manager.emmiter.Emit("destroy", id) - return err + return session.destroy() } return nil @@ -151,17 +148,6 @@ func (manager *SessionManagerCtx) OnHostCleared(listener func(session types.Sess }) } -func (manager *SessionManagerCtx) OnDestroy(listener func(id string)) { - manager.emmiter.On("destroy", func(payload ...interface{}) { - // Stop streaming, if everyone left - if manager.capture.Streaming() && len(manager.members) == 0 { - manager.capture.StopStream() - } - - listener(payload[0].(string)) - }) -} - func (manager *SessionManagerCtx) OnCreated(listener func(session types.Session)) { manager.emmiter.On("created", func(payload ...interface{}) { // Start streaming, when first joins @@ -178,3 +164,14 @@ func (manager *SessionManagerCtx) OnConnected(listener func(session types.Sessio listener(payload[0].(*SessionCtx)) }) } + +func (manager *SessionManagerCtx) OnDisconnected(listener func(session types.Session)) { + manager.emmiter.On("disconnected", func(payload ...interface{}) { + // Stop streaming, if everyone left + if manager.capture.Streaming() && len(manager.members) == 0 { + manager.capture.StopStream() + } + + listener(payload[0].(*SessionCtx)) + }) +} diff --git a/internal/session/session.go b/internal/session/session.go index 80be221d..efcbd2e2 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -74,6 +74,15 @@ func (session *SessionCtx) SetConnected() { session.manager.emmiter.Emit("connected", session) } +func (session *SessionCtx) SetDisconnected() { + session.connected = false + session.manager.emmiter.Emit("disconnected", session) + session.socket = nil + + // TODO: Refactor. + session.manager.Destroy(session.id) +} + func (session *SessionCtx) Disconnect(reason string) error { if session.socket == nil { return nil @@ -87,7 +96,8 @@ func (session *SessionCtx) Disconnect(reason string) error { return err } - return session.manager.Destroy(session.id) + session.SetDisconnected() + return nil } func (session *SessionCtx) Send(v interface{}) error { diff --git a/internal/types/session.go b/internal/types/session.go index ae9b6b8b..7c5715df 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -15,6 +15,7 @@ type Session interface { SetSocket(socket WebSocket) SetPeer(peer Peer) SetConnected() + SetDisconnected() Disconnect(reason string) error Send(v interface{}) error SignalAnswer(sdp string) error @@ -37,9 +38,9 @@ type SessionManager interface { OnHost(listener func(session Session)) OnHostCleared(listener func(session Session)) - OnDestroy(listener func(id string)) OnCreated(listener func(session Session)) OnConnected(listener func(session Session)) + OnDisconnected(listener func(session Session)) // auth Authenticate(r *http.Request) (Session, error) diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index b5c11a4a..3b20ebea 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -156,9 +156,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool case webrtc.PeerConnectionStateDisconnected: case webrtc.PeerConnectionStateFailed: manager.logger.Info().Str("id", session.ID()).Msg("peer disconnected") - if err:= session.Disconnect("peer connection state failed"); err != nil { - manager.logger.Warn().Err(err).Msg("error while disconnecting session") - } + session.SetDisconnected() case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", session.ID()).Msg("peer connected") session.SetConnected() diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 923bbad6..4f788455 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -81,14 +81,13 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { return nil } -func (h *MessageHandlerCtx) SessionDestroyed(id string) error { +func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { // clear host if exists - host := h.sessions.GetHost() - if host != nil && host.ID() == id { + if session.IsHost() { h.sessions.ClearHost() if err := h.sessions.Broadcast(message.Control{ Event: event.CONTROL_RELEASE, - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) } @@ -98,7 +97,7 @@ func (h *MessageHandlerCtx) SessionDestroyed(id string) error { if err := h.sessions.Broadcast( message.MemberDisconnected{ Event: event.MEMBER_DISCONNECTED, - ID: id, + ID: session.ID(), }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.MEMBER_DISCONNECTED) return err diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 1d5ba136..f8884ea6 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -51,7 +51,7 @@ type WebSocketManagerCtx struct { func (ws *WebSocketManagerCtx) Start() { ws.sessions.OnCreated(func(session types.Session) { if err := ws.handler.SessionCreated(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with and error") + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with an error") } else { ws.logger.Debug().Str("id", session.ID()).Msg("session created") } @@ -59,17 +59,17 @@ func (ws *WebSocketManagerCtx) Start() { ws.sessions.OnConnected(func(session types.Session) { if err := ws.handler.SessionConnected(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with and error") + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with an error") } else { ws.logger.Debug().Str("id", session.ID()).Msg("session connected") } }) - ws.sessions.OnDestroy(func(id string) { - if err := ws.handler.SessionDestroyed(id); err != nil { - ws.logger.Warn().Str("id", id).Err(err).Msg("session destroyed with and error") + ws.sessions.OnDisconnected(func(session types.Session) { + if err := ws.handler.SessionDisconnected(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session disconnected with an error") } else { - ws.logger.Debug().Str("id", id).Msg("session destroyed") + ws.logger.Debug().Str("id", session.ID()).Msg("session disconnected") } }) @@ -184,11 +184,11 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e Msg("session ended") }() - ws.handle(connection, session.ID()) + ws.handle(connection, session) return nil } -func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, id string) { +func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types.Session) { bytes := make(chan []byte) cancel := make(chan struct{}) ticker := time.NewTicker(pingPeriod) @@ -197,9 +197,7 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, id string) { defer func() { ticker.Stop() ws.logger.Debug().Str("address", connection.RemoteAddr().String()).Msg("handle socket ending") - if err := ws.handler.Disconnected(id); err != nil { - ws.logger.Warn().Err(err).Msg("socket disconnected with error") - } + session.SetDisconnected() }() for { @@ -223,12 +221,12 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, id string) { select { case raw := <-bytes: ws.logger.Debug(). - Str("session", id). + Str("session", session.ID()). Str("address", connection.RemoteAddr().String()). Str("raw", string(raw)). Msg("received message from client") - if err := ws.handler.Message(id, raw); err != nil { + if err := ws.handler.Message(session.ID(), raw); err != nil { ws.logger.Error().Err(err).Msg("message handler has failed") } case <-cancel: From 51c6e0091f240dcbcff07ca83bcd24fc843a2449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 1 Nov 2020 21:03:25 +0100 Subject: [PATCH 070/876] Connected / Disconnected refactor. --- internal/session/manager.go | 2 +- internal/session/session.go | 24 ++++++++++++------------ internal/types/session.go | 3 +-- internal/webrtc/webrtc.go | 4 ++-- internal/websocket/manager.go | 2 +- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index c8ac91da..9af44f22 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -168,7 +168,7 @@ func (manager *SessionManagerCtx) OnConnected(listener func(session types.Sessio func (manager *SessionManagerCtx) OnDisconnected(listener func(session types.Session)) { manager.emmiter.On("disconnected", func(payload ...interface{}) { // Stop streaming, if everyone left - if manager.capture.Streaming() && len(manager.members) == 0 { + if manager.capture.Streaming() && len(manager.Members()) == 0 { manager.capture.StopStream() } diff --git a/internal/session/session.go b/internal/session/session.go index efcbd2e2..b1f7071c 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -69,18 +69,18 @@ func (session *SessionCtx) SetPeer(peer types.Peer) { session.peer = peer } -func (session *SessionCtx) SetConnected() { - session.connected = true - session.manager.emmiter.Emit("connected", session) -} +func (session *SessionCtx) SetConnected(connected bool) { + session.connected = connected -func (session *SessionCtx) SetDisconnected() { - session.connected = false - session.manager.emmiter.Emit("disconnected", session) - session.socket = nil - - // TODO: Refactor. - session.manager.Destroy(session.id) + if connected { + session.manager.emmiter.Emit("connected", session) + } else { + session.manager.emmiter.Emit("disconnected", session) + session.socket = nil + + // TODO: Refactor. + session.manager.Destroy(session.id) + } } func (session *SessionCtx) Disconnect(reason string) error { @@ -96,7 +96,7 @@ func (session *SessionCtx) Disconnect(reason string) error { return err } - session.SetDisconnected() + session.SetConnected(false) return nil } diff --git a/internal/types/session.go b/internal/types/session.go index 7c5715df..a80dd9a6 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -14,8 +14,7 @@ type Session interface { SetName(name string) SetSocket(socket WebSocket) SetPeer(peer Peer) - SetConnected() - SetDisconnected() + SetConnected(connected bool) Disconnect(reason string) error Send(v interface{}) error SignalAnswer(sdp string) error diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go index 3b20ebea..a8b3dcc5 100644 --- a/internal/webrtc/webrtc.go +++ b/internal/webrtc/webrtc.go @@ -156,10 +156,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool case webrtc.PeerConnectionStateDisconnected: case webrtc.PeerConnectionStateFailed: manager.logger.Info().Str("id", session.ID()).Msg("peer disconnected") - session.SetDisconnected() + session.SetConnected(false) case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", session.ID()).Msg("peer connected") - session.SetConnected() + session.SetConnected(true) } }) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index f8884ea6..0a727644 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -197,7 +197,7 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types. defer func() { ticker.Stop() ws.logger.Debug().Str("address", connection.RemoteAddr().String()).Msg("handle socket ending") - session.SetDisconnected() + session.SetConnected(false) }() for { From b0ae758d7b1f7aff6d203c72ba79d79bb36d7557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 4 Nov 2020 00:09:52 +0100 Subject: [PATCH 071/876] refactor xorg race condition. --- internal/desktop/manager.go | 8 ++++++- internal/desktop/xorg/xorg.c | 39 +++++------------------------------ internal/desktop/xorg/xorg.go | 20 +++++++++++++++--- internal/desktop/xorg/xorg.h | 13 +++--------- 4 files changed, 32 insertions(+), 48 deletions(-) diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 3982ee86..aac9304b 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -3,6 +3,7 @@ package desktop import ( "time" + "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -26,10 +27,15 @@ func New(display string) *DesktopManagerCtx { } func (manager *DesktopManagerCtx) Start() { - xorg.Display(manager.display) + if err := xorg.DisplayOpen(manager.display); err != nil { + manager.logger.Warn().Err(err).Msg("unable to open dispaly") + } + + xorg.GetScreenConfigurations() go func() { defer func() { + xorg.DisplayClose() manager.logger.Info().Msg("shutdown") }() diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index ace9a1ff..f631fc5e 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -1,47 +1,18 @@ #include "xorg.h" static Display *DISPLAY = NULL; -static char *NAME = ":0.0"; -static int REGISTERED = 0; -static int DIRTY = 0; Display *getXDisplay(void) { - /* Close the display if displayName has changed */ - if (DIRTY) { - XDisplayClose(); - DIRTY = 0; - } - - if (DISPLAY == NULL) { - /* First try the user set displayName */ - DISPLAY = XOpenDisplay(NAME); - - /* Then try using environment variable DISPLAY */ - if (DISPLAY == NULL) { - DISPLAY = XOpenDisplay(NULL); - } - - if (DISPLAY == NULL) { - fputs("Could not open main display\n", stderr); - } else if (!REGISTERED) { - atexit(&XDisplayClose); - REGISTERED = 1; - } - } - return DISPLAY; } -void XDisplayClose(void) { - if (DISPLAY != NULL) { - XCloseDisplay(DISPLAY); - DISPLAY = NULL; - } +int XDisplayOpen(char *name) { + DISPLAY = XOpenDisplay(name); + return DISPLAY == NULL; } -void XDisplaySet(char *input) { - NAME = strdup(input); - DIRTY = 1; +void XDisplayClose(void) { + XCloseDisplay(DISPLAY); } void XMove(int x, int y) { diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 4063d352..09805d88 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -24,18 +24,32 @@ var debounce_button = make(map[int]time.Time) var debounce_key = make(map[uint64]time.Time) var mu = sync.Mutex{} -func init() { +func GetScreenConfigurations() { C.XGetScreenConfigurations() } -func Display(display string) { +func DisplayOpen(display string) error { mu.Lock() defer mu.Unlock() displayUnsafe := C.CString(display) defer C.free(unsafe.Pointer(displayUnsafe)) - C.XDisplaySet(displayUnsafe) + var err C.int + err = C.XDisplayOpen(displayUnsafe) + + if int(err) == 1 { + return fmt.Errorf("Could not open display %s.", display) + } + + return nil +} + +func DisplayClose() { + mu.Lock() + defer mu.Unlock() + + C.XDisplayClose() } func Move(x, y int) { diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index 4a7b49a2..426769a0 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -9,18 +9,14 @@ #include #include #include -#include /* For fputs() */ -#include /* For strdup() */ +#include extern void goCreateScreenSize(int index, int width, int height, int mwidth, int mheight); extern void goSetScreenRates(int index, int rate_index, short rate); -/* Returns the main display, closed either on exit or when closeMainDisplay() -* is invoked. This removes a bit of the overhead of calling XOpenDisplay() & -* XCloseDisplay() everytime the main display needs to be used. -* -* Note that this is almost certainly not thread safe. */ Display *getXDisplay(void); +int XDisplayOpen(char *input); +void XDisplayClose(void); void XMove(int x, int y); void XScroll(int x, int y); @@ -32,9 +28,6 @@ void XSetScreenConfiguration(int index, short rate); int XGetScreenSize(); short XGetScreenRate(); -void XDisplayClose(void); -void XDisplaySet(char *input); - void SetKeyboardLayout(char *layout); void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock); From a8173ce02fec6ac5d55c35e2d2ce2b15875c9124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 4 Nov 2020 00:27:47 +0100 Subject: [PATCH 072/876] change screen size only on desktop. --- cmd/serve.go | 1 + internal/api/room/screen.go | 2 +- internal/capture/manager.go | 30 +++++-------------- internal/config/capture.go | 31 ------------------- internal/config/desktop.go | 45 ++++++++++++++++++++++++++++ internal/desktop/manager.go | 22 +++++++++++++- internal/desktop/xorg.go | 13 +++++--- internal/types/capture.go | 2 -- internal/types/desktop.go | 1 + internal/websocket/handler/screen.go | 2 +- neko.go | 3 ++ 11 files changed, 90 insertions(+), 62 deletions(-) create mode 100644 internal/config/desktop.go diff --git a/cmd/serve.go b/cmd/serve.go index 81d2cdd0..09352739 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -17,6 +17,7 @@ func init() { } configs := []config.Config{ + neko.Service.Configs.Desktop, neko.Service.Configs.Capture, neko.Service.Configs.WebRTC, neko.Service.Configs.Session, diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 6f762d5e..0e8d6c9b 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -48,7 +48,7 @@ func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.R return } - if err := h.capture.ChangeResolution(data.Width, data.Height, data.Rate); err != nil { + if err := h.desktop.ChangeScreenSize(data.Width, data.Height, data.Rate); err != nil { _ = render.Render(w, r, utils.ErrUnprocessableEntity(err)) return } diff --git a/internal/capture/manager.go b/internal/capture/manager.go index cdf9d067..cd83b89e 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -1,8 +1,6 @@ package capture import ( - "fmt" - "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -42,15 +40,15 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt } func (manager *CaptureManagerCtx) Start() { - manager.logger.Info(). - Str("screen_resolution", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). - Msgf("Setting screen resolution...") - - if err := manager.desktop.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { - manager.logger.Warn().Err(err).Msg("unable to change screen size") - } - manager.StartBroadcastPipeline() + + manager.desktop.OnScreenSizeChange(func(width int, height int, rate int) { + manager.video_stop <- true + manager.StopBroadcastPipeline() + + manager.createVideoPipeline() + manager.StartBroadcastPipeline() + }) } func (manager *CaptureManagerCtx) Shutdown() error { @@ -102,18 +100,6 @@ func (manager *CaptureManagerCtx) Streaming() bool { return manager.streaming } -func (manager *CaptureManagerCtx) ChangeResolution(width int, height int, rate int) error { - manager.video_stop <- true - manager.StopBroadcastPipeline() - - defer func() { - manager.createVideoPipeline() - manager.StartBroadcastPipeline() - }() - - return manager.desktop.ChangeScreenSize(width, height, rate) -} - func (manager *CaptureManagerCtx) createVideoPipeline() { var err error diff --git a/internal/config/capture.go b/internal/config/capture.go index 500f7df5..5d6ea659 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -1,9 +1,6 @@ package config import ( - "regexp" - "strconv" - "github.com/pion/webrtc/v2" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -16,9 +13,6 @@ type Capture struct { AudioParams string VideoCodec string VideoParams string - ScreenWidth int - ScreenHeight int - ScreenRate int BroadcastPipeline string } @@ -43,11 +37,6 @@ func (Capture) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().String("screen", "1280x720@30", "default screen resolution and framerate") - if err := viper.BindPFlag("screen", cmd.PersistentFlags().Lookup("screen")); err != nil { - return err - } - // video codecs cmd.PersistentFlags().Bool("vp8", false, "use VP8 video codec") if err := viper.BindPFlag("vp8", cmd.PersistentFlags().Lookup("vp8")); err != nil { @@ -121,25 +110,5 @@ func (s *Capture) Set() { s.Display = viper.GetString("display") s.VideoCodec = videoCodec s.VideoParams = viper.GetString("video") - - s.ScreenWidth = 1280 - s.ScreenHeight = 720 - s.ScreenRate = 30 - - r := regexp.MustCompile(`([0-9]{1,4})x([0-9]{1,4})@([0-9]{1,3})`) - res := r.FindStringSubmatch(viper.GetString("screen")) - - if len(res) > 0 { - width, err1 := strconv.ParseInt(res[1], 10, 64) - height, err2 := strconv.ParseInt(res[2], 10, 64) - rate, err3 := strconv.ParseInt(res[3], 10, 64) - - if err1 == nil && err2 == nil && err3 == nil { - s.ScreenWidth = int(width) - s.ScreenHeight = int(height) - s.ScreenRate = int(rate) - } - } - s.BroadcastPipeline = viper.GetString("broadcast_pipeline") } diff --git a/internal/config/desktop.go b/internal/config/desktop.go new file mode 100644 index 00000000..bd484b05 --- /dev/null +++ b/internal/config/desktop.go @@ -0,0 +1,45 @@ +package config + +import ( + "regexp" + "strconv" + + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +type Desktop struct { + ScreenWidth int + ScreenHeight int + ScreenRate int +} + +func (Desktop) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().String("screen", "1280x720@30", "default screen size and framerate") + if err := viper.BindPFlag("screen", cmd.PersistentFlags().Lookup("screen")); err != nil { + return err + } + + return nil +} + +func (s *Desktop) Set() { + s.ScreenWidth = 1280 + s.ScreenHeight = 720 + s.ScreenRate = 30 + + r := regexp.MustCompile(`([0-9]{1,4})x([0-9]{1,4})@([0-9]{1,3})`) + res := r.FindStringSubmatch(viper.GetString("screen")) + + if len(res) > 0 { + width, err1 := strconv.ParseInt(res[1], 10, 64) + height, err2 := strconv.ParseInt(res[2], 10, 64) + rate, err3 := strconv.ParseInt(res[3], 10, 64) + + if err1 == nil && err2 == nil && err3 == nil { + s.ScreenWidth = int(width) + s.ScreenHeight = int(height) + s.ScreenRate = int(rate) + } + } +} diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index aac9304b..0238c085 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -1,12 +1,14 @@ package desktop import ( + "fmt" "time" "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "demodesk/neko/internal/config" "demodesk/neko/internal/desktop/xorg" ) @@ -14,15 +16,19 @@ type DesktopManagerCtx struct { logger zerolog.Logger cleanup *time.Ticker shutdown chan bool + emmiter events.EventEmmiter display string + config *config.Desktop } -func New(display string) *DesktopManagerCtx { +func New(display string, config *config.Desktop) *DesktopManagerCtx { return &DesktopManagerCtx{ logger: log.With().Str("module", "desktop").Logger(), cleanup: time.NewTicker(1 * time.Second), shutdown: make(chan bool), + emmiter: events.New(), display: display, + config: config, } } @@ -33,6 +39,14 @@ func (manager *DesktopManagerCtx) Start() { xorg.GetScreenConfigurations() + manager.logger.Info(). + Str("screen_size", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). + Msgf("Setting initial screen size...") + + if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { + manager.logger.Warn().Err(err).Msg("unable to set initial screen size") + } + go func() { defer func() { xorg.DisplayClose() @@ -50,6 +64,12 @@ func (manager *DesktopManagerCtx) Start() { }() } +func (manager *DesktopManagerCtx) OnScreenSizeChange(listener func(width int, height int, rate int)) { + manager.emmiter.On("screen_size_change", func(payload ...interface{}) { + listener(payload[0].(int), payload[1].(int), payload[2].(int)) + }) +} + func (manager *DesktopManagerCtx) Shutdown() error { manager.logger.Info().Msgf("remote shutting down") diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 59e8643b..3f25e53a 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -5,10 +5,6 @@ import ( "demodesk/neko/internal/desktop/xorg" ) -func (manager *DesktopManagerCtx) ChangeScreenSize(width int, height int, rate int) error { - return xorg.ChangeScreenSize(width, height, rate) -} - func (manager *DesktopManagerCtx) Move(x, y int) { xorg.Move(x, y) } @@ -45,6 +41,15 @@ func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize { return xorg.GetScreenSize() } +func (manager *DesktopManagerCtx) ChangeScreenSize(width int, height int, rate int) error { + if err := xorg.ChangeScreenSize(width, height, rate); err != nil { + return err + } + + manager.emmiter.Emit("screen_size_change", width, height, rate) + return nil +} + func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string) { xorg.SetKeyboardLayout(layout) } diff --git a/internal/types/capture.go b/internal/types/capture.go index f54f3191..ca4ddc20 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -19,8 +19,6 @@ type CaptureManager interface { StopStream() Streaming() bool - ChangeResolution(width int, height int, rate int) error - // broacast StartBroadcast(url string) StopBroadcast() diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 34f81647..f9168c23 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -15,6 +15,7 @@ type ScreenConfiguration struct { type DesktopManager interface { Start() Shutdown() error + OnScreenSizeChange(listener func(width int, height int, rate int)) // xorg ChangeScreenSize(width int, height int, rate int) error diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 48dd15ec..d7249d23 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -12,7 +12,7 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc return nil } - if err := h.capture.ChangeResolution(payload.Width, payload.Height, payload.Rate); err != nil { + if err := h.desktop.ChangeScreenSize(payload.Width, payload.Height, payload.Rate); err != nil { h.logger.Warn().Err(err).Msgf("unable to change screen size") return err } diff --git a/neko.go b/neko.go index c91574dd..c01aed72 100644 --- a/neko.go +++ b/neko.go @@ -62,6 +62,7 @@ func init() { }, Configs: &Configs{ Root: &config.Root{}, + Desktop: &config.Desktop{}, Capture: &config.Capture{}, WebRTC: &config.WebRTC{}, Session: &config.Session{}, @@ -101,6 +102,7 @@ func (i *Version) Details() string { type Configs struct { Root *config.Root + Desktop *config.Desktop Capture *config.Capture WebRTC *config.WebRTC Session *config.Session @@ -128,6 +130,7 @@ func (neko *Neko) Preflight() { func (neko *Neko) Start() { neko.desktopManager = desktop.New( neko.Configs.Capture.Display, + neko.Configs.Desktop, ) neko.desktopManager.Start() From e4fa855f7b3a4b47b63a3d2cb013ca1662913b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 4 Nov 2020 00:41:04 +0100 Subject: [PATCH 073/876] linter fix. --- internal/desktop/xorg/xorg.go | 4 +--- internal/session/session.go | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 09805d88..dfe5ebe8 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -35,9 +35,7 @@ func DisplayOpen(display string) error { displayUnsafe := C.CString(display) defer C.free(unsafe.Pointer(displayUnsafe)) - var err C.int - err = C.XDisplayOpen(displayUnsafe) - + err := C.XDisplayOpen(displayUnsafe) if int(err) == 1 { return fmt.Errorf("Could not open display %s.", display) } diff --git a/internal/session/session.go b/internal/session/session.go index b1f7071c..4207a528 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -79,7 +79,7 @@ func (session *SessionCtx) SetConnected(connected bool) { session.socket = nil // TODO: Refactor. - session.manager.Destroy(session.id) + _ = session.manager.Destroy(session.id) } } From a6fd0f3d2577e861c66426f49be38544c89f7429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 7 Nov 2020 17:22:25 +0100 Subject: [PATCH 074/876] fixes "screen size change is sometimes failing". --- internal/capture/manager.go | 106 ++++++++++++++++++------------------ internal/desktop/manager.go | 12 +++- internal/desktop/xorg.go | 10 ++-- internal/types/desktop.go | 3 +- 4 files changed, 67 insertions(+), 64 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index cd83b89e..39990a72 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -11,41 +11,46 @@ import ( ) type CaptureManagerCtx struct { - logger zerolog.Logger - video *gst.Pipeline - audio *gst.Pipeline - broadcast *gst.Pipeline - config *config.Capture - audio_stop chan bool - video_stop chan bool - emmiter events.EventEmmiter - streaming bool - broadcasting bool - broadcast_url string - desktop types.DesktopManager + logger zerolog.Logger + video *gst.Pipeline + audio *gst.Pipeline + broadcast *gst.Pipeline + config *config.Capture + audio_emit_stop chan bool + video_emit_stop chan bool + emmiter events.EventEmmiter + streaming bool + broadcasting bool + broadcast_url string + desktop types.DesktopManager } func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { return &CaptureManagerCtx{ - logger: log.With().Str("module", "capture").Logger(), - audio_stop: make(chan bool), - video_stop: make(chan bool), - emmiter: events.New(), - config: config, - streaming: false, - broadcasting: false, - broadcast_url: "", - desktop: desktop, + logger: log.With().Str("module", "capture").Logger(), + audio_emit_stop: make(chan bool), + video_emit_stop: make(chan bool), + emmiter: events.New(), + config: config, + streaming: false, + broadcasting: false, + broadcast_url: "", + desktop: desktop, } } func (manager *CaptureManagerCtx) Start() { manager.StartBroadcastPipeline() - manager.desktop.OnScreenSizeChange(func(width int, height int, rate int) { - manager.video_stop <- true - manager.StopBroadcastPipeline() + manager.desktop.OnBeforeScreenSizeChange(func() { + manager.video_emit_stop <- true + manager.logger.Info().Msgf("stopping video pipeline") + manager.video.Stop() + manager.StopBroadcastPipeline() + }) + + manager.desktop.OnAfterScreenSizeChange(func() { manager.createVideoPipeline() manager.StartBroadcastPipeline() }) @@ -53,10 +58,7 @@ func (manager *CaptureManagerCtx) Start() { func (manager *CaptureManagerCtx) Shutdown() error { manager.logger.Info().Msgf("capture shutting down") - manager.audio_stop <- true - manager.video_stop <- true - manager.StopBroadcastPipeline() - + manager.StopStream() return nil } @@ -81,7 +83,7 @@ func (manager *CaptureManagerCtx) OnAudioFrame(listener func(sample types.Sample } func (manager *CaptureManagerCtx) StartStream() { - manager.logger.Info().Msgf("Pipelines starting...") + manager.logger.Info().Msgf("starting pipelines") manager.createVideoPipeline() manager.createAudioPipeline() @@ -89,10 +91,16 @@ func (manager *CaptureManagerCtx) StartStream() { } func (manager *CaptureManagerCtx) StopStream() { - manager.logger.Info().Msgf("Pipelines stopping...") + manager.logger.Info().Msgf("stopping pipelines") + + manager.audio_emit_stop <- true + manager.logger.Info().Msgf("stopping video pipeline") + manager.audio.Stop() + + manager.video_emit_stop <- true + manager.logger.Info().Msgf("stopping audio pipeline") + manager.video.Stop() - manager.audio_stop <- true - manager.video_stop <- true manager.streaming = false } @@ -107,7 +115,7 @@ func (manager *CaptureManagerCtx) createVideoPipeline() { Str("video_codec", manager.config.VideoCodec). Str("video_display", manager.config.Display). Str("video_params", manager.config.VideoParams). - Msgf("Creating video pipeline...") + Msgf("creating video pipeline") manager.video, err = gst.CreateAppPipeline( manager.config.VideoCodec, @@ -120,23 +128,18 @@ func (manager *CaptureManagerCtx) createVideoPipeline() { } manager.logger.Info(). - Str("pipeline", manager.video.Src). - Msgf("Starting video pipeline...") + Str("src", manager.video.Src). + Msgf("starting video pipeline...") manager.video.Start() go func() { - manager.logger.Debug().Msg("started emitting video data") - - defer func() { - manager.logger.Debug().Msg("stopped emitting video data") - }() + manager.logger.Debug().Msg("started emitting video samples") for { select { - case <-manager.video_stop: - manager.logger.Info().Msgf("Stopping video pipeline...") - manager.video.Stop() + case <-manager.video_emit_stop: + manager.logger.Debug().Msg("stopped emitting video samples") return case sample := <-manager.video.Sample: manager.emmiter.Emit("video", sample) @@ -152,7 +155,7 @@ func (manager *CaptureManagerCtx) createAudioPipeline() { Str("audio_codec", manager.config.AudioCodec). Str("audio_display", manager.config.Device). Str("audio_params", manager.config.AudioParams). - Msgf("Creating audio pipeline...") + Msgf("creating audio pipeline") manager.audio, err = gst.CreateAppPipeline( manager.config.AudioCodec, @@ -165,23 +168,18 @@ func (manager *CaptureManagerCtx) createAudioPipeline() { } manager.logger.Info(). - Str("pipeline", manager.audio.Src). - Msgf("Starting audio pipeline...") + Str("src", manager.audio.Src). + Msgf("starting audio pipeline") manager.audio.Start() go func() { - manager.logger.Debug().Msg("started emitting audio data") - - defer func() { - manager.logger.Debug().Msg("stopped emitting audio data") - }() + manager.logger.Debug().Msg("started emitting audio samples") for { select { - case <-manager.audio_stop: - manager.logger.Info().Msgf("Stopping audio pipeline...") - manager.audio.Stop() + case <-manager.audio_emit_stop: + manager.logger.Debug().Msg("stopped emitting audio samples") return case sample := <-manager.audio.Sample: manager.emmiter.Emit("audio", sample) diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 0238c085..a475cd7f 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -64,9 +64,15 @@ func (manager *DesktopManagerCtx) Start() { }() } -func (manager *DesktopManagerCtx) OnScreenSizeChange(listener func(width int, height int, rate int)) { - manager.emmiter.On("screen_size_change", func(payload ...interface{}) { - listener(payload[0].(int), payload[1].(int), payload[2].(int)) +func (manager *DesktopManagerCtx) OnBeforeScreenSizeChange(listener func()) { + manager.emmiter.On("before_screen_size_change", func(payload ...interface{}) { + listener() + }) +} + +func (manager *DesktopManagerCtx) OnAfterScreenSizeChange(listener func()) { + manager.emmiter.On("after_screen_size_change", func(payload ...interface{}) { + listener() }) } diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 3f25e53a..c0f20d65 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -42,12 +42,10 @@ func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize { } func (manager *DesktopManagerCtx) ChangeScreenSize(width int, height int, rate int) error { - if err := xorg.ChangeScreenSize(width, height, rate); err != nil { - return err - } - - manager.emmiter.Emit("screen_size_change", width, height, rate) - return nil + manager.emmiter.Emit("before_screen_size_change") + err := xorg.ChangeScreenSize(width, height, rate) + manager.emmiter.Emit("after_screen_size_change") + return err } func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string) { diff --git a/internal/types/desktop.go b/internal/types/desktop.go index f9168c23..69f888b8 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -15,7 +15,8 @@ type ScreenConfiguration struct { type DesktopManager interface { Start() Shutdown() error - OnScreenSizeChange(listener func(width int, height int, rate int)) + OnBeforeScreenSizeChange(listener func()) + OnAfterScreenSizeChange(listener func()) // xorg ChangeScreenSize(width int, height int, rate int) error From e4864b095e8d0435fc6e7d479c1fb04914990f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 7 Nov 2020 20:12:37 +0100 Subject: [PATCH 075/876] http listening not warning. --- internal/http/http.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/http/http.go b/internal/http/http.go index 7ffe76dc..524c2510 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -85,7 +85,7 @@ func (s *ServerCtx) Start() { s.logger.Panic().Err(err).Msg("unable to start http server") } }() - s.logger.Warn().Msgf("http listening on %s", s.http.Addr) + s.logger.Info().Msgf("http listening on %s", s.http.Addr) } } From dd8867615e31a3ff9613e98ea9396ded1dde648a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Nov 2020 17:34:53 +0100 Subject: [PATCH 076/876] fix naming convention. --- internal/http/{http.go => manager.go} | 10 +++++----- internal/webrtc/{webrtc.go => manager.go} | 0 neko.go | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) rename internal/http/{http.go => manager.go} (92%) rename internal/webrtc/{webrtc.go => manager.go} (100%) diff --git a/internal/http/http.go b/internal/http/manager.go similarity index 92% rename from internal/http/http.go rename to internal/http/manager.go index 524c2510..dd5dd37a 100644 --- a/internal/http/http.go +++ b/internal/http/manager.go @@ -16,14 +16,14 @@ import ( "demodesk/neko/internal/http/endpoint" ) -type ServerCtx struct { +type HttpManagerCtx struct { logger zerolog.Logger router *chi.Mux http *http.Server conf *config.Server } -func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, conf *config.Server) *ServerCtx { +func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, conf *config.Server) *HttpManagerCtx { logger := log.With().Str("module", "http").Logger() router := chi.NewRouter() @@ -63,7 +63,7 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c Handler: router, } - return &ServerCtx{ + return &HttpManagerCtx{ logger: logger, router: router, http: http, @@ -71,7 +71,7 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c } } -func (s *ServerCtx) Start() { +func (s *HttpManagerCtx) Start() { if s.conf.Cert != "" && s.conf.Key != "" { go func() { if err := s.http.ListenAndServeTLS(s.conf.Cert, s.conf.Key); err != http.ErrServerClosed { @@ -89,6 +89,6 @@ func (s *ServerCtx) Start() { } } -func (s *ServerCtx) Shutdown() error { +func (s *HttpManagerCtx) Shutdown() error { return s.http.Shutdown(context.Background()) } diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/manager.go similarity index 100% rename from internal/webrtc/webrtc.go rename to internal/webrtc/manager.go diff --git a/neko.go b/neko.go index c01aed72..0cf4db37 100644 --- a/neko.go +++ b/neko.go @@ -120,7 +120,7 @@ type Neko struct { sessionManager *session.SessionManagerCtx webSocketManager *websocket.WebSocketManagerCtx apiManager *api.ApiManagerCtx - server *http.ServerCtx + httpManager *http.HttpManagerCtx } func (neko *Neko) Preflight() { @@ -167,12 +167,12 @@ func (neko *Neko) Start() { neko.Configs.Server, ) - neko.server = http.New( + neko.httpManager = http.New( neko.webSocketManager, neko.apiManager, neko.Configs.Server, ) - neko.server.Start() + neko.httpManager.Start() } func (neko *Neko) Shutdown() { @@ -200,10 +200,10 @@ func (neko *Neko) Shutdown() { neko.logger.Debug().Msg("websocket manager shutdown") } - if err := neko.server.Shutdown(); err != nil { - neko.logger.Err(err).Msg("server shutdown with an error") + if err := neko.httpManager.Shutdown(); err != nil { + neko.logger.Err(err).Msg("http manager shutdown with an error") } else { - neko.logger.Debug().Msg("server shutdown") + neko.logger.Debug().Msg("http manager shutdown") } } From ff97242bac6dd1abf918568bea6b604aabc21e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Nov 2020 17:42:04 +0100 Subject: [PATCH 077/876] normalize logs. --- internal/capture/broadcast.go | 6 +++--- internal/capture/manager.go | 2 +- internal/desktop/manager.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 3f9ce0a5..19b08508 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -15,7 +15,7 @@ func (manager *CaptureManagerCtx) StartBroadcastPipeline() { Str("audio_device", manager.config.Device). Str("video_display", manager.config.Display). Str("broadcast_pipeline", manager.config.BroadcastPipeline). - Msgf("Creating broadcast pipeline...") + Msgf("creating broadcast pipeline") manager.broadcast, err = gst.CreateRTMPPipeline( manager.config.Device, @@ -29,7 +29,7 @@ func (manager *CaptureManagerCtx) StartBroadcastPipeline() { } manager.broadcast.Play() - manager.logger.Info().Msgf("Starting broadcast pipeline...") + manager.logger.Info().Msgf("starting broadcast pipeline") } func (manager *CaptureManagerCtx) StopBroadcastPipeline() { @@ -38,7 +38,7 @@ func (manager *CaptureManagerCtx) StopBroadcastPipeline() { } manager.broadcast.Stop() - manager.logger.Info().Msgf("Stopping broadcast pipeline...") + manager.logger.Info().Msgf("stopping broadcast pipeline") manager.broadcast = nil } diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 39990a72..ce14a76d 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -129,7 +129,7 @@ func (manager *CaptureManagerCtx) createVideoPipeline() { manager.logger.Info(). Str("src", manager.video.Src). - Msgf("starting video pipeline...") + Msgf("starting video pipeline") manager.video.Start() diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index a475cd7f..2a1cde0d 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -41,7 +41,7 @@ func (manager *DesktopManagerCtx) Start() { manager.logger.Info(). Str("screen_size", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). - Msgf("Setting initial screen size...") + Msgf("setting initial screen size") if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { manager.logger.Warn().Err(err).Msg("unable to set initial screen size") @@ -77,7 +77,7 @@ func (manager *DesktopManagerCtx) OnAfterScreenSizeChange(listener func()) { } func (manager *DesktopManagerCtx) Shutdown() error { - manager.logger.Info().Msgf("remote shutting down") + manager.logger.Info().Msgf("desktop shutting down") manager.cleanup.Stop() manager.shutdown <- true From 9c26f35c7632503b59763eb1c4b14197c18d7b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Nov 2020 21:23:48 +0100 Subject: [PATCH 078/876] destroy pipelines func. --- internal/capture/manager.go | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index ce14a76d..0609845c 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -43,10 +43,7 @@ func (manager *CaptureManagerCtx) Start() { manager.StartBroadcastPipeline() manager.desktop.OnBeforeScreenSizeChange(func() { - manager.video_emit_stop <- true - manager.logger.Info().Msgf("stopping video pipeline") - manager.video.Stop() - + manager.destroyVideoPipeline() manager.StopBroadcastPipeline() }) @@ -93,14 +90,8 @@ func (manager *CaptureManagerCtx) StartStream() { func (manager *CaptureManagerCtx) StopStream() { manager.logger.Info().Msgf("stopping pipelines") - manager.audio_emit_stop <- true - manager.logger.Info().Msgf("stopping video pipeline") - manager.audio.Stop() - - manager.video_emit_stop <- true - manager.logger.Info().Msgf("stopping audio pipeline") - manager.video.Stop() - + manager.destroyVideoPipeline() + manager.destroyAudioPipeline() manager.streaming = false } @@ -148,6 +139,12 @@ func (manager *CaptureManagerCtx) createVideoPipeline() { }() } +func (manager *CaptureManagerCtx) destroyVideoPipeline() { + manager.video_emit_stop <- true + manager.logger.Info().Msgf("stopping video pipeline") + manager.video.Stop() +} + func (manager *CaptureManagerCtx) createAudioPipeline() { var err error @@ -187,3 +184,9 @@ func (manager *CaptureManagerCtx) createAudioPipeline() { } }() } + +func (manager *CaptureManagerCtx) destroyAudioPipeline() { + manager.audio_emit_stop <- true + manager.logger.Info().Msgf("stopping audio pipeline") + manager.audio.Stop() +} From bd45e81afe792118a9b080aa754cf73c5d78d6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Nov 2020 22:22:44 +0100 Subject: [PATCH 079/876] fixes "Fast changing screen size crashes neko". --- internal/capture/manager.go | 61 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 0609845c..dae54eb7 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -16,8 +16,10 @@ type CaptureManagerCtx struct { audio *gst.Pipeline broadcast *gst.Pipeline config *config.Capture - audio_emit_stop chan bool - video_emit_stop chan bool + emit_update chan bool + emit_stop chan bool + video_sample chan types.Sample + audio_sample chan types.Sample emmiter events.EventEmmiter streaming bool broadcasting bool @@ -28,8 +30,8 @@ type CaptureManagerCtx struct { func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { return &CaptureManagerCtx{ logger: log.With().Str("module", "capture").Logger(), - audio_emit_stop: make(chan bool), - video_emit_stop: make(chan bool), + emit_update: make(chan bool), + emit_stop: make(chan bool), emmiter: events.New(), config: config, streaming: false, @@ -51,10 +53,29 @@ func (manager *CaptureManagerCtx) Start() { manager.createVideoPipeline() manager.StartBroadcastPipeline() }) + + go func() { + manager.logger.Debug().Msg("started emitting samples") + + for { + select { + case <-manager.emit_stop: + manager.logger.Debug().Msg("stopped emitting samples") + return + case <-manager.emit_update: + manager.logger.Debug().Msg("update emitting samples") + case sample := <-manager.video_sample: + manager.emmiter.Emit("video", sample) + case sample := <-manager.audio_sample: + manager.emmiter.Emit("audio", sample) + } + } + }() } func (manager *CaptureManagerCtx) Shutdown() error { manager.logger.Info().Msgf("capture shutting down") + manager.emit_stop <- true manager.StopStream() return nil } @@ -124,23 +145,11 @@ func (manager *CaptureManagerCtx) createVideoPipeline() { manager.video.Start() - go func() { - manager.logger.Debug().Msg("started emitting video samples") - - for { - select { - case <-manager.video_emit_stop: - manager.logger.Debug().Msg("stopped emitting video samples") - return - case sample := <-manager.video.Sample: - manager.emmiter.Emit("video", sample) - } - } - }() + manager.video_sample = manager.video.Sample + manager.emit_update <-true } func (manager *CaptureManagerCtx) destroyVideoPipeline() { - manager.video_emit_stop <- true manager.logger.Info().Msgf("stopping video pipeline") manager.video.Stop() } @@ -170,23 +179,11 @@ func (manager *CaptureManagerCtx) createAudioPipeline() { manager.audio.Start() - go func() { - manager.logger.Debug().Msg("started emitting audio samples") - - for { - select { - case <-manager.audio_emit_stop: - manager.logger.Debug().Msg("stopped emitting audio samples") - return - case sample := <-manager.audio.Sample: - manager.emmiter.Emit("audio", sample) - } - } - }() + manager.audio_sample = manager.audio.Sample + manager.emit_update <-true } func (manager *CaptureManagerCtx) destroyAudioPipeline() { - manager.audio_emit_stop <- true manager.logger.Info().Msgf("stopping audio pipeline") manager.audio.Stop() } From d09b6dcb10f2205dafa2900620f97b81b119f232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 13:46:12 +0100 Subject: [PATCH 080/876] broadcast naming convention & on destroy. --- internal/capture/broadcast.go | 42 +++++++++++++++++------------------ internal/capture/manager.go | 10 +++++---- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 19b08508..28a3a7d8 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -4,7 +4,26 @@ import ( "demodesk/neko/internal/capture/gst" ) -func (manager *CaptureManagerCtx) StartBroadcastPipeline() { +func (manager *CaptureManagerCtx) StartBroadcast(url string) { + manager.broadcast_url = url + manager.broadcasting = true + manager.createBroadcastPipeline() +} + +func (manager *CaptureManagerCtx) StopBroadcast() { + manager.broadcasting = false + manager.destroyBroadcastPipeline() +} + +func (manager *CaptureManagerCtx) BroadcastEnabled() bool { + return manager.broadcasting +} + +func (manager *CaptureManagerCtx) BroadcastUrl() string { + return manager.broadcast_url +} + +func (manager *CaptureManagerCtx) createBroadcastPipeline() { var err error if manager.broadcast != nil || !manager.BroadcastEnabled() { @@ -32,7 +51,7 @@ func (manager *CaptureManagerCtx) StartBroadcastPipeline() { manager.logger.Info().Msgf("starting broadcast pipeline") } -func (manager *CaptureManagerCtx) StopBroadcastPipeline() { +func (manager *CaptureManagerCtx) destroyBroadcastPipeline() { if manager.broadcast == nil { return } @@ -41,22 +60,3 @@ func (manager *CaptureManagerCtx) StopBroadcastPipeline() { manager.logger.Info().Msgf("stopping broadcast pipeline") manager.broadcast = nil } - -func (manager *CaptureManagerCtx) StartBroadcast(url string) { - manager.broadcast_url = url - manager.broadcasting = true - manager.StartBroadcastPipeline() -} - -func (manager *CaptureManagerCtx) StopBroadcast() { - manager.broadcasting = false - manager.StopBroadcastPipeline() -} - -func (manager *CaptureManagerCtx) BroadcastEnabled() bool { - return manager.broadcasting -} - -func (manager *CaptureManagerCtx) BroadcastUrl() string { - return manager.broadcast_url -} diff --git a/internal/capture/manager.go b/internal/capture/manager.go index dae54eb7..1feb688c 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -42,16 +42,16 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt } func (manager *CaptureManagerCtx) Start() { - manager.StartBroadcastPipeline() + manager.createBroadcastPipeline() manager.desktop.OnBeforeScreenSizeChange(func() { manager.destroyVideoPipeline() - manager.StopBroadcastPipeline() + manager.destroyBroadcastPipeline() }) manager.desktop.OnAfterScreenSizeChange(func() { manager.createVideoPipeline() - manager.StartBroadcastPipeline() + manager.createBroadcastPipeline() }) go func() { @@ -75,8 +75,10 @@ func (manager *CaptureManagerCtx) Start() { func (manager *CaptureManagerCtx) Shutdown() error { manager.logger.Info().Msgf("capture shutting down") - manager.emit_stop <- true manager.StopStream() + + manager.destroyBroadcastPipeline() + manager.emit_stop <- true return nil } From fdf5839547052416a47351ad4564f29ae45053b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 14:52:15 +0100 Subject: [PATCH 081/876] trim newlines on webrtc logs. --- internal/webrtc/logger.go | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/internal/webrtc/logger.go b/internal/webrtc/logger.go index fd46ca88..cf18302f 100644 --- a/internal/webrtc/logger.go +++ b/internal/webrtc/logger.go @@ -27,23 +27,25 @@ type logger struct { } func (l logger) Trace(msg string) { - l.logger.Trace().Msg(msg) + l.logger.Trace().Msg(strings.TrimSpace(msg)) } func (l logger) Tracef(format string, args ...interface{}) { - l.logger.Trace().Msgf(format, args...) + msg := fmt.Sprintf(format, args...) + l.logger.Trace().Msg(strings.TrimSpace(msg)) } func (l logger) Debug(msg string) { - l.logger.Debug().Msg(msg) + l.logger.Debug().Msg(strings.TrimSpace(msg)) } func (l logger) Debugf(format string, args ...interface{}) { - l.logger.Debug().Msgf(format, args...) + msg := fmt.Sprintf(format, args...) + l.logger.Debug().Msg(strings.TrimSpace(msg)) } func (l logger) Info(msg string) { if strings.Contains(msg, "packetio.Buffer is full") { //l.logger.Panic().Msg(msg) return } - l.logger.Info().Msg(msg) + l.logger.Info().Msg(strings.TrimSpace(msg)) } func (l logger) Infof(format string, args ...interface{}) { msg := fmt.Sprintf(format, args...) @@ -51,19 +53,21 @@ func (l logger) Infof(format string, args ...interface{}) { // l.logger.Panic().Msg(msg) return } - l.logger.Info().Msg(msg) + l.logger.Info().Msg(strings.TrimSpace(msg)) } func (l logger) Warn(msg string) { - l.logger.Warn().Msg(msg) + l.logger.Warn().Msg(strings.TrimSpace(msg)) } func (l logger) Warnf(format string, args ...interface{}) { - l.logger.Warn().Msgf(format, args...) + msg := fmt.Sprintf(format, args...) + l.logger.Warn().Msg(strings.TrimSpace(msg)) } func (l logger) Error(msg string) { - l.logger.Error().Msg(msg) + l.logger.Error().Msg(strings.TrimSpace(msg)) } func (l logger) Errorf(format string, args ...interface{}) { - l.logger.Error().Msgf(format, args...) + msg := fmt.Sprintf(format, args...) + l.logger.Error().Msg(strings.TrimSpace(msg)) } type loggerFactory struct { From e5eaf5c60cd584ddf0f0ef248543c8f9358da997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 16:03:12 +0100 Subject: [PATCH 082/876] session id to session. --- internal/websocket/handler/handler.go | 18 +++++------------- internal/websocket/manager.go | 6 +++--- internal/websocket/websocket.go | 6 ++++-- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index f2ae9e9a..6e34b8df 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -42,7 +42,7 @@ type MessageHandlerCtx struct { locked bool } -func (h *MessageHandlerCtx) Connected(id string, socket types.WebSocket) (bool, string) { +func (h *MessageHandlerCtx) Connected(session types.Session, socket types.WebSocket) (bool, string) { address := socket.Address() if address != "" { ok, banned := h.banned[address] @@ -54,12 +54,9 @@ func (h *MessageHandlerCtx) Connected(id string, socket types.WebSocket) (bool, h.logger.Debug().Msg("no remote address") } - if h.locked { - session, ok := h.sessions.Get(id) - if !ok || !session.Admin() { - h.logger.Debug().Msg("server locked") - return false, "locked" - } + if h.locked && !session.Admin(){ + h.logger.Debug().Msg("server locked") + return false, "locked" } return true, "" @@ -74,17 +71,12 @@ func (h *MessageHandlerCtx) Disconnected(id string) error { return h.sessions.Destroy(id) } -func (h *MessageHandlerCtx) Message(id string, raw []byte) error { +func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { header := message.Message{} if err := json.Unmarshal(raw, &header); err != nil { return err } - session, ok := h.sessions.Get(id) - if !ok { - return errors.Errorf("unknown session id %s", id) - } - switch header.Event { // Signal Events case event.SIGNAL_ANSWER: diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 0a727644..0000af69 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -149,13 +149,13 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e // } socket := &WebSocketCtx{ - id: session.ID(), + session: session, ws: ws, address: ip, connection: connection, } - ok, reason := ws.handler.Connected(session.ID(), socket) + ok, reason := ws.handler.Connected(session, socket) if !ok { // TODO: Refactor if err = connection.WriteJSON(message.Disconnect{ @@ -226,7 +226,7 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types. Str("raw", string(raw)). Msg("received message from client") - if err := ws.handler.Message(session.ID(), raw); err != nil { + if err := ws.handler.Message(session, raw); err != nil { ws.logger.Error().Err(err).Msg("message handler has failed") } case <-cancel: diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index 6dd01327..11645794 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -6,10 +6,12 @@ import ( "sync" "github.com/gorilla/websocket" + + "demodesk/neko/internal/types" ) type WebSocketCtx struct { - id string + session types.Session address string ws *WebSocketManagerCtx connection *websocket.Conn @@ -40,7 +42,7 @@ func (socket *WebSocketCtx) Send(v interface{}) error { } socket.ws.logger.Debug(). - Str("session", socket.id). + Str("session", socket.session.ID()). Str("address", socket.connection.RemoteAddr().String()). Str("raw", string(raw)). Msg("sending message to client") From 7c64e6068a721f5c65bebbd17fb58b5d9cc20c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 16:03:39 +0100 Subject: [PATCH 083/876] minor session changes. --- internal/session/session.go | 2 +- internal/websocket/manager.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 4207a528..70ee941c 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -89,7 +89,7 @@ func (session *SessionCtx) Disconnect(reason string) error { } // TODO: Refcator - if err := session.socket.Send(&message.Disconnect{ + if err := session.Send(&message.Disconnect{ Event: event.SYSTEM_DISCONNECT, Message: reason, }); err != nil { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 0000af69..46d43e60 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -174,14 +174,14 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e Debug(). Str("session", session.ID()). Str("address", connection.RemoteAddr().String()). - Msg("new connection created") + Msg("connection started") defer func() { ws.logger. Debug(). Str("session", session.ID()). Str("address", connection.RemoteAddr().String()). - Msg("session ended") + Msg("connection ended") }() ws.handle(connection, session) From f136a31b03b158597765151bf6400edbe2e20e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 16:09:00 +0100 Subject: [PATCH 084/876] minor refactor ifs. --- internal/websocket/handler/broadcast.go | 14 ++------------ internal/websocket/handler/signal.go | 15 +++------------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/internal/websocket/handler/broadcast.go b/internal/websocket/handler/broadcast.go index 1fa0c766..adb5fe18 100644 --- a/internal/websocket/handler/broadcast.go +++ b/internal/websocket/handler/broadcast.go @@ -13,12 +13,7 @@ func (h *MessageHandlerCtx) boradcastCreate(session types.Session, payload *mess } h.capture.StartBroadcast(payload.URL) - - if err := h.boradcastStatus(session); err != nil { - return err - } - - return nil + return h.boradcastStatus(session) } func (h *MessageHandlerCtx) boradcastDestroy(session types.Session) error { @@ -28,12 +23,7 @@ func (h *MessageHandlerCtx) boradcastDestroy(session types.Session) error { } h.capture.StopBroadcast() - - if err := h.boradcastStatus(session); err != nil { - return err - } - - return nil + return h.boradcastStatus(session) } func (h *MessageHandlerCtx) boradcastStatus(session types.Session) error { diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index b9b76d42..7edbb47f 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -12,25 +12,16 @@ func (h *MessageHandlerCtx) signalProvide(session types.Session) error { return err } - if err := session.Send(message.SignalProvide{ + return session.Send(message.SignalProvide{ Event: event.SIGNAL_PROVIDE, ID: session.ID(), SDP: sdp, Lite: lite, ICE: ice, - }); err != nil { - return err - } - - return nil + }) } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { session.SetName(payload.DisplayName) - - if err := session.SignalAnswer(payload.SDP); err != nil { - return err - } - - return nil + return session.SignalAnswer(payload.SDP) } From a18482b54e10a3c434a4263e3324ac3ee287edc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 17:51:18 +0100 Subject: [PATCH 085/876] use websocket authentication & refactor. --- internal/api/member/handler.go | 6 +-- internal/api/room/clipboard.go | 24 ++-------- internal/api/room/handler.go | 17 +++---- internal/api/room/screen.go | 33 ++++--------- internal/api/router.go | 43 ++++++++++------- internal/api/utils/auth.go | 65 ------------------------- internal/api/utils/error.go | 88 ---------------------------------- internal/config/server.go | 14 ------ internal/utils/http.go | 76 +++++++++++++++++++++++++++++ 9 files changed, 124 insertions(+), 242 deletions(-) delete mode 100644 internal/api/utils/auth.go delete mode 100644 internal/api/utils/error.go create mode 100644 internal/utils/http.go diff --git a/internal/api/member/handler.go b/internal/api/member/handler.go index 82383fed..0f921a85 100644 --- a/internal/api/member/handler.go +++ b/internal/api/member/handler.go @@ -3,7 +3,6 @@ package member import ( "github.com/go-chi/chi" - "demodesk/neko/internal/api/utils" "demodesk/neko/internal/types" ) @@ -21,10 +20,7 @@ func New( } } -func (h *MemberHandler) Router( - usersOnly utils.HttpMiddleware, - adminsOnly utils.HttpMiddleware, -) *chi.Mux { +func (h *MemberHandler) Router() *chi.Mux { r := chi.NewRouter() return r diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index cef06f33..37259fe1 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -3,45 +3,29 @@ package room import ( "net/http" - "github.com/go-chi/render" - - "demodesk/neko/internal/api/utils" + "demodesk/neko/internal/utils" ) type ClipboardData struct { Text string `json:"text"` } -func (a *ClipboardData) Bind(r *http.Request) error { - // Bind will run after the unmarshalling is complete, its a - // good time to focus some post-processing after a decoding. - return nil -} - -func (a *ClipboardData) Render(w http.ResponseWriter, r *http.Request) error { - // Pre-processing before a response is marshalled and sent - // across the wire - return nil -} - func (h *RoomHandler) ClipboardRead(w http.ResponseWriter, r *http.Request) { // TODO: error check? text := h.desktop.ReadClipboard() - render.JSON(w, r, ClipboardData{ + utils.HttpSuccess(w, ClipboardData{ Text: text, }) } func (h *RoomHandler) ClipboardWrite(w http.ResponseWriter, r *http.Request) { data := &ClipboardData{} - if err := render.Bind(r, data); err != nil { - _ = render.Render(w, r, utils.ErrBadRequest(err)) + if !utils.HttpJsonRequest(w, r, data) { return } // TODO: error check? h.desktop.WriteClipboard(data.Text) - - w.WriteHeader(http.StatusNoContent) + utils.HttpSuccess(w) } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 7be10bcc..159755cb 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -3,7 +3,6 @@ package room import ( "github.com/go-chi/chi" - "demodesk/neko/internal/api/utils" "demodesk/neko/internal/types" ) @@ -27,20 +26,18 @@ func New( } } -func (h *RoomHandler) Router( - usersOnly utils.HttpMiddleware, - adminsOnly utils.HttpMiddleware, -) *chi.Mux { +func (h *RoomHandler) Router() *chi.Mux { r := chi.NewRouter() - + + // TODO: Authorizaton. r.Route("/screen", func(r chi.Router) { - r.With(usersOnly).Get("/", h.ScreenConfiguration) - r.With(adminsOnly).Post("/", h.ScreenConfigurationChange) + r.Get("/", h.ScreenConfiguration) + r.Post("/", h.ScreenConfigurationChange) - r.With(adminsOnly).Get("/configurations", h.ScreenConfigurationsList) + r.Get("/configurations", h.ScreenConfigurationsList) }) - r.With(adminsOnly).Route("/clipboard", func(r chi.Router) { + r.Route("/clipboard", func(r chi.Router) { r.Get("/", h.ClipboardRead) r.Post("/", h.ClipboardWrite) }) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 0e8d6c9b..b22808bf 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -3,9 +3,7 @@ package room import ( "net/http" - "github.com/go-chi/render" - - "demodesk/neko/internal/api/utils" + "demodesk/neko/internal/utils" ) type ScreenConfiguration struct { @@ -14,27 +12,15 @@ type ScreenConfiguration struct { Rate int `json:"rate"` } -func (a *ScreenConfiguration) Bind(r *http.Request) error { - // Bind will run after the unmarshalling is complete, its a - // good time to focus some post-processing after a decoding. - return nil -} - -func (a *ScreenConfiguration) Render(w http.ResponseWriter, r *http.Request) error { - // Pre-processing before a response is marshalled and sent - // across the wire - return nil -} - func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request) { size := h.desktop.GetScreenSize() if size == nil { - _ = render.Render(w, r, utils.ErrMessage(500, "Unable to get screen configuration.")) + utils.HttpInternalServer(w, "Unable to get screen configuration.") return } - render.JSON(w, r, ScreenConfiguration{ + utils.HttpSuccess(w, ScreenConfiguration{ Width: size.Width, Height: size.Height, Rate: int(size.Rate), @@ -43,28 +29,27 @@ func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.Request) { data := &ScreenConfiguration{} - if err := render.Bind(r, data); err != nil { - _ = render.Render(w, r, utils.ErrBadRequest(err)) + if !utils.HttpJsonRequest(w, r, data) { return } if err := h.desktop.ChangeScreenSize(data.Width, data.Height, data.Rate); err != nil { - _ = render.Render(w, r, utils.ErrUnprocessableEntity(err)) + utils.HttpUnprocessableEntity(w, err) return } // TODO: Broadcast change to all sessions. - render.JSON(w, r, data) + utils.HttpSuccess(w, data) } func (h *RoomHandler) ScreenConfigurationsList(w http.ResponseWriter, r *http.Request) { - list := []render.Renderer{} + list := []ScreenConfiguration{} ScreenConfigurations := h.desktop.ScreenConfigurations() for _, size := range ScreenConfigurations { for _, fps := range size.Rates { - list = append(list, &ScreenConfiguration{ + list = append(list, ScreenConfiguration{ Width: size.Width, Height: size.Height, Rate: int(fps), @@ -72,5 +57,5 @@ func (h *RoomHandler) ScreenConfigurationsList(w http.ResponseWriter, r *http.Re } } - _ = render.RenderList(w, r, list) + utils.HttpSuccess(w, list) } diff --git a/internal/api/router.go b/internal/api/router.go index 247144b9..735dd64a 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -1,6 +1,7 @@ package api import ( + "context" "net/http" "github.com/go-chi/chi" @@ -8,8 +9,8 @@ import ( "demodesk/neko/internal/api/member" "demodesk/neko/internal/api/room" "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" "demodesk/neko/internal/config" - "demodesk/neko/internal/api/utils" ) type ApiManagerCtx struct { @@ -18,8 +19,9 @@ type ApiManagerCtx struct { capture types.CaptureManager } -var AdminToken []byte -var UserToken []byte +const ( + keySessionCtx int = iota +) func New( sessions types.SessionManager, @@ -27,8 +29,6 @@ func New( capture types.CaptureManager, conf *config.Server, ) *ApiManagerCtx { - AdminToken = []byte(conf.AdminToken) - UserToken = []byte(conf.UserToken) return &ApiManagerCtx{ sessions: sessions, @@ -37,18 +37,29 @@ func New( } } -func (a *ApiManagerCtx) Mount(r *chi.Mux) { - memberHandler := member.New(a.sessions) - r.Mount("/member", memberHandler.Router(UsersOnly, AdminsOnly)) +func (api *ApiManagerCtx) Mount(r *chi.Mux) { + r.Use(api.Authenticate) - roomHandler := room.New(a.sessions, a.desktop, a.capture) - r.Mount("/room", roomHandler.Router(UsersOnly, AdminsOnly)) + memberHandler := member.New(api.sessions) + r.Mount("/member", memberHandler.Router()) + + roomHandler := room.New(api.sessions, api.desktop, api.capture) + r.Mount("/room", roomHandler.Router()) + + r.Get("/test", func(w http.ResponseWriter, r *http.Request) { + session, _ := r.Context().Value(keySessionCtx).(types.Session) + utils.HttpBadRequest(w, "Hi `" + session.ID() + "`, you are authenticated.") + }) } -func UsersOnly(next http.Handler) http.Handler { - return utils.AuthMiddleware(next, UserToken, AdminToken) -} - -func AdminsOnly(next http.Handler) http.Handler { - return utils.AuthMiddleware(next, AdminToken) +func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + session, err := api.sessions.Authenticate(r) + if err != nil { + utils.HttpNotAuthenticated(w, err) + } else { + ctx := context.WithValue(r.Context(), keySessionCtx, session) + next.ServeHTTP(w, r.WithContext(ctx)) + } + }) } diff --git a/internal/api/utils/auth.go b/internal/api/utils/auth.go deleted file mode 100644 index 8d25bbfe..00000000 --- a/internal/api/utils/auth.go +++ /dev/null @@ -1,65 +0,0 @@ -package utils - -import ( - "context" - "fmt" - "net/http" - "strings" - - "github.com/go-chi/render" - "github.com/dgrijalva/jwt-go" -) - -type key int - -const ( - keyPrincipalID key = iota -) - -func GetUserName(r *http.Request) interface{} { - props, _ := r.Context().Value(keyPrincipalID).(jwt.MapClaims) - return props["user_name"] -} - -type HttpMiddleware = func(next http.Handler) http.Handler - -func AuthMiddleware(next http.Handler, jwtSecrets ...[]byte) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - authHeader := strings.Split(r.Header.Get("Authorization"), "Bearer ") - if len(authHeader) != 2 { - _ = render.Render(w, r, ErrMessage(401, "Malformed JWT token.")) - return - } - - jwtToken := authHeader[1] - var jwtVerified *jwt.Token - var err error - for _, jwtSecret := range jwtSecrets { - jwtVerified, err = jwt.Parse(jwtToken, func(token *jwt.Token) (interface{}, error) { - if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok { - return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"]) - } - - return jwtSecret, nil - }) - - if err == nil { - break - } - } - - if err != nil { - _ = render.Render(w, r, ErrMessage(401, "Invalid JWT token.")) - return - } - - if claims, ok := jwtVerified.Claims.(jwt.MapClaims); ok && jwtVerified.Valid { - ctx := context.WithValue(r.Context(), keyPrincipalID, claims) - // Access context values in handlers like this - // props, _ := r.Context().Value("props").(jwt.MapClaims) - next.ServeHTTP(w, r.WithContext(ctx)) - } else { - _ = render.Render(w, r, ErrMessage(401, "Unauthorized.")) - } - }) -} diff --git a/internal/api/utils/error.go b/internal/api/utils/error.go deleted file mode 100644 index 05ee8ed3..00000000 --- a/internal/api/utils/error.go +++ /dev/null @@ -1,88 +0,0 @@ -package utils - -import ( - "net/http" - - "github.com/go-chi/render" -) - -//-- -// Error response payloads & renderers -//-- - -// ErrResponse renderer type for handling all sorts of errors. -// -// In the best case scenario, the excellent github.com/pkg/errors package -// helps reveal information on the error, setting it on Err, and in the Render() -// method, using it to set the application-specific error code in AppCode. -type ErrResponse struct { - Err error `json:"-"` // low-level runtime error - HTTPStatusCode int `json:"-"` // http response status code - - StatusText string `json:"status"` // user-level status message - AppCode int64 `json:"code,omitempty"` // application-specific error code - ErrorText string `json:"error,omitempty"` // application-level error message, for debugging -} - -func (e *ErrResponse) Render(w http.ResponseWriter, r *http.Request) error { - render.Status(r, e.HTTPStatusCode) - return nil -} - -func ErrMessage(HTTPStatusCode int, StatusText string) render.Renderer { - return &ErrResponse{ - HTTPStatusCode: HTTPStatusCode, - StatusText: StatusText, - } -} - -func ErrBadRequest(err error) render.Renderer { - return &ErrResponse{ - Err: err, - HTTPStatusCode: 400, - StatusText: "Bad request.", - ErrorText: err.Error(), - } -} - -func ErrUnprocessableEntity(err error) render.Renderer { - return &ErrResponse{ - Err: err, - HTTPStatusCode: 400, - StatusText: "Unprocessable Entity.", - ErrorText: err.Error(), - } -} - -func ErrInternalServer(err error) render.Renderer { - return &ErrResponse{ - Err: err, - HTTPStatusCode: 500, - StatusText: "Internal server error.", - ErrorText: err.Error(), - } -} - -func ErrNot(err error) render.Renderer { - return &ErrResponse{ - Err: err, - HTTPStatusCode: 422, - StatusText: "Error rendering response.", - ErrorText: err.Error(), - } -} - -var ErrNotAuthenticated = &ErrResponse{ - HTTPStatusCode: 401, - StatusText: "Invalid or missing access token.", -} - -var ErrNotAuthorized = &ErrResponse{ - HTTPStatusCode: 403, - StatusText: "Access token does not have the required scope.", -} - -var ErrNotFound = &ErrResponse{ - HTTPStatusCode: 404, - StatusText: "Resource not found.", -} diff --git a/internal/config/server.go b/internal/config/server.go index eab02938..0153dce4 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -11,8 +11,6 @@ type Server struct { Bind string Static string //Proxy bool - UserToken string - AdminToken string } func (Server) Init(cmd *cobra.Command) error { @@ -41,16 +39,6 @@ func (Server) Init(cmd *cobra.Command) error { // return err //} - cmd.PersistentFlags().String("user_token", "user_secret", "JWT token for users") - if err := viper.BindPFlag("user_token", cmd.PersistentFlags().Lookup("user_token")); err != nil { - return err - } - - cmd.PersistentFlags().String("admin_token", "admin_secret", "JWT token for admins") - if err := viper.BindPFlag("admin_token", cmd.PersistentFlags().Lookup("admin_token")); err != nil { - return err - } - return nil } @@ -60,6 +48,4 @@ func (s *Server) Set() { s.Bind = viper.GetString("bind") s.Static = viper.GetString("static") //s.Proxy = viper.GetBool("proxy") - s.UserToken = viper.GetString("user_token") - s.AdminToken = viper.GetString("admin_token") } diff --git a/internal/utils/http.go b/internal/utils/http.go new file mode 100644 index 00000000..0ec6d255 --- /dev/null +++ b/internal/utils/http.go @@ -0,0 +1,76 @@ +package utils + +import ( + "fmt" + "net/http" + "encoding/json" +) + +type ErrResponse struct { + Message string `json:"message"` +} + +func HttpJsonRequest(w http.ResponseWriter, r *http.Request, res interface{}) bool { + if err := json.NewDecoder(r.Body).Decode(res); err != nil { + HttpBadRequest(w, err) + return false + } + + return true +} + +func HttpJsonResponse(w http.ResponseWriter, status int, res interface{}) { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(status) + + if err := json.NewEncoder(w).Encode(res); err != nil { + // TODO: Log. + //log.Warn().Err(err).Msg("failed writing json error response") + } +} + +func HttpError(w http.ResponseWriter, status int, res interface{}) { + HttpJsonResponse(w, status, &ErrResponse{ + Message: fmt.Sprint(res), + }) +} + +func HttpSuccess(w http.ResponseWriter, res ...interface{}) { + if len(res) == 0 { + w.WriteHeader(http.StatusNoContent) + } else { + HttpJsonResponse(w, http.StatusOK, res[0]) + } +} + +func HttpBadRequest(w http.ResponseWriter, res ...interface{}) { + defHttpError(w, http.StatusBadRequest, "Bad Request.", res...) +} + +func HttpNotAuthenticated(w http.ResponseWriter, res ...interface{}) { + defHttpError(w, http.StatusUnauthorized, "Invalid or missing access token.", res...) +} + +func HttpNotAuthorized(w http.ResponseWriter, res ...interface{}) { + defHttpError(w, http.StatusForbidden, "Access token does not have the required scope.", res...) +} + +func HttpNotFound(w http.ResponseWriter, res ...interface{}) { + defHttpError(w, http.StatusNotFound, "Resource not found.", res...) +} + +func HttpUnprocessableEntity(w http.ResponseWriter, res ...interface{}) { + defHttpError(w, http.StatusUnprocessableEntity, "Unprocessable Entity.", res...) +} + +func HttpInternalServer(w http.ResponseWriter, res ...interface{}) { + defHttpError(w, http.StatusInternalServerError, "Internal server error.", res...) +} + +func defHttpError(w http.ResponseWriter, status int, text string, res ...interface{}) { + if len(res) == 0 { + HttpError(w, status, text) + } else { + HttpError(w, status, res[0]) + } +} From 40b986c8bea96fdef84259e54cbc5d8b99f2e41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 18:16:25 +0100 Subject: [PATCH 086/876] use Chi Router instead of Chi Mux. --- internal/api/member/handler.go | 6 +- internal/api/room/handler.go | 6 +- internal/api/router.go | 6 +- internal/http/endpoint/endpoint.go | 101 ----------------------------- internal/http/endpoint/error.go | 17 ----- internal/http/manager.go | 18 ++--- internal/types/api.go | 2 +- 7 files changed, 13 insertions(+), 143 deletions(-) delete mode 100644 internal/http/endpoint/endpoint.go delete mode 100644 internal/http/endpoint/error.go diff --git a/internal/api/member/handler.go b/internal/api/member/handler.go index 0f921a85..6d35d38a 100644 --- a/internal/api/member/handler.go +++ b/internal/api/member/handler.go @@ -20,8 +20,6 @@ func New( } } -func (h *MemberHandler) Router() *chi.Mux { - r := chi.NewRouter() - - return r +func (h *MemberHandler) Route(r chi.Router) { + } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 159755cb..af9d327d 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -26,9 +26,7 @@ func New( } } -func (h *RoomHandler) Router() *chi.Mux { - r := chi.NewRouter() - +func (h *RoomHandler) Route(r chi.Router) { // TODO: Authorizaton. r.Route("/screen", func(r chi.Router) { r.Get("/", h.ScreenConfiguration) @@ -41,6 +39,4 @@ func (h *RoomHandler) Router() *chi.Mux { r.Get("/", h.ClipboardRead) r.Post("/", h.ClipboardWrite) }) - - return r } diff --git a/internal/api/router.go b/internal/api/router.go index 735dd64a..b96d3052 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -37,14 +37,14 @@ func New( } } -func (api *ApiManagerCtx) Mount(r *chi.Mux) { +func (api *ApiManagerCtx) Route(r chi.Router) { r.Use(api.Authenticate) memberHandler := member.New(api.sessions) - r.Mount("/member", memberHandler.Router()) + r.Route("/member", memberHandler.Route) roomHandler := room.New(api.sessions, api.desktop, api.capture) - r.Mount("/room", roomHandler.Router()) + r.Route("/room", roomHandler.Route) r.Get("/test", func(w http.ResponseWriter, r *http.Request) { session, _ := r.Context().Value(keySessionCtx).(types.Session) diff --git a/internal/http/endpoint/endpoint.go b/internal/http/endpoint/endpoint.go deleted file mode 100644 index 92a29424..00000000 --- a/internal/http/endpoint/endpoint.go +++ /dev/null @@ -1,101 +0,0 @@ -package endpoint - -import ( - "encoding/json" - "fmt" - "net/http" - "runtime/debug" - - "github.com/go-chi/chi/middleware" - "github.com/rs/zerolog/log" -) - -type ( - Endpoint func(http.ResponseWriter, *http.Request) error - - ErrResponse struct { - Status int `json:"status,omitempty"` - Err string `json:"error,omitempty"` - Message string `json:"message,omitempty"` - Details string `json:"details,omitempty"` - Code string `json:"code,omitempty"` - RequestID string `json:"request,omitempty"` - } -) - -func Handle(handler Endpoint) http.HandlerFunc { - fn := func(w http.ResponseWriter, r *http.Request) { - if err := handler(w, r); err != nil { - WriteError(w, r, err) - } - } - - return http.HandlerFunc(fn) -} - -var nonErrorsCodes = map[int]bool{ - 404: true, -} - -func errResponse(input interface{}) *ErrResponse { - var res *ErrResponse - var err interface{} - - //nolint - switch input.(type) { - case *HandlerError: - e := input.(*HandlerError) - res = &ErrResponse{ - Status: e.Status, - Err: http.StatusText(e.Status), - Message: e.Message, - } - err = e.Err - default: - res = &ErrResponse{ - Status: http.StatusInternalServerError, - Err: http.StatusText(http.StatusInternalServerError), - } - err = input - } - - if err != nil { - switch err.(type) { - case *error: - e := err.(error) - res.Details = e.Error() - default: - res.Details = fmt.Sprintf("%+v", err) - } - } - - return res -} - -func WriteError(w http.ResponseWriter, r *http.Request, err interface{}) { - hlog := log.With(). - Str("module", "http"). - Logger() - - res := errResponse(err) - - if reqID := middleware.GetReqID(r.Context()); reqID != "" { - res.RequestID = reqID - } - - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(res.Status) - - if err := json.NewEncoder(w).Encode(res); err != nil { - hlog.Warn().Err(err).Msg("Failed writing json error response") - } - - if !nonErrorsCodes[res.Status] { - logEntry := middleware.GetLogEntry(r) - if logEntry != nil { - logEntry.Panic(err, debug.Stack()) - } else { - hlog.Error().Str("stack", string(debug.Stack())).Msgf("%+v", err) - } - } -} diff --git a/internal/http/endpoint/error.go b/internal/http/endpoint/error.go deleted file mode 100644 index c92000e3..00000000 --- a/internal/http/endpoint/error.go +++ /dev/null @@ -1,17 +0,0 @@ -package endpoint - -import "fmt" - -type HandlerError struct { - Status int - Message string - Err error -} - -func (e *HandlerError) Error() string { - if e.Err != nil { - return fmt.Sprintf("%s: %s", e.Message, e.Err.Error()) - } - - return e.Message -} diff --git a/internal/http/manager.go b/internal/http/manager.go index dd5dd37a..08d33eb6 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -2,7 +2,6 @@ package http import ( "context" - "fmt" "net/http" "os" @@ -13,7 +12,7 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/config" - "demodesk/neko/internal/http/endpoint" + "demodesk/neko/internal/utils" ) type HttpManagerCtx struct { @@ -31,13 +30,11 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c router.Use(middleware.RequestID) // Create a request ID for each request router.Use(Logger) // Log API request calls using custom logger function - ApiManager.Mount(router) + router.Route("/api", ApiManager.Route) router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { - if WebSocketManager.Upgrade(w, r) != nil { - //nolint - w.Write([]byte("unable to upgrade your connection to a websocket")) - } + //nolint + WebSocketManager.Upgrade(w, r) }) if conf.Static != "" { @@ -51,11 +48,8 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c }) } - router.NotFound(endpoint.Handle(func(w http.ResponseWriter, r *http.Request) error { - return &endpoint.HandlerError{ - Status: http.StatusNotFound, - Message: fmt.Sprintf("Endpoint '%s' was not found.", r.RequestURI), - } + router.NotFound(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + utils.HttpNotFound(w) })) http := &http.Server{ diff --git a/internal/types/api.go b/internal/types/api.go index f0efae68..cd821453 100644 --- a/internal/types/api.go +++ b/internal/types/api.go @@ -5,5 +5,5 @@ import ( ) type ApiManager interface { - Mount(r *chi.Mux) + Route(r chi.Router) } From 7524f20cb74abdc14cd377896071feb773eca7e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 18:22:15 +0100 Subject: [PATCH 087/876] http session context helper function. --- internal/api/router.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/api/router.go b/internal/api/router.go index b96d3052..08eabff2 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -47,7 +47,7 @@ func (api *ApiManagerCtx) Route(r chi.Router) { r.Route("/room", roomHandler.Route) r.Get("/test", func(w http.ResponseWriter, r *http.Request) { - session, _ := r.Context().Value(keySessionCtx).(types.Session) + session := GetSession(r) utils.HttpBadRequest(w, "Hi `" + session.ID() + "`, you are authenticated.") }) } @@ -63,3 +63,7 @@ func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { } }) } + +func GetSession(r *http.Request) types.Session { + return r.Context().Value(keySessionCtx).(types.Session) +} From 4a5654f2efa556b84c66e417a779987326dc89cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 18:27:10 +0100 Subject: [PATCH 088/876] fix lint err. --- internal/api/router.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/api/router.go b/internal/api/router.go index 08eabff2..0a205ff2 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -19,8 +19,10 @@ type ApiManagerCtx struct { capture types.CaptureManager } +type key int + const ( - keySessionCtx int = iota + keySessionCtx key = iota ) func New( From 8a9f465d0b93487ec0adcbda6f146d5f2b771606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 18:27:20 +0100 Subject: [PATCH 089/876] add log to http utils. --- internal/utils/http.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/utils/http.go b/internal/utils/http.go index 0ec6d255..901e86b9 100644 --- a/internal/utils/http.go +++ b/internal/utils/http.go @@ -4,6 +4,8 @@ import ( "fmt" "net/http" "encoding/json" + + "github.com/rs/zerolog/log" ) type ErrResponse struct { @@ -24,8 +26,9 @@ func HttpJsonResponse(w http.ResponseWriter, status int, res interface{}) { w.WriteHeader(status) if err := json.NewEncoder(w).Encode(res); err != nil { - // TODO: Log. - //log.Warn().Err(err).Msg("failed writing json error response") + log.Warn().Err(err). + Str("module", "http"). + Msg("failed writing json error response") } } From 1fd53cfb744aac40e188ef76838fbc1a8e9e7a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 22:35:50 +0100 Subject: [PATCH 090/876] CheckKeys() mutex on shared map. --- internal/desktop/xorg/xorg.go | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index dfe5ebe8..0b5ad44e 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -25,6 +25,9 @@ var debounce_key = make(map[uint64]time.Time) var mu = sync.Mutex{} func GetScreenConfigurations() { + mu.Lock() + defer mu.Unlock() + C.XGetScreenConfigurations() } @@ -121,38 +124,40 @@ func KeyUp(code uint64) error { } func ResetKeys() { - for code := range debounce_button { - //nolint - ButtonUp(code) + mu.Lock() + defer mu.Unlock() + for code := range debounce_button { + C.XButton(C.uint(code), C.int(0)) delete(debounce_button, code) } - for code := range debounce_key { - //nolint - KeyUp(code) + for code := range debounce_key { + C.XKey(C.ulong(code), C.int(0)) delete(debounce_key, code) } } func CheckKeys(duration time.Duration) { + mu.Lock() + defer mu.Unlock() + t := time.Now() for code, start := range debounce_button { if t.Sub(start) < duration { continue } - //nolint - ButtonUp(code) + C.XButton(C.uint(code), C.int(0)) delete(debounce_button, code) } + for code, start := range debounce_key { if t.Sub(start) < duration { continue } - //nolint - KeyUp(code) + C.XKey(C.ulong(code), C.int(0)) delete(debounce_key, code) } } From f11c1c5e54718cf66f6e8f8aa2af4cf5968839df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 22:54:35 +0100 Subject: [PATCH 091/876] add hostMu. --- internal/session/manager.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/internal/session/manager.go b/internal/session/manager.go index 9af44f22..03e8a923 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -1,6 +1,8 @@ package session import ( + "sync" + "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -14,6 +16,7 @@ func New(capture types.CaptureManager, config *config.Session) *SessionManagerCt return &SessionManagerCtx{ logger: log.With().Str("module", "session").Logger(), host: nil, + hostMu: sync.Mutex{}, capture: capture, config: config, members: make(map[string]*SessionCtx), @@ -24,6 +27,7 @@ func New(capture types.CaptureManager, config *config.Session) *SessionManagerCt type SessionManagerCtx struct { logger zerolog.Logger host types.Session + hostMu sync.Mutex capture types.CaptureManager config *config.Session members map[string]*SessionCtx @@ -67,19 +71,31 @@ func (manager *SessionManagerCtx) Destroy(id string) error { // host // --- func (manager *SessionManagerCtx) HasHost() bool { + manager.hostMu.Lock() + defer manager.hostMu.Unlock() + return manager.host != nil } func (manager *SessionManagerCtx) SetHost(host types.Session) { + manager.hostMu.Lock() + defer manager.hostMu.Unlock() + manager.host = host manager.emmiter.Emit("host", host) } func (manager *SessionManagerCtx) GetHost() types.Session { + manager.hostMu.Lock() + defer manager.hostMu.Unlock() + return manager.host } func (manager *SessionManagerCtx) ClearHost() { + manager.hostMu.Lock() + defer manager.hostMu.Unlock() + host := manager.host manager.host = nil manager.emmiter.Emit("host_cleared", host) From 0d419787bccad06aa46467ea0837b6e7a2a07086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 23:05:09 +0100 Subject: [PATCH 092/876] add memberMu. --- internal/session/manager.go | 54 ++++++++++++++++++++++++------------- internal/types/session.go | 1 - 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 03e8a923..dbbdbe20 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -14,27 +14,32 @@ import ( func New(capture types.CaptureManager, config *config.Session) *SessionManagerCtx { return &SessionManagerCtx{ - logger: log.With().Str("module", "session").Logger(), - host: nil, - hostMu: sync.Mutex{}, - capture: capture, - config: config, - members: make(map[string]*SessionCtx), - emmiter: events.New(), + logger: log.With().Str("module", "session").Logger(), + host: nil, + hostMu: sync.Mutex{}, + capture: capture, + config: config, + members: make(map[string]*SessionCtx), + membersMu: sync.Mutex{}, + emmiter: events.New(), } } type SessionManagerCtx struct { - logger zerolog.Logger - host types.Session - hostMu sync.Mutex - capture types.CaptureManager - config *config.Session - members map[string]*SessionCtx - emmiter events.EventEmmiter + logger zerolog.Logger + host types.Session + hostMu sync.Mutex + capture types.CaptureManager + config *config.Session + members map[string]*SessionCtx + membersMu sync.Mutex + emmiter events.EventEmmiter } func (manager *SessionManagerCtx) New(id string, admin bool) types.Session { + manager.membersMu.Lock() + defer manager.membersMu.Unlock() + session := &SessionCtx{ id: id, admin: admin, @@ -48,16 +53,17 @@ func (manager *SessionManagerCtx) New(id string, admin bool) types.Session { } func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { + manager.membersMu.Lock() + defer manager.membersMu.Unlock() + session, ok := manager.members[id] return session, ok } -func (manager *SessionManagerCtx) Has(id string) bool { - _, ok := manager.members[id] - return ok -} - func (manager *SessionManagerCtx) Destroy(id string) error { + manager.membersMu.Lock() + defer manager.membersMu.Unlock() + session, ok := manager.members[id] if ok { delete(manager.members, id) @@ -105,6 +111,9 @@ func (manager *SessionManagerCtx) ClearHost() { // members list // --- func (manager *SessionManagerCtx) Admins() []types.Session { + manager.membersMu.Lock() + defer manager.membersMu.Unlock() + var sessions []types.Session for _, session := range manager.members { if !session.connected || !session.admin { @@ -118,6 +127,9 @@ func (manager *SessionManagerCtx) Admins() []types.Session { } func (manager *SessionManagerCtx) Members() []types.Session { + manager.membersMu.Lock() + defer manager.membersMu.Unlock() + var sessions []types.Session for _, session := range manager.members { if !session.connected { @@ -131,6 +143,9 @@ func (manager *SessionManagerCtx) Members() []types.Session { } func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) error { + manager.membersMu.Lock() + defer manager.membersMu.Unlock() + for id, session := range manager.members { if !session.connected { continue @@ -146,6 +161,7 @@ func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) return err } } + return nil } diff --git a/internal/types/session.go b/internal/types/session.go index a80dd9a6..5460c6a4 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -23,7 +23,6 @@ type Session interface { type SessionManager interface { New(id string, admin bool) Session Get(id string) (Session, bool) - Has(id string) bool Destroy(id string) error HasHost() bool From db706097f6e2dcc8ed19208e7379bb09a1d0ebc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 23:14:48 +0100 Subject: [PATCH 093/876] add mutex on streaming and fix "Fail while changing screen size and no users are joined". --- internal/capture/manager.go | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 1feb688c..d48d166c 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -1,6 +1,8 @@ package capture import ( + "sync" + "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -12,6 +14,7 @@ import ( type CaptureManagerCtx struct { logger zerolog.Logger + mu sync.Mutex video *gst.Pipeline audio *gst.Pipeline broadcast *gst.Pipeline @@ -30,6 +33,7 @@ type CaptureManagerCtx struct { func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { return &CaptureManagerCtx{ logger: log.With().Str("module", "capture").Logger(), + mu: sync.Mutex{}, emit_update: make(chan bool), emit_stop: make(chan bool), emmiter: events.New(), @@ -45,12 +49,18 @@ func (manager *CaptureManagerCtx) Start() { manager.createBroadcastPipeline() manager.desktop.OnBeforeScreenSizeChange(func() { - manager.destroyVideoPipeline() + if manager.Streaming() { + manager.destroyVideoPipeline() + } + manager.destroyBroadcastPipeline() }) manager.desktop.OnAfterScreenSizeChange(func() { - manager.createVideoPipeline() + if manager.Streaming() { + manager.createVideoPipeline() + } + manager.createBroadcastPipeline() }) @@ -103,6 +113,9 @@ func (manager *CaptureManagerCtx) OnAudioFrame(listener func(sample types.Sample } func (manager *CaptureManagerCtx) StartStream() { + manager.mu.Lock() + defer manager.mu.Unlock() + manager.logger.Info().Msgf("starting pipelines") manager.createVideoPipeline() @@ -111,6 +124,9 @@ func (manager *CaptureManagerCtx) StartStream() { } func (manager *CaptureManagerCtx) StopStream() { + manager.mu.Lock() + defer manager.mu.Unlock() + manager.logger.Info().Msgf("stopping pipelines") manager.destroyVideoPipeline() @@ -119,6 +135,9 @@ func (manager *CaptureManagerCtx) StopStream() { } func (manager *CaptureManagerCtx) Streaming() bool { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.streaming } From 234b0a2e068d3f2651e38e7442cbe46752b71c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 16:56:03 +0100 Subject: [PATCH 094/876] remove code duplication. --- internal/websocket/handler/handler.go | 98 ++++++++++++--------------- 1 file changed, 45 insertions(+), 53 deletions(-) diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 6e34b8df..34f28773 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -77,101 +77,93 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { return err } + var err error switch header.Event { // Signal Events case event.SIGNAL_ANSWER: payload := &message.SignalAnswer{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.signalAnswer(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.signalAnswer(session, payload) + }) // Control Events case event.CONTROL_RELEASE: - return errors.Wrapf(h.controlRelease(session), "%s failed", header.Event) + err = h.controlRelease(session) case event.CONTROL_REQUEST: - return errors.Wrapf(h.controlRequest(session), "%s failed", header.Event) + err = h.controlRequest(session) case event.CONTROL_GIVE: payload := &message.Control{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.controlGive(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.controlGive(session, payload) + }) case event.CONTROL_CLIPBOARD: payload := &message.Clipboard{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.controlClipboard(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.controlClipboard(session, payload) + }) case event.CONTROL_KEYBOARD: payload := &message.Keyboard{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.controlKeyboard(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.controlKeyboard(session, payload) + }) // Screen Events case event.SCREEN_RESOLUTION: - return errors.Wrapf(h.screenResolution(session), "%s failed", header.Event) + err = h.screenResolution(session) case event.SCREEN_CONFIGURATIONS: - return errors.Wrapf(h.screenConfigurations(session), "%s failed", header.Event) + err = h.screenConfigurations(session) case event.SCREEN_SET: payload := &message.ScreenResolution{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.screenSet(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.screenSet(session, payload) + }) // Boradcast Events case event.BORADCAST_CREATE: payload := &message.BroadcastCreate{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.boradcastCreate(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.boradcastCreate(session, payload) + }) case event.BORADCAST_DESTROY: - return errors.Wrapf(h.boradcastDestroy(session), "%s failed", header.Event) + err = h.boradcastDestroy(session) // Admin Events case event.ADMIN_LOCK: - return errors.Wrapf(h.adminLock(session), "%s failed", header.Event) + err = h.adminLock(session) case event.ADMIN_UNLOCK: - return errors.Wrapf(h.adminUnlock(session), "%s failed", header.Event) + err = h.adminUnlock(session) case event.ADMIN_CONTROL: - return errors.Wrapf(h.adminControl(session), "%s failed", header.Event) + err = h.adminControl(session) case event.ADMIN_RELEASE: - return errors.Wrapf(h.adminRelease(session), "%s failed", header.Event) + err = h.adminRelease(session) case event.ADMIN_GIVE: payload := &message.Admin{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.adminGive(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.adminGive(session, payload) + }) case event.ADMIN_BAN: payload := &message.Admin{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.adminBan(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.adminBan(session, payload) + }) case event.ADMIN_KICK: payload := &message.Admin{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.adminKick(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.adminKick(session, payload) + }) case event.ADMIN_MUTE: payload := &message.Admin{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.adminMute(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.adminMute(session, payload) + }) case event.ADMIN_UNMUTE: payload := &message.Admin{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.adminUnmute(session, payload) - }), "%s failed", header.Event) + err = utils.Unmarshal(payload, raw, func() error { + return h.adminUnmute(session, payload) + }) default: return errors.Errorf("unknown message event %s", header.Event) } + + return errors.Wrapf(err, "%s failed", header.Event) } From b4116751088c4515b6abe44abdac2817f5a00798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 17:48:10 +0100 Subject: [PATCH 095/876] code indentation. --- internal/websocket/handler/screen.go | 15 ++++++++------- internal/websocket/handler/session.go | 9 +++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index d7249d23..f8a58af1 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -17,13 +17,14 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc return err } - if err := h.sessions.Broadcast(message.ScreenResolution{ - Event: event.SCREEN_RESOLUTION, - ID: session.ID(), - Width: payload.Width, - Height: payload.Height, - Rate: payload.Rate, - }, nil); err != nil { + if err := h.sessions.Broadcast( + message.ScreenResolution{ + Event: event.SCREEN_RESOLUTION, + ID: session.ID(), + Width: payload.Width, + Height: payload.Height, + Rate: payload.Rate, + }, nil); err != nil { h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_RESOLUTION) return err } diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 4f788455..825fd77b 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -85,10 +85,11 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { // clear host if exists if session.IsHost() { h.sessions.ClearHost() - if err := h.sessions.Broadcast(message.Control{ - Event: event.CONTROL_RELEASE, - ID: session.ID(), - }, nil); err != nil { + if err := h.sessions.Broadcast( + message.Control{ + Event: event.CONTROL_RELEASE, + ID: session.ID(), + }, nil); err != nil { h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) } } From 316533dab0c4757dd393b415119c40c738ed349d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 18:12:25 +0100 Subject: [PATCH 096/876] remove duplicate error logging. --- internal/websocket/handler/admin.go | 107 +++++++----------------- internal/websocket/handler/broadcast.go | 9 +- internal/websocket/handler/control.go | 57 +++++-------- internal/websocket/handler/screen.go | 43 ++++------ internal/websocket/handler/session.go | 22 ++--- 5 files changed, 70 insertions(+), 168 deletions(-) diff --git a/internal/websocket/handler/admin.go b/internal/websocket/handler/admin.go index f0404e05..f7c818f7 100644 --- a/internal/websocket/handler/admin.go +++ b/internal/websocket/handler/admin.go @@ -21,16 +21,11 @@ func (h *MessageHandlerCtx) adminLock(session types.Session) error { h.locked = true - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.Admin{ Event: event.ADMIN_LOCK, ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_LOCK) - return err - } - - return nil + }, nil) } func (h *MessageHandlerCtx) adminUnlock(session types.Session) error { @@ -46,16 +41,11 @@ func (h *MessageHandlerCtx) adminUnlock(session types.Session) error { h.locked = false - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.Admin{ Event: event.ADMIN_UNLOCK, ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_UNLOCK) - return err - } - - return nil + }, nil) } func (h *MessageHandlerCtx) adminControl(session types.Session) error { @@ -68,27 +58,19 @@ func (h *MessageHandlerCtx) adminControl(session types.Session) error { h.sessions.SetHost(session) if host != nil { - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_CONTROL, ID: session.ID(), Target: host.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_CONTROL) - return err - } - } else { - if err := h.sessions.Broadcast( - message.Admin{ - Event: event.ADMIN_CONTROL, - ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_CONTROL) - return err - } + }, nil) } - return nil + return h.sessions.Broadcast( + message.Admin{ + Event: event.ADMIN_CONTROL, + ID: session.ID(), + }, nil) } func (h *MessageHandlerCtx) adminRelease(session types.Session) error { @@ -101,27 +83,19 @@ func (h *MessageHandlerCtx) adminRelease(session types.Session) error { h.sessions.ClearHost() if host != nil { - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_RELEASE, ID: session.ID(), Target: host.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_RELEASE) - return err - } - } else { - if err := h.sessions.Broadcast( - message.Admin{ - Event: event.ADMIN_RELEASE, - ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_RELEASE) - return err - } + }, nil) } - return nil + return h.sessions.Broadcast( + message.Admin{ + Event: event.ADMIN_RELEASE, + ID: session.ID(), + }, nil) } func (h *MessageHandlerCtx) adminGive(session types.Session, payload *message.Admin) error { @@ -138,17 +112,12 @@ func (h *MessageHandlerCtx) adminGive(session types.Session, payload *message.Ad h.sessions.SetHost(target) - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.AdminTarget{ Event: event.CONTROL_GIVE, ID: session.ID(), Target: target.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) - return err - } - - return nil + }, nil) } func (h *MessageHandlerCtx) adminMute(session types.Session, payload *message.Admin) error { @@ -170,17 +139,12 @@ func (h *MessageHandlerCtx) adminMute(session types.Session, payload *message.Ad target.SetMuted(true) - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_MUTE, Target: target.ID(), ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_UNMUTE) - return err - } - - return nil + }, nil) } func (h *MessageHandlerCtx) adminUnmute(session types.Session, payload *message.Admin) error { @@ -197,17 +161,12 @@ func (h *MessageHandlerCtx) adminUnmute(session types.Session, payload *message. target.SetMuted(false) - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_UNMUTE, Target: target.ID(), ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_UNMUTE) - return err - } - - return nil + }, nil) } func (h *MessageHandlerCtx) adminKick(session types.Session, payload *message.Admin) error { @@ -231,17 +190,12 @@ func (h *MessageHandlerCtx) adminKick(session types.Session, payload *message.Ad return err } - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_KICK, Target: target.ID(), ID: session.ID(), - }, []string{payload.ID}); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_KICK) - return err - } - - return nil + }, []string{payload.ID}) } func (h *MessageHandlerCtx) adminBan(session types.Session, payload *message.Admin) error { @@ -281,15 +235,10 @@ func (h *MessageHandlerCtx) adminBan(session types.Session, payload *message.Adm return err } - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_BAN, Target: target.ID(), ID: session.ID(), - }, []string{payload.ID}); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_BAN) - return err - } - - return nil + }, []string{payload.ID}) } diff --git a/internal/websocket/handler/broadcast.go b/internal/websocket/handler/broadcast.go index adb5fe18..4e3aba89 100644 --- a/internal/websocket/handler/broadcast.go +++ b/internal/websocket/handler/broadcast.go @@ -32,15 +32,10 @@ func (h *MessageHandlerCtx) boradcastStatus(session types.Session) error { return nil } - if err := session.Send( + return session.Send( message.BroadcastStatus{ Event: event.BORADCAST_STATUS, IsActive: h.capture.BroadcastEnabled(), URL: h.capture.BroadcastUrl(), - }); err != nil { - h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.BORADCAST_STATUS) - return err - } - - return nil + }) } diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 41088eef..b8fd00d3 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -15,16 +15,11 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { h.logger.Debug().Str("id", session.ID()).Msgf("host called %s", event.CONTROL_RELEASE) h.sessions.ClearHost() - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.Control{ Event: event.CONTROL_RELEASE, ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) - return err - } - - return nil + }, nil) } func (h *MessageHandlerCtx) controlRequest(session types.Session) error { @@ -35,35 +30,26 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { h.sessions.SetHost(session) // let everyone know - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.Control{ Event: event.CONTROL_LOCKED, ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) - return err - } - } else { - // tell session there is a host - if err := session.Send(message.Control{ - Event: event.CONTROL_REQUEST, - ID: host.ID(), - }); err != nil { - h.logger.Warn().Err(err).Str("id", session.ID()).Msgf("sending event %s has failed", event.CONTROL_REQUEST) - return err - } - - // tell host session wants to be host - if err := host.Send(message.Control{ - Event: event.CONTROL_REQUESTING, - ID: session.ID(), - }); err != nil { - h.logger.Warn().Err(err).Str("id", host.ID()).Msgf("sending event %s has failed", event.CONTROL_REQUESTING) - return err - } + }, nil) } - return nil + // tell session there is a host + if err := session.Send(message.Control{ + Event: event.CONTROL_REQUEST, + ID: host.ID(), + }); err != nil { + return err + } + + // tell host session wants to be host + return host.Send(message.Control{ + Event: event.CONTROL_REQUESTING, + ID: session.ID(), + }) } func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message.Control) error { @@ -80,17 +66,12 @@ func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message. h.sessions.SetHost(target) - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.ControlTarget{ Event: event.CONTROL_GIVE, ID: session.ID(), Target: target.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) - return err - } - - return nil + }, nil) } func (h *MessageHandlerCtx) controlClipboard(session types.Session, payload *message.Clipboard) error { diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index f8a58af1..906c7bb8 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -14,22 +14,17 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc if err := h.desktop.ChangeScreenSize(payload.Width, payload.Height, payload.Rate); err != nil { h.logger.Warn().Err(err).Msgf("unable to change screen size") - return err + return nil } - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.ScreenResolution{ Event: event.SCREEN_RESOLUTION, ID: session.ID(), Width: payload.Width, Height: payload.Height, Rate: payload.Rate, - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_RESOLUTION) - return err - } - - return nil + }, nil) } func (h *MessageHandlerCtx) screenResolution(session types.Session) error { @@ -39,17 +34,13 @@ func (h *MessageHandlerCtx) screenResolution(session types.Session) error { return nil } - if err := session.Send(message.ScreenResolution{ - Event: event.SCREEN_RESOLUTION, - Width: size.Width, - Height: size.Height, - Rate: int(size.Rate), - }); err != nil { - h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_RESOLUTION) - return err - } - - return nil + return session.Send( + message.ScreenResolution{ + Event: event.SCREEN_RESOLUTION, + Width: size.Width, + Height: size.Height, + Rate: int(size.Rate), + }) } func (h *MessageHandlerCtx) screenConfigurations(session types.Session) error { @@ -58,13 +49,9 @@ func (h *MessageHandlerCtx) screenConfigurations(session types.Session) error { return nil } - if err := session.Send(message.ScreenConfigurations{ - Event: event.SCREEN_CONFIGURATIONS, - Configurations: h.desktop.ScreenConfigurations(), - }); err != nil { - h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_CONFIGURATIONS) - return err - } - - return nil + return session.Send( + message.ScreenConfigurations{ + Event: event.SCREEN_CONFIGURATIONS, + Configurations: h.desktop.ScreenConfigurations(), + }) } diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 825fd77b..253269b8 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -44,7 +44,6 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { Event: event.MEMBER_LIST, Memebers: members, }); err != nil { - h.logger.Warn().Str("id", session.ID()).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST) return err } @@ -60,31 +59,27 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { Event: event.CONTROL_LOCKED, ID: host.ID(), }); err != nil { - h.logger.Warn().Str("id", session.ID()).Err(err).Msgf("sending event %s has failed", event.CONTROL_LOCKED) return err } } // let everyone know there is a new session - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.Member{ Event: event.MEMBER_CONNECTED, ID: session.ID(), Name: session.Name(), Admin: session.Admin(), Muted: session.Muted(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) - return err - } - - return nil + }, nil) } func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { // clear host if exists if session.IsHost() { h.sessions.ClearHost() + + // gracefully handle error if err := h.sessions.Broadcast( message.Control{ Event: event.CONTROL_RELEASE, @@ -95,14 +90,9 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { } // let everyone know session disconnected - if err := h.sessions.Broadcast( + return h.sessions.Broadcast( message.MemberDisconnected{ Event: event.MEMBER_DISCONNECTED, ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.MEMBER_DISCONNECTED) - return err - } - - return nil + }, nil); } From 0dab2a99d373df8ca2afa8bc977ab788fb5d64e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 19:37:52 +0100 Subject: [PATCH 097/876] introduce REST API authorization. --- internal/api/room/handler.go | 8 ++--- internal/api/router.go | 17 ++--------- internal/http/auth/auth.go | 57 ++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 internal/http/auth/auth.go diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index af9d327d..f996ee93 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -4,6 +4,7 @@ import ( "github.com/go-chi/chi" "demodesk/neko/internal/types" + "demodesk/neko/internal/http/auth" ) type RoomHandler struct { @@ -27,15 +28,14 @@ func New( } func (h *RoomHandler) Route(r chi.Router) { - // TODO: Authorizaton. r.Route("/screen", func(r chi.Router) { r.Get("/", h.ScreenConfiguration) - r.Post("/", h.ScreenConfigurationChange) - r.Get("/configurations", h.ScreenConfigurationsList) + r.With(auth.AdminsOnly).Post("/", h.ScreenConfigurationChange) + r.With(auth.AdminsOnly).Get("/configurations", h.ScreenConfigurationsList) }) - r.Route("/clipboard", func(r chi.Router) { + r.With(auth.HostsOnly).Route("/clipboard", func(r chi.Router) { r.Get("/", h.ClipboardRead) r.Post("/", h.ClipboardWrite) }) diff --git a/internal/api/router.go b/internal/api/router.go index 0a205ff2..f1cdf64a 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -1,13 +1,13 @@ package api import ( - "context" "net/http" "github.com/go-chi/chi" "demodesk/neko/internal/api/member" "demodesk/neko/internal/api/room" + "demodesk/neko/internal/http/auth" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" "demodesk/neko/internal/config" @@ -19,12 +19,6 @@ type ApiManagerCtx struct { capture types.CaptureManager } -type key int - -const ( - keySessionCtx key = iota -) - func New( sessions types.SessionManager, desktop types.DesktopManager, @@ -49,7 +43,7 @@ func (api *ApiManagerCtx) Route(r chi.Router) { r.Route("/room", roomHandler.Route) r.Get("/test", func(w http.ResponseWriter, r *http.Request) { - session := GetSession(r) + session := auth.GetSession(r) utils.HttpBadRequest(w, "Hi `" + session.ID() + "`, you are authenticated.") }) } @@ -60,12 +54,7 @@ func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { if err != nil { utils.HttpNotAuthenticated(w, err) } else { - ctx := context.WithValue(r.Context(), keySessionCtx, session) - next.ServeHTTP(w, r.WithContext(ctx)) + next.ServeHTTP(w, auth.SetSession(r, session)) } }) } - -func GetSession(r *http.Request) types.Session { - return r.Context().Value(keySessionCtx).(types.Session) -} diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go new file mode 100644 index 00000000..d0a9c3a6 --- /dev/null +++ b/internal/http/auth/auth.go @@ -0,0 +1,57 @@ +package auth + +import ( + "context" + "net/http" + + "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" +) + +type key int + +const ( + keySessionCtx key = iota +) + +func SetSession(r *http.Request, session types.Session) *http.Request { + ctx := context.WithValue(r.Context(), keySessionCtx, session) + return r.WithContext(ctx) +} + +func GetSession(r *http.Request) types.Session { + return r.Context().Value(keySessionCtx).(types.Session) +} + +func AdminsOnly(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + session := GetSession(r) + if !session.Admin() { + utils.HttpNotAuthorized(w) + } else { + next.ServeHTTP(w, r) + } + }) +} + +func HostsOnly(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + session := GetSession(r) + if !session.IsHost() { + utils.HttpNotAuthorized(w, "Only host can do this.") + } else { + next.ServeHTTP(w, r) + } + }) +} + +func HostsOrAdminsOnly(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + session := GetSession(r) + if !session.IsHost() && !session.Admin() { + utils.HttpNotAuthorized(w, "Only host can do this.") + } else { + next.ServeHTTP(w, r) + } + }) +} From e8f9e2e4e4fb233ea3a391125af1ad3b07712a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 21:57:35 +0100 Subject: [PATCH 098/876] fix clipboard bug. --- internal/websocket/manager.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 46d43e60..df80519b 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -88,7 +88,7 @@ func (ws *WebSocketManagerCtx) Start() { return default: session := ws.sessions.GetHost() - if session != nil { + if session == nil { break } @@ -97,7 +97,6 @@ func (ws *WebSocketManagerCtx) Start() { break } - // TODO: Refactor if err := session.Send(message.Clipboard{ Event: event.CONTROL_CLIPBOARD, Text: text, From 227b6b24c2ce0670fafd1fbb2ffbe47e8b1f929a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 21:57:53 +0100 Subject: [PATCH 099/876] REST screen change broadcast. --- internal/api/room/handler.go | 11 +++++++++-- internal/api/room/screen.go | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index f996ee93..e01c43f3 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -2,15 +2,18 @@ package room import ( "github.com/go-chi/chi" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" "demodesk/neko/internal/types" "demodesk/neko/internal/http/auth" ) type RoomHandler struct { + logger zerolog.Logger sessions types.SessionManager desktop types.DesktopManager - capture types.CaptureManager + capture types.CaptureManager } func New( @@ -18,9 +21,13 @@ func New( desktop types.DesktopManager, capture types.CaptureManager, ) *RoomHandler { - // Init + logger := log.With(). + Str("module", "api"). + Str("submodule", "room"). + Logger() return &RoomHandler{ + logger: logger, sessions: sessions, desktop: desktop, capture: capture, diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index b22808bf..2ce17fb0 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -3,7 +3,10 @@ package room import ( "net/http" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" "demodesk/neko/internal/utils" + "demodesk/neko/internal/http/auth" ) type ScreenConfiguration struct { @@ -38,7 +41,17 @@ func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.R return } - // TODO: Broadcast change to all sessions. + session := auth.GetSession(r) + if err := h.sessions.Broadcast( + message.ScreenResolution{ + Event: event.SCREEN_RESOLUTION, + ID: session.ID(), + Width: data.Width, + Height: data.Height, + Rate: data.Rate, + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.SCREEN_RESOLUTION) + } utils.HttpSuccess(w, data) } From 99068b893b56cc882b7ea211b99bf06dcdf36cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 22:04:50 +0100 Subject: [PATCH 100/876] naming convention -> screen size. --- internal/websocket/handler/handler.go | 4 ++-- internal/websocket/handler/screen.go | 4 ++-- internal/websocket/handler/session.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 34f28773..fea76f45 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -109,13 +109,13 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { // Screen Events case event.SCREEN_RESOLUTION: - err = h.screenResolution(session) + err = h.screenSize(session) case event.SCREEN_CONFIGURATIONS: err = h.screenConfigurations(session) case event.SCREEN_SET: payload := &message.ScreenResolution{} err = utils.Unmarshal(payload, raw, func() error { - return h.screenSet(session, payload) + return h.screenSizeChange(session, payload) }) // Boradcast Events diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 906c7bb8..ebfdf1b4 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -6,7 +6,7 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenResolution) error { +func (h *MessageHandlerCtx) screenSizeChange(session types.Session, payload *message.ScreenResolution) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -27,7 +27,7 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc }, nil) } -func (h *MessageHandlerCtx) screenResolution(session types.Session) error { +func (h *MessageHandlerCtx) screenSize(session types.Session) error { size := h.desktop.GetScreenSize() if size == nil { h.logger.Debug().Msg("could not get screen size") diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 253269b8..85ff51c6 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -47,8 +47,8 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { return err } - // send current screen resolution - if err := h.screenResolution(session); err != nil { + // send current screen size + if err := h.screenSize(session); err != nil { return err } From d87a10b23a984c5a538e83e78699ed7c56ea910a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 22:10:03 +0100 Subject: [PATCH 101/876] remove unused mute function. --- internal/session/session.go | 9 ----- internal/types/event/events.go | 2 -- internal/types/message/messages.go | 2 -- internal/types/session.go | 2 -- internal/websocket/handler/admin.go | 49 --------------------------- internal/websocket/handler/handler.go | 10 ------ internal/websocket/handler/session.go | 2 -- 7 files changed, 76 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 70ee941c..4f569dd9 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -13,7 +13,6 @@ type SessionCtx struct { id string name string admin bool - muted bool connected bool manager *SessionManagerCtx socket types.WebSocket @@ -32,10 +31,6 @@ func (session *SessionCtx) Admin() bool { return session.admin } -func (session *SessionCtx) Muted() bool { - return session.muted -} - func (session *SessionCtx) IsHost() bool { return session.manager.host != nil && session.manager.host.ID() == session.ID() } @@ -52,10 +47,6 @@ func (session *SessionCtx) Address() string { return session.socket.Address() } -func (session *SessionCtx) SetMuted(muted bool) { - session.muted = muted -} - func (session *SessionCtx) SetName(name string) { session.name = name } diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 5d11b3e3..a542e757 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -41,9 +41,7 @@ const ( ADMIN_BAN = "admin/ban" ADMIN_KICK = "admin/kick" ADMIN_LOCK = "admin/lock" - ADMIN_MUTE = "admin/mute" ADMIN_UNLOCK = "admin/unlock" - ADMIN_UNMUTE = "admin/unmute" ADMIN_CONTROL = "admin/control" ADMIN_RELEASE = "admin/release" ADMIN_GIVE = "admin/give" diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 9e88d476..46f34647 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -36,7 +36,6 @@ type MembersListEntry struct { ID string `json:"id"` Name string `json:"displayname"` Admin bool `json:"admin"` - Muted bool `json:"muted"` } type Member struct { @@ -44,7 +43,6 @@ type Member struct { ID string `json:"id"` Name string `json:"displayname"` Admin bool `json:"admin"` - Muted bool `json:"muted"` } type MemberDisconnected struct { diff --git a/internal/types/session.go b/internal/types/session.go index 5460c6a4..1ede9ac1 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -6,11 +6,9 @@ type Session interface { ID() string Name() string Admin() bool - Muted() bool IsHost() bool Connected() bool Address() string - SetMuted(muted bool) SetName(name string) SetSocket(socket WebSocket) SetPeer(peer Peer) diff --git a/internal/websocket/handler/admin.go b/internal/websocket/handler/admin.go index f7c818f7..8784eb46 100644 --- a/internal/websocket/handler/admin.go +++ b/internal/websocket/handler/admin.go @@ -120,55 +120,6 @@ func (h *MessageHandlerCtx) adminGive(session types.Session, payload *message.Ad }, nil) } -func (h *MessageHandlerCtx) adminMute(session types.Session, payload *message.Admin) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - target, ok := h.sessions.Get(payload.ID) - if !ok { - h.logger.Debug().Str("id", payload.ID).Msg("can't find session id") - return nil - } - - if target.Admin() { - h.logger.Debug().Msg("target is an admin, baling") - return nil - } - - target.SetMuted(true) - - return h.sessions.Broadcast( - message.AdminTarget{ - Event: event.ADMIN_MUTE, - Target: target.ID(), - ID: session.ID(), - }, nil) -} - -func (h *MessageHandlerCtx) adminUnmute(session types.Session, payload *message.Admin) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - target, ok := h.sessions.Get(payload.ID) - if !ok { - h.logger.Debug().Str("id", payload.ID).Msg("can't find target session") - return nil - } - - target.SetMuted(false) - - return h.sessions.Broadcast( - message.AdminTarget{ - Event: event.ADMIN_UNMUTE, - Target: target.ID(), - ID: session.ID(), - }, nil) -} - func (h *MessageHandlerCtx) adminKick(session types.Session, payload *message.Admin) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index fea76f45..60b82470 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -151,16 +151,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { err = utils.Unmarshal(payload, raw, func() error { return h.adminKick(session, payload) }) - case event.ADMIN_MUTE: - payload := &message.Admin{} - err = utils.Unmarshal(payload, raw, func() error { - return h.adminMute(session, payload) - }) - case event.ADMIN_UNMUTE: - payload := &message.Admin{} - err = utils.Unmarshal(payload, raw, func() error { - return h.adminUnmute(session, payload) - }) default: return errors.Errorf("unknown message event %s", header.Event) } diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 85ff51c6..581dea96 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -35,7 +35,6 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { ID: session.ID(), Name: session.Name(), Admin: session.Admin(), - Muted: session.Muted(), }) } @@ -70,7 +69,6 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { ID: session.ID(), Name: session.Name(), Admin: session.Admin(), - Muted: session.Muted(), }, nil) } From 570efbf3a6541e10a9cae000957498783571b740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 22:21:21 +0100 Subject: [PATCH 102/876] remove unused ban endpoint. --- internal/session/session.go | 8 ----- internal/types/event/events.go | 1 - internal/types/session.go | 1 - internal/types/websocket.go | 1 - internal/websocket/handler/admin.go | 47 --------------------------- internal/websocket/handler/handler.go | 18 ---------- internal/websocket/manager.go | 7 ---- internal/websocket/websocket.go | 12 ------- 8 files changed, 95 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 4f569dd9..5973e8a0 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -39,14 +39,6 @@ func (session *SessionCtx) Connected() bool { return session.connected } -func (session *SessionCtx) Address() string { - if session.socket == nil { - return "" - } - - return session.socket.Address() -} - func (session *SessionCtx) SetName(name string) { session.name = name } diff --git a/internal/types/event/events.go b/internal/types/event/events.go index a542e757..02a227ea 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -38,7 +38,6 @@ const ( ) const ( - ADMIN_BAN = "admin/ban" ADMIN_KICK = "admin/kick" ADMIN_LOCK = "admin/lock" ADMIN_UNLOCK = "admin/unlock" diff --git a/internal/types/session.go b/internal/types/session.go index 1ede9ac1..cb620d79 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -8,7 +8,6 @@ type Session interface { Admin() bool IsHost() bool Connected() bool - Address() string SetName(name string) SetSocket(socket WebSocket) SetPeer(peer Peer) diff --git a/internal/types/websocket.go b/internal/types/websocket.go index 442e607b..630c5d65 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -3,7 +3,6 @@ package types import "net/http" type WebSocket interface { - Address() string Send(v interface{}) error Destroy() error } diff --git a/internal/websocket/handler/admin.go b/internal/websocket/handler/admin.go index 8784eb46..3c6da808 100644 --- a/internal/websocket/handler/admin.go +++ b/internal/websocket/handler/admin.go @@ -1,8 +1,6 @@ package handler import ( - "strings" - "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" @@ -148,48 +146,3 @@ func (h *MessageHandlerCtx) adminKick(session types.Session, payload *message.Ad ID: session.ID(), }, []string{payload.ID}) } - -func (h *MessageHandlerCtx) adminBan(session types.Session, payload *message.Admin) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - target, ok := h.sessions.Get(payload.ID) - if !ok { - h.logger.Debug().Str("id", payload.ID).Msg("can't find target session") - return nil - } - - if target.Admin() { - h.logger.Debug().Msg("target is an admin, baling") - return nil - } - - remote := target.Address() - if remote == "" { - h.logger.Debug().Msg("no remote address, baling") - return nil - } - - address := strings.SplitN(remote, ":", -1) - if len(address[0]) < 1 { - h.logger.Debug().Str("address", remote).Msg("no remote address, baling") - return nil - } - - h.logger.Debug().Str("address", remote).Msg("adding address to banned") - - h.banned[address[0]] = true - - if err := target.Disconnect("banned"); err != nil { - return err - } - - return h.sessions.Broadcast( - message.AdminTarget{ - Event: event.ADMIN_BAN, - Target: target.ID(), - ID: session.ID(), - }, []string{payload.ID}) -} diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 60b82470..77bfb699 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -27,7 +27,6 @@ func New( desktop: desktop, capture: capture, webrtc: webrtc, - banned: make(map[string]bool), locked: false, } } @@ -38,22 +37,10 @@ type MessageHandlerCtx struct { webrtc types.WebRTCManager desktop types.DesktopManager capture types.CaptureManager - banned map[string]bool locked bool } func (h *MessageHandlerCtx) Connected(session types.Session, socket types.WebSocket) (bool, string) { - address := socket.Address() - if address != "" { - ok, banned := h.banned[address] - if ok && banned { - h.logger.Debug().Str("address", address).Msg("banned") - return false, "banned" - } - } else { - h.logger.Debug().Msg("no remote address") - } - if h.locked && !session.Admin(){ h.logger.Debug().Msg("server locked") return false, "locked" @@ -141,11 +128,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { err = utils.Unmarshal(payload, raw, func() error { return h.adminGive(session, payload) }) - case event.ADMIN_BAN: - payload := &message.Admin{} - err = utils.Unmarshal(payload, raw, func() error { - return h.adminBan(session, payload) - }) case event.ADMIN_KICK: payload := &message.Admin{} err = utils.Unmarshal(payload, raw, func() error { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index df80519b..78299640 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -141,16 +141,9 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return connection.Close() } - // TODO: Refactor. - ip := r.RemoteAddr - // if allow poxy { - // ip = utils.ReadUserIP(r) - // } - socket := &WebSocketCtx{ session: session, ws: ws, - address: ip, connection: connection, } diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go index 11645794..53dcb43e 100644 --- a/internal/websocket/websocket.go +++ b/internal/websocket/websocket.go @@ -2,7 +2,6 @@ package websocket import ( "encoding/json" - "strings" "sync" "github.com/gorilla/websocket" @@ -12,22 +11,11 @@ import ( type WebSocketCtx struct { session types.Session - address string ws *WebSocketManagerCtx connection *websocket.Conn mu sync.Mutex } -func (socket *WebSocketCtx) Address() string { - //remote := socket.connection.RemoteAddr() - address := strings.SplitN(socket.address, ":", -1) - if len(address[0]) < 1 { - return socket.address - } - - return address[0] -} - func (socket *WebSocketCtx) Send(v interface{}) error { socket.mu.Lock() defer socket.mu.Unlock() From eec285cd0767244f7b4f4b51c56c386efb190b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 22:22:19 +0100 Subject: [PATCH 103/876] Rename displayname to name. --- internal/types/message/messages.go | 10 +++++----- internal/websocket/handler/signal.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 46f34647..078bf4b4 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -22,9 +22,9 @@ type SignalProvide struct { } type SignalAnswer struct { - Event string `json:"event"` - DisplayName string `json:"displayname"` - SDP string `json:"sdp"` + Event string `json:"event"` + Name string `json:"displayname"` // TODO: Change. + SDP string `json:"sdp"` } type MembersList struct { @@ -34,14 +34,14 @@ type MembersList struct { type MembersListEntry struct { ID string `json:"id"` - Name string `json:"displayname"` + Name string `json:"displayname"` // TODO: Change. Admin bool `json:"admin"` } type Member struct { Event string `json:"event"` ID string `json:"id"` - Name string `json:"displayname"` + Name string `json:"displayname"` // TODO: Change. Admin bool `json:"admin"` } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 7edbb47f..b618f3e4 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -22,6 +22,6 @@ func (h *MessageHandlerCtx) signalProvide(session types.Session) error { } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { - session.SetName(payload.DisplayName) + session.SetName(payload.Name) return session.SignalAnswer(payload.SDP) } From 3f4914d260d44a30d1ce0c7f8d288115a06038d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 16 Nov 2020 22:48:20 +0100 Subject: [PATCH 104/876] REST API control. --- internal/api/room/control.go | 55 ++++++++++++++++++++++++++++++++++++ internal/api/room/handler.go | 5 ++++ 2 files changed, 60 insertions(+) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 01912655..7fc76281 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -1 +1,56 @@ package room + +import ( + "net/http" + + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" + "demodesk/neko/internal/utils" + "demodesk/neko/internal/http/auth" +) + +func (h *RoomHandler) ControlRequest(w http.ResponseWriter, r *http.Request) { + session := auth.GetSession(r) + if session.IsHost() { + utils.HttpBadRequest(w, "User is already host.") + return + } + + host := h.sessions.GetHost() + if host != nil { + utils.HttpBadRequest(w, "There is already a host.") + return + } + + h.sessions.SetHost(session) + + if err := h.sessions.Broadcast( + message.Control{ + Event: event.CONTROL_LOCKED, + ID: session.ID(), + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) + } + + utils.HttpSuccess(w) +} + +func (h *RoomHandler) ControlRelease(w http.ResponseWriter, r *http.Request) { + session := auth.GetSession(r) + if !session.IsHost() { + utils.HttpBadRequest(w, "User is not the host.") + return + } + + h.sessions.ClearHost() + + if err := h.sessions.Broadcast( + message.Control{ + Event: event.CONTROL_RELEASE, + ID: session.ID(), + }, nil); err != nil { + h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) + } + + utils.HttpSuccess(w) +} diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index e01c43f3..294ff1ac 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -46,4 +46,9 @@ func (h *RoomHandler) Route(r chi.Router) { r.Get("/", h.ClipboardRead) r.Post("/", h.ClipboardWrite) }) + + r.Route("/control", func(r chi.Router) { + r.Post("/request", h.ControlRequest) + r.Post("/release", h.ControlRelease) + }) } From da7e6f7728c1c41bd6615ce8c94f398c5f239372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 20:30:33 +0100 Subject: [PATCH 105/876] Broadcast should not return error. --- internal/api/room/control.go | 14 +++------ internal/api/room/screen.go | 7 ++--- internal/session/manager.go | 6 ++-- internal/session/session.go | 19 ++++-------- internal/types/session.go | 2 +- internal/websocket/handler/admin.go | 44 +++++++++++++++++---------- internal/websocket/handler/control.go | 40 ++++++++++++++---------- internal/websocket/handler/screen.go | 4 ++- internal/websocket/handler/session.go | 33 +++++++++++--------- internal/websocket/handler/signal.go | 15 ++++----- internal/websocket/manager.go | 9 +++--- 11 files changed, 103 insertions(+), 90 deletions(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 7fc76281..c8fb414f 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -24,13 +24,11 @@ func (h *RoomHandler) ControlRequest(w http.ResponseWriter, r *http.Request) { h.sessions.SetHost(session) - if err := h.sessions.Broadcast( + h.sessions.Broadcast( message.Control{ Event: event.CONTROL_LOCKED, ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED) - } + }, nil) utils.HttpSuccess(w) } @@ -43,14 +41,12 @@ func (h *RoomHandler) ControlRelease(w http.ResponseWriter, r *http.Request) { } h.sessions.ClearHost() - - if err := h.sessions.Broadcast( + + h.sessions.Broadcast( message.Control{ Event: event.CONTROL_RELEASE, ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) - } + }, nil) utils.HttpSuccess(w) } diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 2ce17fb0..30351dd6 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -42,16 +42,15 @@ func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.R } session := auth.GetSession(r) - if err := h.sessions.Broadcast( + + h.sessions.Broadcast( message.ScreenResolution{ Event: event.SCREEN_RESOLUTION, ID: session.ID(), Width: data.Width, Height: data.Height, Rate: data.Rate, - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.SCREEN_RESOLUTION) - } + }, nil) utils.HttpSuccess(w, data) } diff --git a/internal/session/manager.go b/internal/session/manager.go index dbbdbe20..fd2ff379 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -142,7 +142,7 @@ func (manager *SessionManagerCtx) Members() []types.Session { return sessions } -func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) error { +func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) { manager.membersMu.Lock() defer manager.membersMu.Unlock() @@ -158,11 +158,9 @@ func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) } if err := session.Send(v); err != nil { - return err + manager.logger.Warn().Err(err).Msgf("broadcasting event has failed") } } - - return nil } // --- diff --git a/internal/session/session.go b/internal/session/session.go index 5973e8a0..e1e41a74 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -67,20 +67,13 @@ func (session *SessionCtx) SetConnected(connected bool) { } func (session *SessionCtx) Disconnect(reason string) error { - if session.socket == nil { - return nil - } - - // TODO: Refcator - if err := session.Send(&message.Disconnect{ - Event: event.SYSTEM_DISCONNECT, - Message: reason, - }); err != nil { - return err - } - session.SetConnected(false) - return nil + + return session.Send( + message.Disconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: reason, + }) } func (session *SessionCtx) Send(v interface{}) error { diff --git a/internal/types/session.go b/internal/types/session.go index cb620d79..f96e958a 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -29,7 +29,7 @@ type SessionManager interface { Admins() []Session Members() []Session - Broadcast(v interface{}, exclude interface{}) error + Broadcast(v interface{}, exclude interface{}) OnHost(listener func(session Session)) OnHostCleared(listener func(session Session)) diff --git a/internal/websocket/handler/admin.go b/internal/websocket/handler/admin.go index 3c6da808..ba7803eb 100644 --- a/internal/websocket/handler/admin.go +++ b/internal/websocket/handler/admin.go @@ -19,11 +19,13 @@ func (h *MessageHandlerCtx) adminLock(session types.Session) error { h.locked = true - return h.sessions.Broadcast( + h.sessions.Broadcast( message.Admin{ Event: event.ADMIN_LOCK, ID: session.ID(), }, nil) + + return nil } func (h *MessageHandlerCtx) adminUnlock(session types.Session) error { @@ -39,11 +41,13 @@ func (h *MessageHandlerCtx) adminUnlock(session types.Session) error { h.locked = false - return h.sessions.Broadcast( + h.sessions.Broadcast( message.Admin{ Event: event.ADMIN_UNLOCK, ID: session.ID(), }, nil) + + return nil } func (h *MessageHandlerCtx) adminControl(session types.Session) error { @@ -56,19 +60,21 @@ func (h *MessageHandlerCtx) adminControl(session types.Session) error { h.sessions.SetHost(session) if host != nil { - return h.sessions.Broadcast( + h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_CONTROL, ID: session.ID(), Target: host.ID(), }, nil) + } else { + h.sessions.Broadcast( + message.Admin{ + Event: event.ADMIN_CONTROL, + ID: session.ID(), + }, nil) } - return h.sessions.Broadcast( - message.Admin{ - Event: event.ADMIN_CONTROL, - ID: session.ID(), - }, nil) + return nil } func (h *MessageHandlerCtx) adminRelease(session types.Session) error { @@ -81,19 +87,21 @@ func (h *MessageHandlerCtx) adminRelease(session types.Session) error { h.sessions.ClearHost() if host != nil { - return h.sessions.Broadcast( + h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_RELEASE, ID: session.ID(), Target: host.ID(), }, nil) + } else { + h.sessions.Broadcast( + message.Admin{ + Event: event.ADMIN_RELEASE, + ID: session.ID(), + }, nil) } - return h.sessions.Broadcast( - message.Admin{ - Event: event.ADMIN_RELEASE, - ID: session.ID(), - }, nil) + return nil } func (h *MessageHandlerCtx) adminGive(session types.Session, payload *message.Admin) error { @@ -110,12 +118,14 @@ func (h *MessageHandlerCtx) adminGive(session types.Session, payload *message.Ad h.sessions.SetHost(target) - return h.sessions.Broadcast( + h.sessions.Broadcast( message.AdminTarget{ Event: event.CONTROL_GIVE, ID: session.ID(), Target: target.ID(), }, nil) + + return nil } func (h *MessageHandlerCtx) adminKick(session types.Session, payload *message.Admin) error { @@ -139,10 +149,12 @@ func (h *MessageHandlerCtx) adminKick(session types.Session, payload *message.Ad return err } - return h.sessions.Broadcast( + h.sessions.Broadcast( message.AdminTarget{ Event: event.ADMIN_KICK, Target: target.ID(), ID: session.ID(), }, []string{payload.ID}) + + return nil } diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index b8fd00d3..b575323c 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -15,11 +15,13 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { h.logger.Debug().Str("id", session.ID()).Msgf("host called %s", event.CONTROL_RELEASE) h.sessions.ClearHost() - return h.sessions.Broadcast( + h.sessions.Broadcast( message.Control{ Event: event.CONTROL_RELEASE, ID: session.ID(), }, nil) + + return nil } func (h *MessageHandlerCtx) controlRequest(session types.Session) error { @@ -30,26 +32,30 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { h.sessions.SetHost(session) // let everyone know - return h.sessions.Broadcast( + h.sessions.Broadcast( message.Control{ Event: event.CONTROL_LOCKED, ID: session.ID(), }, nil) + } else { + // tell session there is a host + if err := session.Send( + message.Control{ + Event: event.CONTROL_REQUEST, + ID: host.ID(), + }); err != nil { + return err + } + + // tell host session wants to be host + return host.Send( + message.Control{ + Event: event.CONTROL_REQUESTING, + ID: session.ID(), + }) } - // tell session there is a host - if err := session.Send(message.Control{ - Event: event.CONTROL_REQUEST, - ID: host.ID(), - }); err != nil { - return err - } - - // tell host session wants to be host - return host.Send(message.Control{ - Event: event.CONTROL_REQUESTING, - ID: session.ID(), - }) + return nil } func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message.Control) error { @@ -66,12 +72,14 @@ func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message. h.sessions.SetHost(target) - return h.sessions.Broadcast( + h.sessions.Broadcast( message.ControlTarget{ Event: event.CONTROL_GIVE, ID: session.ID(), Target: target.ID(), }, nil) + + return nil } func (h *MessageHandlerCtx) controlClipboard(session types.Session, payload *message.Clipboard) error { diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index ebfdf1b4..eebab9db 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -17,7 +17,7 @@ func (h *MessageHandlerCtx) screenSizeChange(session types.Session, payload *mes return nil } - return h.sessions.Broadcast( + h.sessions.Broadcast( message.ScreenResolution{ Event: event.SCREEN_RESOLUTION, ID: session.ID(), @@ -25,6 +25,8 @@ func (h *MessageHandlerCtx) screenSizeChange(session types.Session, payload *mes Height: payload.Height, Rate: payload.Rate, }, nil) + + return nil } func (h *MessageHandlerCtx) screenSize(session types.Session) error { diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 581dea96..1ba9adb6 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -39,10 +39,11 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { } // send list of members to session - if err := session.Send(message.MembersList{ - Event: event.MEMBER_LIST, - Memebers: members, - }); err != nil { + if err := session.Send( + message.MembersList{ + Event: event.MEMBER_LIST, + Memebers: members, + }); err != nil { return err } @@ -54,22 +55,25 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { // tell session there is a host host := h.sessions.GetHost() if host != nil { - if err := session.Send(message.Control{ - Event: event.CONTROL_LOCKED, - ID: host.ID(), - }); err != nil { + if err := session.Send( + message.Control{ + Event: event.CONTROL_LOCKED, + ID: host.ID(), + }); err != nil { return err } } // let everyone know there is a new session - return h.sessions.Broadcast( + h.sessions.Broadcast( message.Member{ Event: event.MEMBER_CONNECTED, ID: session.ID(), Name: session.Name(), Admin: session.Admin(), }, nil) + + return nil } func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { @@ -77,20 +81,19 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { if session.IsHost() { h.sessions.ClearHost() - // gracefully handle error - if err := h.sessions.Broadcast( + h.sessions.Broadcast( message.Control{ Event: event.CONTROL_RELEASE, ID: session.ID(), - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) - } + }, nil) } // let everyone know session disconnected - return h.sessions.Broadcast( + h.sessions.Broadcast( message.MemberDisconnected{ Event: event.MEMBER_DISCONNECTED, ID: session.ID(), }, nil); + + return nil } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index b618f3e4..377a4578 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -12,13 +12,14 @@ func (h *MessageHandlerCtx) signalProvide(session types.Session) error { return err } - return session.Send(message.SignalProvide{ - Event: event.SIGNAL_PROVIDE, - ID: session.ID(), - SDP: sdp, - Lite: lite, - ICE: ice, - }) + return session.Send( + message.SignalProvide{ + Event: event.SIGNAL_PROVIDE, + ID: session.ID(), + SDP: sdp, + Lite: lite, + ICE: ice, + }) } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 78299640..a9b5ee6c 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -97,10 +97,11 @@ func (ws *WebSocketManagerCtx) Start() { break } - if err := session.Send(message.Clipboard{ - Event: event.CONTROL_CLIPBOARD, - Text: text, - }); err != nil { + if err := session.Send( + message.Clipboard{ + Event: event.CONTROL_CLIPBOARD, + Text: text, + }); err != nil { ws.logger.Warn().Err(err).Msg("could not sync clipboard") } From 6d27b0a69c42b8a20915d16ea28b9e149b5db58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 20:34:33 +0100 Subject: [PATCH 106/876] return err socket. --- internal/websocket/handler/screen.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index eebab9db..acf00f52 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -13,8 +13,7 @@ func (h *MessageHandlerCtx) screenSizeChange(session types.Session, payload *mes } if err := h.desktop.ChangeScreenSize(payload.Width, payload.Height, payload.Rate); err != nil { - h.logger.Warn().Err(err).Msgf("unable to change screen size") - return nil + return err } h.sessions.Broadcast( From 6fbb1a2cc71445c00976b63e0615e7ff8f241f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 21:10:40 +0100 Subject: [PATCH 107/876] add control give & control take endpoints. --- internal/api/room/control.go | 41 ++++++++++++++++++++++++++++++++++++ internal/api/room/handler.go | 3 +++ 2 files changed, 44 insertions(+) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index c8fb414f..44c6f71b 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -9,6 +9,10 @@ import ( "demodesk/neko/internal/http/auth" ) +type ControlGivePayload struct { + ID string `json:"id"` +} + func (h *RoomHandler) ControlRequest(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if session.IsHost() { @@ -50,3 +54,40 @@ func (h *RoomHandler) ControlRelease(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } + +func (h *RoomHandler) ControlTake(w http.ResponseWriter, r *http.Request) { + session := auth.GetSession(r) + + h.sessions.SetHost(session) + + h.sessions.Broadcast( + message.Control{ + Event: event.CONTROL_LOCKED, + ID: session.ID(), + }, nil) + + utils.HttpSuccess(w) +} + +func (h *RoomHandler) ControlGive(w http.ResponseWriter, r *http.Request) { + data := &ControlGivePayload{} + if !utils.HttpJsonRequest(w, r, data) { + return + } + + target, ok := h.sessions.Get(data.ID) + if !ok { + utils.HttpBadRequest(w, "Target user was not found.") + return + } + + h.sessions.SetHost(target) + + h.sessions.Broadcast( + message.Control{ + Event: event.CONTROL_LOCKED, + ID: target.ID(), + }, nil) + + utils.HttpSuccess(w) +} diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 294ff1ac..0b2c8676 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -50,5 +50,8 @@ func (h *RoomHandler) Route(r chi.Router) { r.Route("/control", func(r chi.Router) { r.Post("/request", h.ControlRequest) r.Post("/release", h.ControlRelease) + + r.With(auth.AdminsOnly).Post("/take", h.ControlTake) + r.With(auth.AdminsOnly).Post("/give", h.ControlGive) }) } From db820806a48ed425ce6b7c4c24e733fbe2207f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 21:34:39 +0100 Subject: [PATCH 108/876] add broadcast endpoint & broadcast pipeline return error. --- internal/api/room/broadcast.go | 69 +++++++++++++++++++++++++ internal/api/room/handler.go | 6 +++ internal/capture/broadcast.go | 13 ++--- internal/capture/manager.go | 22 ++++++-- internal/session/manager.go | 21 ++++++++ internal/types/capture.go | 2 +- internal/types/session.go | 1 + internal/websocket/handler/broadcast.go | 5 +- 8 files changed, 124 insertions(+), 15 deletions(-) diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index 01912655..1423953c 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -1 +1,70 @@ package room + +import ( + "net/http" + + "demodesk/neko/internal/utils" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" +) + +type BroadcastStatusPayload struct { + URL string `json:"url,omitempty"` + IsActive bool `json:"is_active"` +} + +func (h *RoomHandler) BroadcastStatus(w http.ResponseWriter, r *http.Request) { + utils.HttpSuccess(w, BroadcastStatusPayload{ + IsActive: h.capture.BroadcastEnabled(), + URL: h.capture.BroadcastUrl(), + }) +} + +func (h *RoomHandler) BoradcastStart(w http.ResponseWriter, r *http.Request) { + data := &BroadcastStatusPayload{} + if !utils.HttpJsonRequest(w, r, data) { + return + } + + if data.URL == "" { + utils.HttpBadRequest(w, "Missing broadcast URL.") + return + } + + if h.capture.BroadcastEnabled() { + utils.HttpBadRequest(w, "Server is already broadcasting.") + return + } + + if err := h.capture.StartBroadcast(data.URL); err != nil { + utils.HttpInternalServer(w, err) + return + } + + h.sessions.AdminBroadcast( + message.BroadcastStatus{ + Event: event.BORADCAST_STATUS, + IsActive: h.capture.BroadcastEnabled(), + URL: h.capture.BroadcastUrl(), + }, nil) + + utils.HttpSuccess(w) +} + +func (h *RoomHandler) BoradcastStop(w http.ResponseWriter, r *http.Request) { + if !h.capture.BroadcastEnabled() { + utils.HttpBadRequest(w, "Server is not broadcasting.") + return + } + + h.capture.StopBroadcast() + + h.sessions.AdminBroadcast( + message.BroadcastStatus{ + Event: event.BORADCAST_STATUS, + IsActive: h.capture.BroadcastEnabled(), + URL: h.capture.BroadcastUrl(), + }, nil) + + utils.HttpSuccess(w) +} diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 0b2c8676..4f1ce704 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -54,4 +54,10 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Post("/take", h.ControlTake) r.With(auth.AdminsOnly).Post("/give", h.ControlGive) }) + + r.With(auth.AdminsOnly).Route("/broadcast", func(r chi.Router) { + r.Get("/", h.BroadcastStatus) + r.Post("/start", h.BoradcastStart) + r.Post("/stop", h.BoradcastStop) + }) } diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 28a3a7d8..d0d419be 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -4,10 +4,10 @@ import ( "demodesk/neko/internal/capture/gst" ) -func (manager *CaptureManagerCtx) StartBroadcast(url string) { +func (manager *CaptureManagerCtx) StartBroadcast(url string) error { manager.broadcast_url = url manager.broadcasting = true - manager.createBroadcastPipeline() + return manager.createBroadcastPipeline() } func (manager *CaptureManagerCtx) StopBroadcast() { @@ -23,13 +23,9 @@ func (manager *CaptureManagerCtx) BroadcastUrl() string { return manager.broadcast_url } -func (manager *CaptureManagerCtx) createBroadcastPipeline() { +func (manager *CaptureManagerCtx) createBroadcastPipeline() error { var err error - if manager.broadcast != nil || !manager.BroadcastEnabled() { - return - } - manager.logger.Info(). Str("audio_device", manager.config.Device). Str("video_display", manager.config.Display). @@ -44,11 +40,12 @@ func (manager *CaptureManagerCtx) createBroadcastPipeline() { ) if err != nil { - manager.logger.Panic().Err(err).Msg("unable to create broadcast pipeline") + return err } manager.broadcast.Play() manager.logger.Info().Msgf("starting broadcast pipeline") + return nil } func (manager *CaptureManagerCtx) destroyBroadcastPipeline() { diff --git a/internal/capture/manager.go b/internal/capture/manager.go index d48d166c..3e9c280e 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -46,14 +46,18 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt } func (manager *CaptureManagerCtx) Start() { - manager.createBroadcastPipeline() + if manager.BroadcastEnabled() { + manager.createBroadcastPipeline() + } manager.desktop.OnBeforeScreenSizeChange(func() { if manager.Streaming() { manager.destroyVideoPipeline() } - manager.destroyBroadcastPipeline() + if manager.BroadcastEnabled() { + manager.destroyBroadcastPipeline() + } }) manager.desktop.OnAfterScreenSizeChange(func() { @@ -61,7 +65,9 @@ func (manager *CaptureManagerCtx) Start() { manager.createVideoPipeline() } - manager.createBroadcastPipeline() + if manager.BroadcastEnabled() { + manager.createBroadcastPipeline() + } }) go func() { @@ -85,9 +91,15 @@ func (manager *CaptureManagerCtx) Start() { func (manager *CaptureManagerCtx) Shutdown() error { manager.logger.Info().Msgf("capture shutting down") - manager.StopStream() + + if manager.Streaming() { + manager.StopStream() + } + + if manager.BroadcastEnabled() { + manager.createBroadcastPipeline() + } - manager.destroyBroadcastPipeline() manager.emit_stop <- true return nil } diff --git a/internal/session/manager.go b/internal/session/manager.go index fd2ff379..46460a67 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -163,6 +163,27 @@ func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) } } +func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interface{}) { + manager.membersMu.Lock() + defer manager.membersMu.Unlock() + + for id, session := range manager.members { + if !session.connected || !session.Admin() { + continue + } + + if exclude != nil { + if in, _ := utils.ArrayIn(id, exclude); in { + continue + } + } + + if err := session.Send(v); err != nil { + manager.logger.Warn().Err(err).Msgf("broadcasting admin event has failed") + } + } +} + // --- // events // --- diff --git a/internal/types/capture.go b/internal/types/capture.go index ca4ddc20..a2d47aa9 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -20,7 +20,7 @@ type CaptureManager interface { Streaming() bool // broacast - StartBroadcast(url string) + StartBroadcast(url string) error StopBroadcast() BroadcastEnabled() bool BroadcastUrl() string diff --git a/internal/types/session.go b/internal/types/session.go index f96e958a..3e3a0bc4 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -30,6 +30,7 @@ type SessionManager interface { Admins() []Session Members() []Session Broadcast(v interface{}, exclude interface{}) + AdminBroadcast(v interface{}, exclude interface{}) OnHost(listener func(session Session)) OnHostCleared(listener func(session Session)) diff --git a/internal/websocket/handler/broadcast.go b/internal/websocket/handler/broadcast.go index 4e3aba89..7eda5b5f 100644 --- a/internal/websocket/handler/broadcast.go +++ b/internal/websocket/handler/broadcast.go @@ -12,7 +12,10 @@ func (h *MessageHandlerCtx) boradcastCreate(session types.Session, payload *mess return nil } - h.capture.StartBroadcast(payload.URL) + if err := h.capture.StartBroadcast(payload.URL); err != nil { + return err + } + return h.boradcastStatus(session) } From ac2fc100b40aa036682f5725f1341b13e7baf386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 21:53:06 +0100 Subject: [PATCH 109/876] REST API keyboard. --- internal/api/room/handler.go | 5 +++ internal/api/room/keyboard.go | 59 +++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 4f1ce704..18e2b849 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -60,4 +60,9 @@ func (h *RoomHandler) Route(r chi.Router) { r.Post("/start", h.BoradcastStart) r.Post("/stop", h.BoradcastStop) }) + + r.With(auth.HostsOnly).Route("/keyboard", func(r chi.Router) { + r.Post("/layout", h.KeyboardLayoutSet) + r.Post("/modifiers", h.KeyboardModifiersSet) + }) } diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 01912655..9568b743 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -1 +1,60 @@ package room + +import ( + "net/http" + + "demodesk/neko/internal/utils" +) + +type KeyboardLayoutData struct { + Layout string `json:"layout"` +} + +type KeyboardModifiersData struct { + NumLock *bool `json:"numlock"` + CapsLock *bool `json:"capslock"` + ScrollLock *bool `json:"scrollock"` +} + +func (h *RoomHandler) KeyboardLayoutSet(w http.ResponseWriter, r *http.Request) { + data := &KeyboardLayoutData{} + if !utils.HttpJsonRequest(w, r, data) { + return + } + + h.desktop.SetKeyboardLayout(data.Layout) + + utils.HttpSuccess(w) +} + +func (h *RoomHandler) KeyboardModifiersSet(w http.ResponseWriter, r *http.Request) { + data := &KeyboardModifiersData{} + if !utils.HttpJsonRequest(w, r, data) { + return + } + + var NumLock = 0 + if data.NumLock == nil { + NumLock = -1 + } else if *data.NumLock { + NumLock = 1 + } + + var CapsLock = 0 + if data.CapsLock == nil { + CapsLock = -1 + } else if *data.CapsLock { + CapsLock = 1 + } + + var ScrollLock = 0 + if data.ScrollLock == nil { + ScrollLock = -1 + } else if *data.ScrollLock { + ScrollLock = 1 + } + + h.desktop.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) + + utils.HttpSuccess(w) +} From 18ca647c76a800460d315d8a31bb2684b0a0a72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 21:56:42 +0100 Subject: [PATCH 110/876] Data -> Payload & change order. --- internal/api/room/clipboard.go | 6 +++--- internal/api/room/handler.go | 26 +++++++++++++------------- internal/api/room/screen.go | 10 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 37259fe1..0396d9c5 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -6,7 +6,7 @@ import ( "demodesk/neko/internal/utils" ) -type ClipboardData struct { +type ClipboardPayload struct { Text string `json:"text"` } @@ -14,13 +14,13 @@ func (h *RoomHandler) ClipboardRead(w http.ResponseWriter, r *http.Request) { // TODO: error check? text := h.desktop.ReadClipboard() - utils.HttpSuccess(w, ClipboardData{ + utils.HttpSuccess(w, ClipboardPayload{ Text: text, }) } func (h *RoomHandler) ClipboardWrite(w http.ResponseWriter, r *http.Request) { - data := &ClipboardData{} + data := &ClipboardPayload{} if !utils.HttpJsonRequest(w, r, data) { return } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 18e2b849..fa202188 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -35,11 +35,10 @@ func New( } func (h *RoomHandler) Route(r chi.Router) { - r.Route("/screen", func(r chi.Router) { - r.Get("/", h.ScreenConfiguration) - - r.With(auth.AdminsOnly).Post("/", h.ScreenConfigurationChange) - r.With(auth.AdminsOnly).Get("/configurations", h.ScreenConfigurationsList) + r.With(auth.AdminsOnly).Route("/broadcast", func(r chi.Router) { + r.Get("/", h.BroadcastStatus) + r.Post("/start", h.BoradcastStart) + r.Post("/stop", h.BoradcastStop) }) r.With(auth.HostsOnly).Route("/clipboard", func(r chi.Router) { @@ -47,6 +46,11 @@ func (h *RoomHandler) Route(r chi.Router) { r.Post("/", h.ClipboardWrite) }) + r.With(auth.HostsOnly).Route("/keyboard", func(r chi.Router) { + r.Post("/layout", h.KeyboardLayoutSet) + r.Post("/modifiers", h.KeyboardModifiersSet) + }) + r.Route("/control", func(r chi.Router) { r.Post("/request", h.ControlRequest) r.Post("/release", h.ControlRelease) @@ -55,14 +59,10 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Post("/give", h.ControlGive) }) - r.With(auth.AdminsOnly).Route("/broadcast", func(r chi.Router) { - r.Get("/", h.BroadcastStatus) - r.Post("/start", h.BoradcastStart) - r.Post("/stop", h.BoradcastStop) - }) + r.Route("/screen", func(r chi.Router) { + r.Get("/", h.ScreenConfiguration) - r.With(auth.HostsOnly).Route("/keyboard", func(r chi.Router) { - r.Post("/layout", h.KeyboardLayoutSet) - r.Post("/modifiers", h.KeyboardModifiersSet) + r.With(auth.AdminsOnly).Post("/", h.ScreenConfigurationChange) + r.With(auth.AdminsOnly).Get("/configurations", h.ScreenConfigurationsList) }) } diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 30351dd6..a54fd4eb 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -9,7 +9,7 @@ import ( "demodesk/neko/internal/http/auth" ) -type ScreenConfiguration struct { +type ScreenConfigurationPayload struct { Width int `json:"width"` Height int `json:"height"` Rate int `json:"rate"` @@ -23,7 +23,7 @@ func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request return } - utils.HttpSuccess(w, ScreenConfiguration{ + utils.HttpSuccess(w, ScreenConfigurationPayload{ Width: size.Width, Height: size.Height, Rate: int(size.Rate), @@ -31,7 +31,7 @@ func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request } func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.Request) { - data := &ScreenConfiguration{} + data := &ScreenConfigurationPayload{} if !utils.HttpJsonRequest(w, r, data) { return } @@ -56,12 +56,12 @@ func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.R } func (h *RoomHandler) ScreenConfigurationsList(w http.ResponseWriter, r *http.Request) { - list := []ScreenConfiguration{} + list := []ScreenConfigurationPayload{} ScreenConfigurations := h.desktop.ScreenConfigurations() for _, size := range ScreenConfigurations { for _, fps := range size.Rates { - list = append(list, ScreenConfiguration{ + list = append(list, ScreenConfigurationPayload{ Width: size.Width, Height: size.Height, Rate: int(fps), From 1ae6f05c736030a5380ea38dfa78f396cce45dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 22:34:42 +0100 Subject: [PATCH 111/876] update 401 & 403. --- internal/utils/http.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/utils/http.go b/internal/utils/http.go index 901e86b9..f520f010 100644 --- a/internal/utils/http.go +++ b/internal/utils/http.go @@ -50,12 +50,12 @@ func HttpBadRequest(w http.ResponseWriter, res ...interface{}) { defHttpError(w, http.StatusBadRequest, "Bad Request.", res...) } -func HttpNotAuthenticated(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusUnauthorized, "Invalid or missing access token.", res...) +func HttpNotAuthorized(w http.ResponseWriter, res ...interface{}) { + defHttpError(w, http.StatusUnauthorized, "Access token does not have the required scope.", res...) } -func HttpNotAuthorized(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusForbidden, "Access token does not have the required scope.", res...) +func HttpNotAuthenticated(w http.ResponseWriter, res ...interface{}) { + defHttpError(w, http.StatusForbidden, "Invalid or missing access token.", res...) } func HttpNotFound(w http.ResponseWriter, res ...interface{}) { From ef03f9ec9d15e39da9bfae42ceb62feef18b1728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 22:35:50 +0100 Subject: [PATCH 112/876] do not export REST functions. --- internal/api/room/broadcast.go | 6 +++--- internal/api/room/clipboard.go | 4 ++-- internal/api/room/control.go | 8 ++++---- internal/api/room/handler.go | 28 ++++++++++++++-------------- internal/api/room/keyboard.go | 4 ++-- internal/api/room/screen.go | 6 +++--- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index 1423953c..e4cae0e8 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -13,14 +13,14 @@ type BroadcastStatusPayload struct { IsActive bool `json:"is_active"` } -func (h *RoomHandler) BroadcastStatus(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) broadcastStatus(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w, BroadcastStatusPayload{ IsActive: h.capture.BroadcastEnabled(), URL: h.capture.BroadcastUrl(), }) } -func (h *RoomHandler) BoradcastStart(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { data := &BroadcastStatusPayload{} if !utils.HttpJsonRequest(w, r, data) { return @@ -51,7 +51,7 @@ func (h *RoomHandler) BoradcastStart(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } -func (h *RoomHandler) BoradcastStop(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { if !h.capture.BroadcastEnabled() { utils.HttpBadRequest(w, "Server is not broadcasting.") return diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 0396d9c5..c952ac9d 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -10,7 +10,7 @@ type ClipboardPayload struct { Text string `json:"text"` } -func (h *RoomHandler) ClipboardRead(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) clipboardRead(w http.ResponseWriter, r *http.Request) { // TODO: error check? text := h.desktop.ReadClipboard() @@ -19,7 +19,7 @@ func (h *RoomHandler) ClipboardRead(w http.ResponseWriter, r *http.Request) { }) } -func (h *RoomHandler) ClipboardWrite(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) clipboardWrite(w http.ResponseWriter, r *http.Request) { data := &ClipboardPayload{} if !utils.HttpJsonRequest(w, r, data) { return diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 44c6f71b..d5cc4017 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -13,7 +13,7 @@ type ControlGivePayload struct { ID string `json:"id"` } -func (h *RoomHandler) ControlRequest(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if session.IsHost() { utils.HttpBadRequest(w, "User is already host.") @@ -37,7 +37,7 @@ func (h *RoomHandler) ControlRequest(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } -func (h *RoomHandler) ControlRelease(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if !session.IsHost() { utils.HttpBadRequest(w, "User is not the host.") @@ -55,7 +55,7 @@ func (h *RoomHandler) ControlRelease(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } -func (h *RoomHandler) ControlTake(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) h.sessions.SetHost(session) @@ -69,7 +69,7 @@ func (h *RoomHandler) ControlTake(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } -func (h *RoomHandler) ControlGive(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { data := &ControlGivePayload{} if !utils.HttpJsonRequest(w, r, data) { return diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index fa202188..e2cc2a0f 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -36,33 +36,33 @@ func New( func (h *RoomHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Route("/broadcast", func(r chi.Router) { - r.Get("/", h.BroadcastStatus) - r.Post("/start", h.BoradcastStart) - r.Post("/stop", h.BoradcastStop) + r.Get("/", h.broadcastStatus) + r.Post("/start", h.boradcastStart) + r.Post("/stop", h.boradcastStop) }) r.With(auth.HostsOnly).Route("/clipboard", func(r chi.Router) { - r.Get("/", h.ClipboardRead) - r.Post("/", h.ClipboardWrite) + r.Get("/", h.clipboardRead) + r.Post("/", h.clipboardWrite) }) r.With(auth.HostsOnly).Route("/keyboard", func(r chi.Router) { - r.Post("/layout", h.KeyboardLayoutSet) - r.Post("/modifiers", h.KeyboardModifiersSet) + r.Post("/layout", h.keyboardLayoutSet) + r.Post("/modifiers", h.keyboardModifiersSet) }) r.Route("/control", func(r chi.Router) { - r.Post("/request", h.ControlRequest) - r.Post("/release", h.ControlRelease) + r.Post("/request", h.controlRequest) + r.Post("/release", h.controlRelease) - r.With(auth.AdminsOnly).Post("/take", h.ControlTake) - r.With(auth.AdminsOnly).Post("/give", h.ControlGive) + r.With(auth.AdminsOnly).Post("/take", h.controlTake) + r.With(auth.AdminsOnly).Post("/give", h.controlGive) }) r.Route("/screen", func(r chi.Router) { - r.Get("/", h.ScreenConfiguration) + r.Get("/", h.screenConfiguration) - r.With(auth.AdminsOnly).Post("/", h.ScreenConfigurationChange) - r.With(auth.AdminsOnly).Get("/configurations", h.ScreenConfigurationsList) + r.With(auth.AdminsOnly).Post("/", h.screenConfigurationChange) + r.With(auth.AdminsOnly).Get("/configurations", h.screenConfigurationsList) }) } diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 9568b743..1fd25b5c 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -16,7 +16,7 @@ type KeyboardModifiersData struct { ScrollLock *bool `json:"scrollock"` } -func (h *RoomHandler) KeyboardLayoutSet(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) keyboardLayoutSet(w http.ResponseWriter, r *http.Request) { data := &KeyboardLayoutData{} if !utils.HttpJsonRequest(w, r, data) { return @@ -27,7 +27,7 @@ func (h *RoomHandler) KeyboardLayoutSet(w http.ResponseWriter, r *http.Request) utils.HttpSuccess(w) } -func (h *RoomHandler) KeyboardModifiersSet(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) keyboardModifiersSet(w http.ResponseWriter, r *http.Request) { data := &KeyboardModifiersData{} if !utils.HttpJsonRequest(w, r, data) { return diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index a54fd4eb..315c6e76 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -15,7 +15,7 @@ type ScreenConfigurationPayload struct { Rate int `json:"rate"` } -func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request) { size := h.desktop.GetScreenSize() if size == nil { @@ -30,7 +30,7 @@ func (h *RoomHandler) ScreenConfiguration(w http.ResponseWriter, r *http.Request }) } -func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.Request) { data := &ScreenConfigurationPayload{} if !utils.HttpJsonRequest(w, r, data) { return @@ -55,7 +55,7 @@ func (h *RoomHandler) ScreenConfigurationChange(w http.ResponseWriter, r *http.R utils.HttpSuccess(w, data) } -func (h *RoomHandler) ScreenConfigurationsList(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) screenConfigurationsList(w http.ResponseWriter, r *http.Request) { list := []ScreenConfigurationPayload{} ScreenConfigurations := h.desktop.ScreenConfigurations() From 428d6939ecb0443304bf15bbe4a1d284917db0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 23:05:26 +0100 Subject: [PATCH 113/876] use HttpUnprocessableEntity if already broadcasting. --- internal/api/room/broadcast.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index e4cae0e8..07f0fa46 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -32,7 +32,7 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { } if h.capture.BroadcastEnabled() { - utils.HttpBadRequest(w, "Server is already broadcasting.") + utils.HttpUnprocessableEntity(w, "Server is already broadcasting.") return } @@ -53,7 +53,7 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { if !h.capture.BroadcastEnabled() { - utils.HttpBadRequest(w, "Server is not broadcasting.") + utils.HttpUnprocessableEntity(w, "Server is not broadcasting.") return } From 628abe06fd3380c3bdf7185c8b56cd4d086d8c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 23:05:38 +0100 Subject: [PATCH 114/876] rest control edit. --- internal/api/room/control.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index d5cc4017..94217aa2 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -9,23 +9,18 @@ import ( "demodesk/neko/internal/http/auth" ) -type ControlGivePayload struct { +type ControlTargetPayload struct { ID string `json:"id"` } func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { - session := auth.GetSession(r) - if session.IsHost() { - utils.HttpBadRequest(w, "User is already host.") - return - } - host := h.sessions.GetHost() if host != nil { - utils.HttpBadRequest(w, "There is already a host.") + utils.HttpUnprocessableEntity(w, "There is already a host.") return } + session := auth.GetSession(r) h.sessions.SetHost(session) h.sessions.Broadcast( @@ -40,7 +35,7 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if !session.IsHost() { - utils.HttpBadRequest(w, "User is not the host.") + utils.HttpUnprocessableEntity(w, "User is not the host.") return } @@ -70,7 +65,7 @@ func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { } func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { - data := &ControlGivePayload{} + data := &ControlTargetPayload{} if !utils.HttpJsonRequest(w, r, data) { return } From fb6dabf4e01fa211721a8b6cd1903858a3fbec2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 23:14:28 +0100 Subject: [PATCH 115/876] add control status. --- internal/api/room/control.go | 20 ++++++++++++++++++++ internal/api/room/handler.go | 1 + 2 files changed, 21 insertions(+) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 94217aa2..7539ae26 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -9,10 +9,30 @@ import ( "demodesk/neko/internal/http/auth" ) +type ControlStatusPayload struct { + HasHost bool `json:"has_host"` + HostId string `json:"host_id,omitempty"` +} + type ControlTargetPayload struct { ID string `json:"id"` } +func (h *RoomHandler) controlStatus(w http.ResponseWriter, r *http.Request) { + host := h.sessions.GetHost() + + if host == nil { + utils.HttpSuccess(w, ControlStatusPayload{ + HasHost: false, + }) + } else { + utils.HttpSuccess(w, ControlStatusPayload{ + HasHost: true, + HostId: host.ID(), + }) + } +} + func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { host := h.sessions.GetHost() if host != nil { diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index e2cc2a0f..cca2b044 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -52,6 +52,7 @@ func (h *RoomHandler) Route(r chi.Router) { }) r.Route("/control", func(r chi.Router) { + r.Get("/", h.controlStatus) r.Post("/request", h.controlRequest) r.Post("/release", h.controlRelease) From 45f029a2a4d69f6143c842b254762332b93633df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Nov 2020 23:32:43 +0100 Subject: [PATCH 116/876] fix broadcast bug. --- internal/capture/manager.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 3e9c280e..ed1d8d61 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -47,7 +47,9 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt func (manager *CaptureManagerCtx) Start() { if manager.BroadcastEnabled() { - manager.createBroadcastPipeline() + if err := manager.createBroadcastPipeline(); err != nil { + manager.logger.Panic().Err(err).Msg("unable to create broadcast pipeline") + } } manager.desktop.OnBeforeScreenSizeChange(func() { @@ -66,7 +68,9 @@ func (manager *CaptureManagerCtx) Start() { } if manager.BroadcastEnabled() { - manager.createBroadcastPipeline() + if err := manager.createBroadcastPipeline(); err != nil { + manager.logger.Panic().Err(err).Msg("unable to create broadcast pipeline") + } } }) @@ -97,7 +101,7 @@ func (manager *CaptureManagerCtx) Shutdown() error { } if manager.BroadcastEnabled() { - manager.createBroadcastPipeline() + manager.destroyBroadcastPipeline() } manager.emit_stop <- true From d39d922f8507e29e8947393569c49f74fb0fe354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 21 Nov 2020 23:39:24 +0100 Subject: [PATCH 117/876] add dummy member endpoints. --- internal/api/member/authenticate.go | 1 - internal/api/member/crud.go | 30 +++++++++++++++++++++ internal/api/member/handler.go | 41 +++++++++++++++++++++++++++++ internal/api/member/list.go | 12 +++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) delete mode 100644 internal/api/member/authenticate.go create mode 100644 internal/api/member/crud.go create mode 100644 internal/api/member/list.go diff --git a/internal/api/member/authenticate.go b/internal/api/member/authenticate.go deleted file mode 100644 index 363b41ee..00000000 --- a/internal/api/member/authenticate.go +++ /dev/null @@ -1 +0,0 @@ -package member diff --git a/internal/api/member/crud.go b/internal/api/member/crud.go new file mode 100644 index 00000000..7ab90178 --- /dev/null +++ b/internal/api/member/crud.go @@ -0,0 +1,30 @@ +package member + +import ( + "net/http" + + "demodesk/neko/internal/utils" +) + +func (h *MemberHandler) memberCreate(w http.ResponseWriter, r *http.Request) { + + utils.HttpSuccess(w) +} + +func (h *MemberHandler) memberRead(w http.ResponseWriter, r *http.Request) { + member := GetMember(r) + + utils.HttpSuccess(w, "Your name is " + member.Name() + ".") +} + +func (h *MemberHandler) memberUpdate(w http.ResponseWriter, r *http.Request) { + member := GetMember(r) + + utils.HttpSuccess(w, "Your name is " + member.Name() + ".") +} + +func (h *MemberHandler) memberDelete(w http.ResponseWriter, r *http.Request) { + member := GetMember(r) + + utils.HttpSuccess(w, "Your name is " + member.Name() + ".") +} diff --git a/internal/api/member/handler.go b/internal/api/member/handler.go index 6d35d38a..c50cc26e 100644 --- a/internal/api/member/handler.go +++ b/internal/api/member/handler.go @@ -1,9 +1,20 @@ package member import ( + "context" + "net/http" + "github.com/go-chi/chi" "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" + "demodesk/neko/internal/http/auth" +) + +type key int + +const ( + keyMemberCtx key = iota ) type MemberHandler struct { @@ -22,4 +33,34 @@ func New( func (h *MemberHandler) Route(r chi.Router) { + r.With(auth.AdminsOnly).Group(func(r chi.Router) { + r.Get("/", h.memberList) + + r.Post("/", h.memberCreate) + r.Get("/{memberId}/", h.memberRead) + r.Post("/{memberId}/", h.memberUpdate) + r.Delete("/{memberId}/", h.memberDelete) + }) + +} + +func SetMember(r *http.Request, session types.Session) *http.Request { + ctx := context.WithValue(r.Context(), keyMemberCtx, session) + return r.WithContext(ctx) +} + +func GetMember(r *http.Request) types.Session { + return r.Context().Value(keyMemberCtx).(types.Session) +} + +func (h *MemberHandler) ExtractMember(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + memberId := chi.URLParam(r, "memberId") + session, ok := h.sessions.Get(memberId) + if !ok { + utils.HttpNotFound(w, "Member was not found.") + } else { + next.ServeHTTP(w, SetMember(r, session)) + } + }) } diff --git a/internal/api/member/list.go b/internal/api/member/list.go new file mode 100644 index 00000000..e9485e6b --- /dev/null +++ b/internal/api/member/list.go @@ -0,0 +1,12 @@ +package member + +import ( + "net/http" + + "demodesk/neko/internal/utils" +) + +func (h *MemberHandler) memberList(w http.ResponseWriter, r *http.Request) { + + utils.HttpSuccess(w) +} From ce49d975c047a3db2146efb01890321f6ca2d8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 21 Nov 2020 23:42:34 +0100 Subject: [PATCH 118/876] member in plural form. --- internal/api/member/list.go | 12 ----------- internal/api/{member => members}/crud.go | 10 +++++----- internal/api/{member => members}/handler.go | 22 ++++++++++----------- internal/api/members/list.go | 12 +++++++++++ internal/api/router.go | 6 +++--- 5 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 internal/api/member/list.go rename internal/api/{member => members}/crud.go (53%) rename internal/api/{member => members}/handler.go (70%) create mode 100644 internal/api/members/list.go diff --git a/internal/api/member/list.go b/internal/api/member/list.go deleted file mode 100644 index e9485e6b..00000000 --- a/internal/api/member/list.go +++ /dev/null @@ -1,12 +0,0 @@ -package member - -import ( - "net/http" - - "demodesk/neko/internal/utils" -) - -func (h *MemberHandler) memberList(w http.ResponseWriter, r *http.Request) { - - utils.HttpSuccess(w) -} diff --git a/internal/api/member/crud.go b/internal/api/members/crud.go similarity index 53% rename from internal/api/member/crud.go rename to internal/api/members/crud.go index 7ab90178..85f91c7b 100644 --- a/internal/api/member/crud.go +++ b/internal/api/members/crud.go @@ -1,4 +1,4 @@ -package member +package members import ( "net/http" @@ -6,24 +6,24 @@ import ( "demodesk/neko/internal/utils" ) -func (h *MemberHandler) memberCreate(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } -func (h *MemberHandler) memberRead(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { member := GetMember(r) utils.HttpSuccess(w, "Your name is " + member.Name() + ".") } -func (h *MemberHandler) memberUpdate(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { member := GetMember(r) utils.HttpSuccess(w, "Your name is " + member.Name() + ".") } -func (h *MemberHandler) memberDelete(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) { member := GetMember(r) utils.HttpSuccess(w, "Your name is " + member.Name() + ".") diff --git a/internal/api/member/handler.go b/internal/api/members/handler.go similarity index 70% rename from internal/api/member/handler.go rename to internal/api/members/handler.go index c50cc26e..13444838 100644 --- a/internal/api/member/handler.go +++ b/internal/api/members/handler.go @@ -1,4 +1,4 @@ -package member +package members import ( "context" @@ -17,29 +17,29 @@ const ( keyMemberCtx key = iota ) -type MemberHandler struct { +type MembersHandler struct { sessions types.SessionManager } func New( sessions types.SessionManager, -) *MemberHandler { +) *MembersHandler { // Init - return &MemberHandler{ + return &MembersHandler{ sessions: sessions, } } -func (h *MemberHandler) Route(r chi.Router) { +func (h *MembersHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Group(func(r chi.Router) { - r.Get("/", h.memberList) + r.Get("/", h.membersList) - r.Post("/", h.memberCreate) - r.Get("/{memberId}/", h.memberRead) - r.Post("/{memberId}/", h.memberUpdate) - r.Delete("/{memberId}/", h.memberDelete) + r.Post("/", h.membersCreate) + r.Get("/{memberId}/", h.membersRead) + r.Post("/{memberId}/", h.membersUpdate) + r.Delete("/{memberId}/", h.membersDelete) }) } @@ -53,7 +53,7 @@ func GetMember(r *http.Request) types.Session { return r.Context().Value(keyMemberCtx).(types.Session) } -func (h *MemberHandler) ExtractMember(next http.Handler) http.Handler { +func (h *MembersHandler) ExtractMember(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { memberId := chi.URLParam(r, "memberId") session, ok := h.sessions.Get(memberId) diff --git a/internal/api/members/list.go b/internal/api/members/list.go new file mode 100644 index 00000000..ec8a9540 --- /dev/null +++ b/internal/api/members/list.go @@ -0,0 +1,12 @@ +package members + +import ( + "net/http" + + "demodesk/neko/internal/utils" +) + +func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { + + utils.HttpSuccess(w) +} diff --git a/internal/api/router.go b/internal/api/router.go index f1cdf64a..e828084c 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -5,7 +5,7 @@ import ( "github.com/go-chi/chi" - "demodesk/neko/internal/api/member" + "demodesk/neko/internal/api/members" "demodesk/neko/internal/api/room" "demodesk/neko/internal/http/auth" "demodesk/neko/internal/types" @@ -36,8 +36,8 @@ func New( func (api *ApiManagerCtx) Route(r chi.Router) { r.Use(api.Authenticate) - memberHandler := member.New(api.sessions) - r.Route("/member", memberHandler.Route) + membersHandler := members.New(api.sessions) + r.Route("/members", membersHandler.Route) roomHandler := room.New(api.sessions, api.desktop, api.capture) r.Route("/room", roomHandler.Route) From 43781cdf52265d2996059abc53e2d91fcb46bbb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 21 Nov 2020 23:57:54 +0100 Subject: [PATCH 119/876] fix crud handler. --- internal/api/members/handler.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 13444838..a580cc81 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -32,16 +32,16 @@ func New( } func (h *MembersHandler) Route(r chi.Router) { - + r.Get("/", h.membersList) + r.With(auth.AdminsOnly).Group(func(r chi.Router) { - r.Get("/", h.membersList) - r.Post("/", h.membersCreate) - r.Get("/{memberId}/", h.membersRead) - r.Post("/{memberId}/", h.membersUpdate) - r.Delete("/{memberId}/", h.membersDelete) + r.With(h.ExtractMember).Route("/{memberId}", func(r chi.Router) { + r.Get("/", h.membersRead) + r.Post("/", h.membersUpdate) + r.Delete("/", h.membersDelete) + }) }) - } func SetMember(r *http.Request, session types.Session) *http.Request { From d49542013b90d1a14ef51e74f7e034560b99acab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 22 Nov 2020 00:06:55 +0100 Subject: [PATCH 120/876] CRUD add payloads. --- internal/api/members/crud.go | 48 ++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index 85f91c7b..b760566d 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -6,25 +6,63 @@ import ( "demodesk/neko/internal/utils" ) -func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { +type MemberCreatePayload struct { + ID string `json:"id"` +} - utils.HttpSuccess(w) +type MemberDataPayload struct { + ID string `json:"id"` + Name string `json:"name"` + Admin bool `json:"admin"` +} + +func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { + data := &MemberDataPayload{} + if !utils.HttpJsonRequest(w, r, data) { + return + } + + utils.HttpSuccess(w, MemberCreatePayload{ + ID: "some_id", + }) } func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { + data := &MemberDataPayload{} + if !utils.HttpJsonRequest(w, r, data) { + return + } + member := GetMember(r) - utils.HttpSuccess(w, "Your name is " + member.Name() + ".") + utils.HttpSuccess(w, MemberDataPayload{ + ID: member.ID(), + Name: member.Name(), + Admin: member.Admin(), + }) } func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { + data := &MemberDataPayload{} + if !utils.HttpJsonRequest(w, r, data) { + return + } + member := GetMember(r) - utils.HttpSuccess(w, "Your name is " + member.Name() + ".") + utils.HttpSuccess(w, MemberDataPayload{ + ID: member.ID(), + Name: member.Name(), + Admin: member.Admin(), + }) } func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - utils.HttpSuccess(w, "Your name is " + member.Name() + ".") + utils.HttpSuccess(w, MemberDataPayload{ + ID: member.ID(), + Name: member.Name(), + Admin: member.Admin(), + }) } From ff7efe9f3bfc98f3f452727f7b6350a2bf2007fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 18:36:33 +0100 Subject: [PATCH 121/876] socket -> websocket_peer. --- internal/session/session.go | 30 ++++++++--------- internal/types/session.go | 2 +- internal/types/websocket.go | 2 +- internal/websocket/handler/handler.go | 2 +- internal/websocket/manager.go | 6 ++-- internal/websocket/peer.go | 47 +++++++++++++++++++++++++++ internal/websocket/websocket.go | 47 --------------------------- 7 files changed, 68 insertions(+), 68 deletions(-) create mode 100644 internal/websocket/peer.go delete mode 100644 internal/websocket/websocket.go diff --git a/internal/session/session.go b/internal/session/session.go index e1e41a74..abf3f4f3 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -9,14 +9,14 @@ import ( ) type SessionCtx struct { - logger zerolog.Logger - id string - name string - admin bool - connected bool - manager *SessionManagerCtx - socket types.WebSocket - peer types.Peer + logger zerolog.Logger + id string + name string + admin bool + connected bool + manager *SessionManagerCtx + websocket_peer types.WebSocketPeer + peer types.Peer } func (session *SessionCtx) ID() string { @@ -43,8 +43,8 @@ func (session *SessionCtx) SetName(name string) { session.name = name } -func (session *SessionCtx) SetSocket(socket types.WebSocket) { - session.socket = socket +func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { + session.websocket_peer = websocket_peer session.manager.emmiter.Emit("created", session) } @@ -59,7 +59,7 @@ func (session *SessionCtx) SetConnected(connected bool) { session.manager.emmiter.Emit("connected", session) } else { session.manager.emmiter.Emit("disconnected", session) - session.socket = nil + session.websocket_peer = nil // TODO: Refactor. _ = session.manager.Destroy(session.id) @@ -77,11 +77,11 @@ func (session *SessionCtx) Disconnect(reason string) error { } func (session *SessionCtx) Send(v interface{}) error { - if session.socket == nil { + if session.websocket_peer == nil { return nil } - return session.socket.Send(v) + return session.websocket_peer.Send(v) } func (session *SessionCtx) SignalAnswer(sdp string) error { @@ -93,8 +93,8 @@ func (session *SessionCtx) SignalAnswer(sdp string) error { } func (session *SessionCtx) destroy() error { - if session.socket != nil { - if err := session.socket.Destroy(); err != nil { + if session.websocket_peer != nil { + if err := session.websocket_peer.Destroy(); err != nil { return err } } diff --git a/internal/types/session.go b/internal/types/session.go index 3e3a0bc4..be775442 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -9,7 +9,7 @@ type Session interface { IsHost() bool Connected() bool SetName(name string) - SetSocket(socket WebSocket) + SetWebSocketPeer(websocket_peer WebSocketPeer) SetPeer(peer Peer) SetConnected(connected bool) Disconnect(reason string) error diff --git a/internal/types/websocket.go b/internal/types/websocket.go index 630c5d65..a55a9ee5 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -2,7 +2,7 @@ package types import "net/http" -type WebSocket interface { +type WebSocketPeer interface { Send(v interface{}) error Destroy() error } diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 77bfb699..3f3abb61 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -40,7 +40,7 @@ type MessageHandlerCtx struct { locked bool } -func (h *MessageHandlerCtx) Connected(session types.Session, socket types.WebSocket) (bool, string) { +func (h *MessageHandlerCtx) Connected(session types.Session, websocket_peer types.WebSocketPeer) (bool, string) { if h.locked && !session.Admin(){ h.logger.Debug().Msg("server locked") return false, "locked" diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index a9b5ee6c..7b583173 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -142,13 +142,13 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return connection.Close() } - socket := &WebSocketCtx{ + websocket_peer := &WebSocketPeerCtx{ session: session, ws: ws, connection: connection, } - ok, reason := ws.handler.Connected(session, socket) + ok, reason := ws.handler.Connected(session, websocket_peer) if !ok { // TODO: Refactor if err = connection.WriteJSON(message.Disconnect{ @@ -161,7 +161,7 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return connection.Close() } - session.SetSocket(socket) + session.SetWebSocketPeer(websocket_peer) ws.logger. Debug(). diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go new file mode 100644 index 00000000..98a6e607 --- /dev/null +++ b/internal/websocket/peer.go @@ -0,0 +1,47 @@ +package websocket + +import ( + "encoding/json" + "sync" + + "github.com/gorilla/websocket" + + "demodesk/neko/internal/types" +) + +type WebSocketPeerCtx struct { + session types.Session + ws *WebSocketManagerCtx + connection *websocket.Conn + mu sync.Mutex +} + +func (websocket_peer *WebSocketPeerCtx) Send(v interface{}) error { + websocket_peer.mu.Lock() + defer websocket_peer.mu.Unlock() + + if websocket_peer.connection == nil { + return nil + } + + raw, err := json.Marshal(v) + if err != nil { + return err + } + + websocket_peer.ws.logger.Debug(). + Str("session", websocket_peer.session.ID()). + Str("address", websocket_peer.connection.RemoteAddr().String()). + Str("raw", string(raw)). + Msg("sending message to client") + + return websocket_peer.connection.WriteMessage(websocket.TextMessage, raw) +} + +func (websocket_peer *WebSocketPeerCtx) Destroy() error { + if websocket_peer.connection == nil { + return nil + } + + return websocket_peer.connection.Close() +} diff --git a/internal/websocket/websocket.go b/internal/websocket/websocket.go deleted file mode 100644 index 53dcb43e..00000000 --- a/internal/websocket/websocket.go +++ /dev/null @@ -1,47 +0,0 @@ -package websocket - -import ( - "encoding/json" - "sync" - - "github.com/gorilla/websocket" - - "demodesk/neko/internal/types" -) - -type WebSocketCtx struct { - session types.Session - ws *WebSocketManagerCtx - connection *websocket.Conn - mu sync.Mutex -} - -func (socket *WebSocketCtx) Send(v interface{}) error { - socket.mu.Lock() - defer socket.mu.Unlock() - - if socket.connection == nil { - return nil - } - - raw, err := json.Marshal(v) - if err != nil { - return err - } - - socket.ws.logger.Debug(). - Str("session", socket.session.ID()). - Str("address", socket.connection.RemoteAddr().String()). - Str("raw", string(raw)). - Msg("sending message to client") - - return socket.connection.WriteMessage(websocket.TextMessage, raw) -} - -func (socket *WebSocketCtx) Destroy() error { - if socket.connection == nil { - return nil - } - - return socket.connection.Close() -} From b73e2403af2ab8d556be3dbc9aac0694dc8d76e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 18:41:40 +0100 Subject: [PATCH 122/876] peer -> webrtc_peer. --- internal/session/session.go | 14 +++++++------- internal/types/session.go | 2 +- internal/types/webrtc.go | 10 +++++----- internal/webrtc/manager.go | 2 +- internal/webrtc/peer.go | 12 ++++++------ 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index abf3f4f3..95c3c95a 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -16,7 +16,7 @@ type SessionCtx struct { connected bool manager *SessionManagerCtx websocket_peer types.WebSocketPeer - peer types.Peer + webrtc_peer types.WebRTCPeer } func (session *SessionCtx) ID() string { @@ -48,8 +48,8 @@ func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) session.manager.emmiter.Emit("created", session) } -func (session *SessionCtx) SetPeer(peer types.Peer) { - session.peer = peer +func (session *SessionCtx) SetWebRTCPeer(webrtc_peer types.WebRTCPeer) { + session.webrtc_peer = webrtc_peer } func (session *SessionCtx) SetConnected(connected bool) { @@ -85,11 +85,11 @@ func (session *SessionCtx) Send(v interface{}) error { } func (session *SessionCtx) SignalAnswer(sdp string) error { - if session.peer == nil { + if session.webrtc_peer == nil { return nil } - return session.peer.SignalAnswer(sdp) + return session.webrtc_peer.SignalAnswer(sdp) } func (session *SessionCtx) destroy() error { @@ -99,8 +99,8 @@ func (session *SessionCtx) destroy() error { } } - if session.peer != nil { - if err := session.peer.Destroy(); err != nil { + if session.webrtc_peer != nil { + if err := session.webrtc_peer.Destroy(); err != nil { return err } } diff --git a/internal/types/session.go b/internal/types/session.go index be775442..d241cfbf 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -10,7 +10,7 @@ type Session interface { Connected() bool SetName(name string) SetWebSocketPeer(websocket_peer WebSocketPeer) - SetPeer(peer Peer) + SetWebRTCPeer(webrtc_peer WebRTCPeer) SetConnected(connected bool) Disconnect(reason string) error Send(v interface{}) error diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index aa8c8c85..88a01932 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -1,12 +1,12 @@ package types +type WebRTCPeer interface { + SignalAnswer(sdp string) error + Destroy() error +} + type WebRTCManager interface { Start() Shutdown() error CreatePeer(session Session) (string, bool, []string, error) } - -type Peer interface { - SignalAnswer(sdp string) error - Destroy() error -} diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index a8b3dcc5..acce3009 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -163,7 +163,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool } }) - session.SetPeer(&PeerCtx{ + session.SetWebRTCPeer(&WebRTCPeerCtx{ api: api, engine: &engine, settings: &settings, diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 176b838e..da69e441 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -4,7 +4,7 @@ import ( "github.com/pion/webrtc/v2" ) -type PeerCtx struct { +type WebRTCPeerCtx struct { api *webrtc.API engine *webrtc.MediaEngine settings *webrtc.SettingEngine @@ -12,17 +12,17 @@ type PeerCtx struct { configuration *webrtc.Configuration } -func (peer *PeerCtx) SignalAnswer(sdp string) error { - return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ +func (webrtc_peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { + return webrtc_peer.connection.SetRemoteDescription(webrtc.SessionDescription{ SDP: sdp, Type: webrtc.SDPTypeAnswer, }) } -func (peer *PeerCtx) Destroy() error { - if peer.connection == nil || peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { +func (webrtc_peer *WebRTCPeerCtx) Destroy() error { + if webrtc_peer.connection == nil || webrtc_peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { return nil } - return peer.connection.Close() + return webrtc_peer.connection.Close() } From bc77c8f8f5902afcabdf1112c993ba00afc8357c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 19:44:50 +0100 Subject: [PATCH 123/876] add MemberProfile to session. --- internal/session/manager.go | 12 +++++++----- internal/session/session.go | 23 ++++++++++++++++------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 46460a67..ac2e6e7d 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -42,9 +42,11 @@ func (manager *SessionManagerCtx) New(id string, admin bool) types.Session { session := &SessionCtx{ id: id, - admin: admin, manager: manager, logger: manager.logger.With().Str("id", id).Logger(), + profile: MemberProfile{ + is_admin: admin, + }, connected: false, } @@ -116,7 +118,7 @@ func (manager *SessionManagerCtx) Admins() []types.Session { var sessions []types.Session for _, session := range manager.members { - if !session.connected || !session.admin { + if !session.Connected() || !session.Admin() { continue } @@ -132,7 +134,7 @@ func (manager *SessionManagerCtx) Members() []types.Session { var sessions []types.Session for _, session := range manager.members { - if !session.connected { + if !session.Connected() { continue } @@ -147,7 +149,7 @@ func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) defer manager.membersMu.Unlock() for id, session := range manager.members { - if !session.connected { + if !session.Connected() { continue } @@ -168,7 +170,7 @@ func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interfac defer manager.membersMu.Unlock() for id, session := range manager.members { - if !session.connected || !session.Admin() { + if !session.Connected() || !session.Admin() { continue } diff --git a/internal/session/session.go b/internal/session/session.go index 95c3c95a..189aadea 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -8,15 +8,24 @@ import ( "demodesk/neko/internal/types/message" ) +type MemberProfile struct { + token string + name string + is_admin bool + enabled bool + can_control bool + can_watch bool + clipboard_access bool +} + type SessionCtx struct { - logger zerolog.Logger id string - name string - admin bool - connected bool + logger zerolog.Logger manager *SessionManagerCtx + profile MemberProfile websocket_peer types.WebSocketPeer webrtc_peer types.WebRTCPeer + connected bool } func (session *SessionCtx) ID() string { @@ -24,11 +33,11 @@ func (session *SessionCtx) ID() string { } func (session *SessionCtx) Name() string { - return session.name + return session.profile.name } func (session *SessionCtx) Admin() bool { - return session.admin + return session.profile.is_admin } func (session *SessionCtx) IsHost() bool { @@ -40,7 +49,7 @@ func (session *SessionCtx) Connected() bool { } func (session *SessionCtx) SetName(name string) { - session.name = name + session.profile.name = name } func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { From fa5482309879d367bd30c984e7d3c322bbb615bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 20:02:53 +0100 Subject: [PATCH 124/876] Split connected to WebRTC & WebSocket. --- internal/session/session.go | 39 ++++++++++++++++++++++++++++------- internal/types/session.go | 3 +++ internal/webrtc/manager.go | 2 ++ internal/websocket/manager.go | 4 ++++ 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 189aadea..ebf4bf0c 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -19,13 +19,16 @@ type MemberProfile struct { } type SessionCtx struct { - id string - logger zerolog.Logger - manager *SessionManagerCtx - profile MemberProfile - websocket_peer types.WebSocketPeer - webrtc_peer types.WebRTCPeer - connected bool + id string + logger zerolog.Logger + manager *SessionManagerCtx + profile MemberProfile + websocket_peer types.WebSocketPeer + websocket_connected bool + webrtc_peer types.WebRTCPeer + webrtc_connected bool + // TODO: Refactor. + connected bool } func (session *SessionCtx) ID() string { @@ -57,10 +60,31 @@ func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) session.manager.emmiter.Emit("created", session) } +func (session *SessionCtx) SetWebSocketConnected(connected bool) { + if connected { + session.websocket_connected = true + session.manager.emmiter.Emit("websocket_connected", session) + } else { + session.websocket_connected = false + session.manager.emmiter.Emit("websocket_disconnected", session) + } +} + func (session *SessionCtx) SetWebRTCPeer(webrtc_peer types.WebRTCPeer) { session.webrtc_peer = webrtc_peer } +func (session *SessionCtx) SetWebRTCConnected(connected bool) { + if connected { + session.webrtc_connected = true + session.manager.emmiter.Emit("webrtc_connected", session) + } else { + session.webrtc_connected = false + session.manager.emmiter.Emit("webrtc_disconnected", session) + } +} + +// TODO: Refactor. func (session *SessionCtx) SetConnected(connected bool) { session.connected = connected @@ -76,6 +100,7 @@ func (session *SessionCtx) SetConnected(connected bool) { } func (session *SessionCtx) Disconnect(reason string) error { + // TODO: Refactor. session.SetConnected(false) return session.Send( diff --git a/internal/types/session.go b/internal/types/session.go index d241cfbf..29507962 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -10,7 +10,10 @@ type Session interface { Connected() bool SetName(name string) SetWebSocketPeer(websocket_peer WebSocketPeer) + SetWebSocketConnected(connected bool) SetWebRTCPeer(webrtc_peer WebRTCPeer) + SetWebRTCConnected(connected bool) + // TODO: Refactor. SetConnected(connected bool) Disconnect(reason string) error Send(v interface{}) error diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index acce3009..9997ec03 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -156,9 +156,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool case webrtc.PeerConnectionStateDisconnected: case webrtc.PeerConnectionStateFailed: manager.logger.Info().Str("id", session.ID()).Msg("peer disconnected") + // TODO: Change WebRTC connection state. session.SetConnected(false) case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", session.ID()).Msg("peer connected") + // TODO: Change WebRTC connection state. session.SetConnected(true) } }) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 7b583173..b4a48f4b 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -187,9 +187,13 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types. ticker := time.NewTicker(pingPeriod) go func() { + // TODO: Change WebSocket connection state. + //session.SetConnected(true) + defer func() { ticker.Stop() ws.logger.Debug().Str("address", connection.RemoteAddr().String()).Msg("handle socket ending") + // TODO: Change WebSocket connection state. session.SetConnected(false) }() From f9b2460c3b3e21fc33d2580ba2856a2e2db28434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 20:26:11 +0100 Subject: [PATCH 125/876] replace SetConnected function. --- internal/session/manager.go | 1 - internal/session/session.go | 38 ++++++++++++++++------------------- internal/types/session.go | 2 -- internal/webrtc/manager.go | 6 ++---- internal/websocket/manager.go | 18 ++++++++--------- 5 files changed, 27 insertions(+), 38 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index ac2e6e7d..f5cad684 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -47,7 +47,6 @@ func (manager *SessionManagerCtx) New(id string, admin bool) types.Session { profile: MemberProfile{ is_admin: admin, }, - connected: false, } manager.members[id] = session diff --git a/internal/session/session.go b/internal/session/session.go index ebf4bf0c..d775fd85 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -27,8 +27,6 @@ type SessionCtx struct { websocket_connected bool webrtc_peer types.WebRTCPeer webrtc_connected bool - // TODO: Refactor. - connected bool } func (session *SessionCtx) ID() string { @@ -48,7 +46,7 @@ func (session *SessionCtx) IsHost() bool { } func (session *SessionCtx) Connected() bool { - return session.connected + return session.websocket_connected && session.webrtc_connected } func (session *SessionCtx) SetName(name string) { @@ -66,7 +64,15 @@ func (session *SessionCtx) SetWebSocketConnected(connected bool) { session.manager.emmiter.Emit("websocket_connected", session) } else { session.websocket_connected = false - session.manager.emmiter.Emit("websocket_disconnected", session) + + // TODO: Refactor. + //session.manager.emmiter.Emit("websocket_disconnected", session) + session.manager.emmiter.Emit("disconnected", session) + + session.websocket_peer = nil + + // TODO: Refactor. + _ = session.manager.Destroy(session.id) } } @@ -77,31 +83,21 @@ func (session *SessionCtx) SetWebRTCPeer(webrtc_peer types.WebRTCPeer) { func (session *SessionCtx) SetWebRTCConnected(connected bool) { if connected { session.webrtc_connected = true - session.manager.emmiter.Emit("webrtc_connected", session) + + // TODO: Refactor. + //session.manager.emmiter.Emit("webrtc_connected", session) + session.manager.emmiter.Emit("connected", session) } else { session.webrtc_connected = false session.manager.emmiter.Emit("webrtc_disconnected", session) - } -} -// TODO: Refactor. -func (session *SessionCtx) SetConnected(connected bool) { - session.connected = connected - - if connected { - session.manager.emmiter.Emit("connected", session) - } else { - session.manager.emmiter.Emit("disconnected", session) - session.websocket_peer = nil - - // TODO: Refactor. - _ = session.manager.Destroy(session.id) + session.webrtc_peer = nil } } func (session *SessionCtx) Disconnect(reason string) error { - // TODO: Refactor. - session.SetConnected(false) + // TODO: End WebSocket connection. + // TODO: End WebRTC connection. return session.Send( message.Disconnect{ diff --git a/internal/types/session.go b/internal/types/session.go index 29507962..70b0b533 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -13,8 +13,6 @@ type Session interface { SetWebSocketConnected(connected bool) SetWebRTCPeer(webrtc_peer WebRTCPeer) SetWebRTCConnected(connected bool) - // TODO: Refactor. - SetConnected(connected bool) Disconnect(reason string) error Send(v interface{}) error SignalAnswer(sdp string) error diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 9997ec03..1af845aa 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -156,12 +156,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool case webrtc.PeerConnectionStateDisconnected: case webrtc.PeerConnectionStateFailed: manager.logger.Info().Str("id", session.ID()).Msg("peer disconnected") - // TODO: Change WebRTC connection state. - session.SetConnected(false) + session.SetWebRTCConnected(false) case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", session.ID()).Msg("peer connected") - // TODO: Change WebRTC connection state. - session.SetConnected(true) + session.SetWebRTCConnected(true) } }) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index b4a48f4b..89319386 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -169,12 +169,16 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e Str("address", connection.RemoteAddr().String()). Msg("connection started") + session.SetWebSocketConnected(true) + defer func() { ws.logger. Debug(). Str("session", session.ID()). Str("address", connection.RemoteAddr().String()). Msg("connection ended") + + session.SetWebSocketConnected(false) }() ws.handle(connection, session) @@ -186,17 +190,11 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types. cancel := make(chan struct{}) ticker := time.NewTicker(pingPeriod) - go func() { - // TODO: Change WebSocket connection state. - //session.SetConnected(true) - - defer func() { - ticker.Stop() - ws.logger.Debug().Str("address", connection.RemoteAddr().String()).Msg("handle socket ending") - // TODO: Change WebSocket connection state. - session.SetConnected(false) - }() + defer func() { + ticker.Stop() + }() + go func() { for { _, raw, err := connection.ReadMessage() if err != nil { From 104d98d12992587007a34fbc4b25afa0140df4be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 20:26:29 +0100 Subject: [PATCH 126/876] comment out yet unused props. --- internal/session/session.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index d775fd85..3136f5de 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -9,13 +9,13 @@ import ( ) type MemberProfile struct { - token string + //token string name string is_admin bool - enabled bool - can_control bool - can_watch bool - clipboard_access bool + //enabled bool + //can_control bool + //can_watch bool + //clipboard_access bool } type SessionCtx struct { From 665d9d2130f3f52335cd3ee0d2df17c54733be6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 22:06:13 +0100 Subject: [PATCH 127/876] Create + Delete session. --- internal/session/manager.go | 27 +++++++++++------ internal/session/session.go | 42 ++++++++++++--------------- internal/types/session.go | 4 +-- internal/websocket/handler/handler.go | 3 +- 4 files changed, 40 insertions(+), 36 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index f5cad684..8d90d7ea 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -1,6 +1,7 @@ package session import ( + "fmt" "sync" "github.com/kataras/go-events" @@ -36,21 +37,24 @@ type SessionManagerCtx struct { emmiter events.EventEmmiter } -func (manager *SessionManagerCtx) New(id string, admin bool) types.Session { +func (manager *SessionManagerCtx) Create(profile MemberProfile) (types.Session, error) { manager.membersMu.Lock() defer manager.membersMu.Unlock() + id, err := utils.NewUID(32) + if err != nil { + return nil, err + } + session := &SessionCtx{ id: id, manager: manager, logger: manager.logger.With().Str("id", id).Logger(), - profile: MemberProfile{ - is_admin: admin, - }, + profile: profile, } manager.members[id] = session - return session + return session, nil } func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { @@ -61,14 +65,19 @@ func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { return session, ok } -func (manager *SessionManagerCtx) Destroy(id string) error { +func (manager *SessionManagerCtx) Delete(id string) error { manager.membersMu.Lock() defer manager.membersMu.Unlock() session, ok := manager.members[id] - if ok { - delete(manager.members, id) - return session.destroy() + if !ok { + return fmt.Errorf("Member not found.") + } + + delete(manager.members, id) + + if session.Connected() { + return session.Disconnect("member deleted") } return nil diff --git a/internal/session/session.go b/internal/session/session.go index 3136f5de..0254a36f 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -70,9 +70,6 @@ func (session *SessionCtx) SetWebSocketConnected(connected bool) { session.manager.emmiter.Emit("disconnected", session) session.websocket_peer = nil - - // TODO: Refactor. - _ = session.manager.Destroy(session.id) } } @@ -96,14 +93,27 @@ func (session *SessionCtx) SetWebRTCConnected(connected bool) { } func (session *SessionCtx) Disconnect(reason string) error { - // TODO: End WebSocket connection. - // TODO: End WebRTC connection. - - return session.Send( + if err := session.Send( message.Disconnect{ Event: event.SYSTEM_DISCONNECT, Message: reason, - }) + }); err != nil { + return err + } + + if session.websocket_peer != nil { + if err := session.websocket_peer.Destroy(); err != nil { + return err + } + } + + if session.webrtc_peer != nil { + if err := session.webrtc_peer.Destroy(); err != nil { + return err + } + } + + return nil } func (session *SessionCtx) Send(v interface{}) error { @@ -121,19 +131,3 @@ func (session *SessionCtx) SignalAnswer(sdp string) error { return session.webrtc_peer.SignalAnswer(sdp) } - -func (session *SessionCtx) destroy() error { - if session.websocket_peer != nil { - if err := session.websocket_peer.Destroy(); err != nil { - return err - } - } - - if session.webrtc_peer != nil { - if err := session.webrtc_peer.Destroy(); err != nil { - return err - } - } - - return nil -} diff --git a/internal/types/session.go b/internal/types/session.go index 70b0b533..f141145a 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -19,9 +19,9 @@ type Session interface { } type SessionManager interface { - New(id string, admin bool) Session + Create(profile MemberProfile) (Session, error) Get(id string) (Session, bool) - Destroy(id string) error + Delete(id string) error HasHost() bool SetHost(host Session) diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 3f3abb61..19068b33 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -49,13 +49,14 @@ func (h *MessageHandlerCtx) Connected(session types.Session, websocket_peer type return true, "" } +// TODO: Remove, unused. func (h *MessageHandlerCtx) Disconnected(id string) error { // TODO: Refactor. if h.locked && len(h.sessions.Admins()) == 0 { h.locked = false } - return h.sessions.Destroy(id) + return h.sessions.Delete(id) } func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { From d1fccf5ab62929c38c191e5df2ec93946cd7329a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 22:07:05 +0100 Subject: [PATCH 128/876] MemberProfile as public type & create user on auth. --- internal/session/auth.go | 10 +++------- internal/session/manager.go | 2 +- internal/session/session.go | 18 ++++-------------- internal/types/session.go | 10 ++++++++++ 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/internal/session/auth.go b/internal/session/auth.go index 7d9e8c51..2a9bd59d 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -6,7 +6,6 @@ import ( "strings" "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" ) const ( @@ -26,12 +25,9 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, return nil, fmt.Errorf("invalid password") } - id, err := utils.NewUID(32) - if err != nil { - return nil, err - } - - return manager.New(id, isAdmin), nil + return manager.Create(types.MemberProfile{ + IsAdmin: isAdmin, + }) } func getToken(r *http.Request) string { diff --git a/internal/session/manager.go b/internal/session/manager.go index 8d90d7ea..ec96a889 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -37,7 +37,7 @@ type SessionManagerCtx struct { emmiter events.EventEmmiter } -func (manager *SessionManagerCtx) Create(profile MemberProfile) (types.Session, error) { +func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Session, error) { manager.membersMu.Lock() defer manager.membersMu.Unlock() diff --git a/internal/session/session.go b/internal/session/session.go index 0254a36f..22ded516 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -8,21 +8,11 @@ import ( "demodesk/neko/internal/types/message" ) -type MemberProfile struct { - //token string - name string - is_admin bool - //enabled bool - //can_control bool - //can_watch bool - //clipboard_access bool -} - type SessionCtx struct { id string logger zerolog.Logger manager *SessionManagerCtx - profile MemberProfile + profile types.MemberProfile websocket_peer types.WebSocketPeer websocket_connected bool webrtc_peer types.WebRTCPeer @@ -34,11 +24,11 @@ func (session *SessionCtx) ID() string { } func (session *SessionCtx) Name() string { - return session.profile.name + return session.profile.Name } func (session *SessionCtx) Admin() bool { - return session.profile.is_admin + return session.profile.IsAdmin } func (session *SessionCtx) IsHost() bool { @@ -50,7 +40,7 @@ func (session *SessionCtx) Connected() bool { } func (session *SessionCtx) SetName(name string) { - session.profile.name = name + session.profile.Name = name } func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { diff --git a/internal/types/session.go b/internal/types/session.go index f141145a..b23d9255 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -2,6 +2,16 @@ package types import "net/http" +type MemberProfile struct { + //Token string + Name string + IsAdmin bool + //Enabled bool + //CanControl bool + //CanWatch bool + //ClipboardAccess bool +} + type Session interface { ID() string Name() string From ecfce6c8861ea42ea3681bf0eaba16ca0038dd9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 22:16:56 +0100 Subject: [PATCH 129/876] remove room lock. --- internal/session/auth.go | 1 + internal/types/event/events.go | 2 -- internal/websocket/handler/admin.go | 44 --------------------------- internal/websocket/handler/handler.go | 25 --------------- internal/websocket/manager.go | 22 +++----------- 5 files changed, 6 insertions(+), 88 deletions(-) diff --git a/internal/session/auth.go b/internal/session/auth.go index 2a9bd59d..3d797f19 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -25,6 +25,7 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, return nil, fmt.Errorf("invalid password") } + // TODO: Enable persistent user autentication. return manager.Create(types.MemberProfile{ IsAdmin: isAdmin, }) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 02a227ea..2f8432e2 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -39,8 +39,6 @@ const ( const ( ADMIN_KICK = "admin/kick" - ADMIN_LOCK = "admin/lock" - ADMIN_UNLOCK = "admin/unlock" ADMIN_CONTROL = "admin/control" ADMIN_RELEASE = "admin/release" ADMIN_GIVE = "admin/give" diff --git a/internal/websocket/handler/admin.go b/internal/websocket/handler/admin.go index ba7803eb..0b3994bc 100644 --- a/internal/websocket/handler/admin.go +++ b/internal/websocket/handler/admin.go @@ -6,50 +6,6 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandlerCtx) adminLock(session types.Session) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - if h.locked { - h.logger.Debug().Msg("server already locked...") - return nil - } - - h.locked = true - - h.sessions.Broadcast( - message.Admin{ - Event: event.ADMIN_LOCK, - ID: session.ID(), - }, nil) - - return nil -} - -func (h *MessageHandlerCtx) adminUnlock(session types.Session) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - if !h.locked { - h.logger.Debug().Msg("server not locked...") - return nil - } - - h.locked = false - - h.sessions.Broadcast( - message.Admin{ - Event: event.ADMIN_UNLOCK, - ID: session.ID(), - }, nil) - - return nil -} - func (h *MessageHandlerCtx) adminControl(session types.Session) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 19068b33..9eadc80f 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -27,7 +27,6 @@ func New( desktop: desktop, capture: capture, webrtc: webrtc, - locked: false, } } @@ -37,26 +36,6 @@ type MessageHandlerCtx struct { webrtc types.WebRTCManager desktop types.DesktopManager capture types.CaptureManager - locked bool -} - -func (h *MessageHandlerCtx) Connected(session types.Session, websocket_peer types.WebSocketPeer) (bool, string) { - if h.locked && !session.Admin(){ - h.logger.Debug().Msg("server locked") - return false, "locked" - } - - return true, "" -} - -// TODO: Remove, unused. -func (h *MessageHandlerCtx) Disconnected(id string) error { - // TODO: Refactor. - if h.locked && len(h.sessions.Admins()) == 0 { - h.locked = false - } - - return h.sessions.Delete(id) } func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { @@ -116,10 +95,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { err = h.boradcastDestroy(session) // Admin Events - case event.ADMIN_LOCK: - err = h.adminLock(session) - case event.ADMIN_UNLOCK: - err = h.adminUnlock(session) case event.ADMIN_CONTROL: err = h.adminControl(session) case event.ADMIN_RELEASE: diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 89319386..6404cdad 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -142,26 +142,11 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return connection.Close() } - websocket_peer := &WebSocketPeerCtx{ + session.SetWebSocketPeer(&WebSocketPeerCtx{ session: session, ws: ws, connection: connection, - } - - ok, reason := ws.handler.Connected(session, websocket_peer) - if !ok { - // TODO: Refactor - if err = connection.WriteJSON(message.Disconnect{ - Event: event.SYSTEM_DISCONNECT, - Message: reason, - }); err != nil { - ws.logger.Error().Err(err).Msg("failed to send disconnect") - } - - return connection.Close() - } - - session.SetWebSocketPeer(websocket_peer) + }) ws.logger. Debug(). @@ -179,6 +164,9 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e Msg("connection ended") session.SetWebSocketConnected(false) + + // TODO: Enable persistent user autentication. + _ = ws.sessions.Delete(session.ID()) }() ws.handle(connection, session) From 71a84963bccf75928b0d1c70a6b499109e1a6ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 22:35:54 +0100 Subject: [PATCH 130/876] fix types - no json. --- internal/types/desktop.go | 12 ++++++------ internal/types/session.go | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 69f888b8..ae206053 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -1,15 +1,15 @@ package types type ScreenSize struct { - Width int `json:"width"` - Height int `json:"height"` - Rate int16 `json:"rate"` + Width int + Height int + Rate int16 } type ScreenConfiguration struct { - Width int `json:"width"` - Height int `json:"height"` - Rates map[int]int16 `json:"rates"` + Width int + Height int + Rates map[int]int16 } type DesktopManager interface { diff --git a/internal/types/session.go b/internal/types/session.go index b23d9255..883dbbee 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -5,11 +5,11 @@ import "net/http" type MemberProfile struct { //Token string Name string - IsAdmin bool + IsAdmin bool //Enabled bool - //CanControl bool - //CanWatch bool - //ClipboardAccess bool + //CanControl bool + //CanWatch bool + //ClipboardAccess bool } type Session interface { From a330a3cc76261dc436a6ccff65d432460e14fba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 25 Nov 2020 22:39:54 +0100 Subject: [PATCH 131/876] REST create & Delete member. --- internal/api/members/crud.go | 39 +++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index b760566d..7b8fec3e 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -4,16 +4,21 @@ import ( "net/http" "demodesk/neko/internal/utils" + "demodesk/neko/internal/types" ) type MemberCreatePayload struct { - ID string `json:"id"` + ID string `json:"id"` } type MemberDataPayload struct { - ID string `json:"id"` - Name string `json:"name"` - Admin bool `json:"admin"` + ID string `json:"id"` + Name string `json:"name"` + IsAdmin bool `json:"is_admin"` + //Enabled bool `json:"enabled"` + //CanControl bool `json:"can_control"` + //CanWatch bool `json:"can_watch"` + //ClipboardAccess bool `json:"clipboard_access"` } func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { @@ -22,8 +27,17 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { return } + session, err := h.sessions.Create(types.MemberProfile{ + Name: data.Name, + IsAdmin: data.IsAdmin, + }) + if err != nil { + utils.HttpInternalServer(w, err) + return + } + utils.HttpSuccess(w, MemberCreatePayload{ - ID: "some_id", + ID: session.ID(), }) } @@ -38,7 +52,7 @@ func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w, MemberDataPayload{ ID: member.ID(), Name: member.Name(), - Admin: member.Admin(), + IsAdmin: member.Admin(), }) } @@ -53,16 +67,17 @@ func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w, MemberDataPayload{ ID: member.ID(), Name: member.Name(), - Admin: member.Admin(), + IsAdmin: member.Admin(), }) } func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - utils.HttpSuccess(w, MemberDataPayload{ - ID: member.ID(), - Name: member.Name(), - Admin: member.Admin(), - }) + if err := h.sessions.Delete(member.ID()); err != nil { + utils.HttpInternalServer(w, err) + return + } + + utils.HttpSuccess(w) } From a90bf87e24af0f9f8b394e420c8a26455900aada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 27 Nov 2020 19:59:54 +0100 Subject: [PATCH 132/876] login with secret. --- internal/session/auth.go | 49 +++++++++---------------------------- internal/session/manager.go | 27 ++++++++++++++------ internal/session/session.go | 4 +++ internal/types/session.go | 6 +++-- 4 files changed, 38 insertions(+), 48 deletions(-) diff --git a/internal/session/auth.go b/internal/session/auth.go index 3d797f19..9ccfa4ea 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -3,51 +3,24 @@ package session import ( "fmt" "net/http" - "strings" "demodesk/neko/internal/types" ) -const ( - token_name = "password" -) - func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, error) { - token := getToken(r) - if token == "" { - return nil, fmt.Errorf("no password provided") + id, secret, ok := r.BasicAuth() + if !ok { + return nil, fmt.Errorf("no authentication provided") } - isAdmin := (token == manager.config.AdminPassword) - isUser := (token == manager.config.Password) - - if !isAdmin && !isUser { - return nil, fmt.Errorf("invalid password") + session, ok := manager.Get(id) + if !ok { + return nil, fmt.Errorf("member not found") } - // TODO: Enable persistent user autentication. - return manager.Create(types.MemberProfile{ - IsAdmin: isAdmin, - }) -} - -func getToken(r *http.Request) string { - // Get token from query - if token := r.URL.Query().Get(token_name); token != "" { - return token - } - - // Get token from authorization header - bearer := r.Header.Get("Authorization") - if len(bearer) > 7 && strings.ToUpper(bearer[0:6]) == "BEARER" { - return bearer[7:] - } - - // Get token from cookie - cookie, err := r.Cookie(token_name) - if err == nil { - return cookie.Value - } - - return "" + if !session.VerifySecret(secret) { + return nil, fmt.Errorf("invalid password provided") + } + + return session, nil } diff --git a/internal/session/manager.go b/internal/session/manager.go index ec96a889..be48a6cf 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -14,7 +14,7 @@ import ( ) func New(capture types.CaptureManager, config *config.Session) *SessionManagerCtx { - return &SessionManagerCtx{ + manager := &SessionManagerCtx{ logger: log.With().Str("module", "session").Logger(), host: nil, hostMu: sync.Mutex{}, @@ -24,6 +24,22 @@ func New(capture types.CaptureManager, config *config.Session) *SessionManagerCt membersMu: sync.Mutex{}, emmiter: events.New(), } + + // create default admin account at startup + _ = manager.Create("admin", types.MemberProfile{ + Secret: config.AdminPassword, + Name: "Administrator", + IsAdmin: true, + }) + + // create default user account at startup + _ = manager.Create("user", types.MemberProfile{ + Secret: config.Password, + Name: "User", + IsAdmin: false, + }) + + return manager } type SessionManagerCtx struct { @@ -37,15 +53,10 @@ type SessionManagerCtx struct { emmiter events.EventEmmiter } -func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Session, error) { +func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) types.Session { manager.membersMu.Lock() defer manager.membersMu.Unlock() - id, err := utils.NewUID(32) - if err != nil { - return nil, err - } - session := &SessionCtx{ id: id, manager: manager, @@ -54,7 +65,7 @@ func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Ses } manager.members[id] = session - return session, nil + return session } func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { diff --git a/internal/session/session.go b/internal/session/session.go index 22ded516..1799d767 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -35,6 +35,10 @@ func (session *SessionCtx) IsHost() bool { return session.manager.host != nil && session.manager.host.ID() == session.ID() } +func (session *SessionCtx) VerifySecret(secret string) bool { + return session.profile.Secret == secret +} + func (session *SessionCtx) Connected() bool { return session.websocket_connected && session.webrtc_connected } diff --git a/internal/types/session.go b/internal/types/session.go index 883dbbee..cc54a828 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -3,7 +3,8 @@ package types import "net/http" type MemberProfile struct { - //Token string + ID string + Secret string Name string IsAdmin bool //Enabled bool @@ -18,6 +19,7 @@ type Session interface { Admin() bool IsHost() bool Connected() bool + VerifySecret(secret string) bool SetName(name string) SetWebSocketPeer(websocket_peer WebSocketPeer) SetWebSocketConnected(connected bool) @@ -29,7 +31,7 @@ type Session interface { } type SessionManager interface { - Create(profile MemberProfile) (Session, error) + Create(id string, profile MemberProfile) Session Get(id string) (Session, bool) Delete(id string) error From 59457b7658d5a9f8c01e7956cbcfa7fac5660de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 27 Nov 2020 20:00:14 +0100 Subject: [PATCH 133/876] rest CRUD members minor update. --- internal/api/members/crud.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index 7b8fec3e..228d1d90 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -13,6 +13,7 @@ type MemberCreatePayload struct { type MemberDataPayload struct { ID string `json:"id"` + Secret string `json:"secret,omitempty"` Name string `json:"name"` IsAdmin bool `json:"is_admin"` //Enabled bool `json:"enabled"` @@ -27,26 +28,24 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { return } - session, err := h.sessions.Create(types.MemberProfile{ - Name: data.Name, - IsAdmin: data.IsAdmin, - }) + id, err := utils.NewUID(32) if err != nil { utils.HttpInternalServer(w, err) return } + session := h.sessions.Create(id, types.MemberProfile{ + Secret: data.Secret, + Name: data.Name, + IsAdmin: data.IsAdmin, + }) + utils.HttpSuccess(w, MemberCreatePayload{ ID: session.ID(), }) } func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { - data := &MemberDataPayload{} - if !utils.HttpJsonRequest(w, r, data) { - return - } - member := GetMember(r) utils.HttpSuccess(w, MemberDataPayload{ From 1ffae72bf13289d8de831226c52bd6a0a0c8ec44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 27 Nov 2020 21:51:33 +0100 Subject: [PATCH 134/876] multistage Dockerfile. --- Dockerfile | 76 ++++++++++++++++++++++++++++++++- runtime/dbus | 11 +++++ runtime/default.pa | 7 ++++ runtime/supervisord.conf | 53 +++++++++++++++++++++++ runtime/xorg.conf | 90 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 235 insertions(+), 2 deletions(-) create mode 100644 runtime/dbus create mode 100644 runtime/default.pa create mode 100644 runtime/supervisord.conf create mode 100644 runtime/xorg.conf diff --git a/Dockerfile b/Dockerfile index 076cb15b..7dbec88f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,12 @@ -FROM golang:1.15-buster as server +# +# Stage 1: Build. +# +FROM golang:1.15-buster as build WORKDIR /src # # install dependencies +ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; apt-get update; \ apt-get install -y --no-install-recommends git cmake make libx11-dev libxrandr-dev libxtst-dev \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly; \ @@ -26,4 +30,72 @@ RUN set -eux; apt-get update; \ COPY . . RUN go get -v -t -d . && go build -o bin/neko -i cmd/neko/main.go -ENTRYPOINT [ "bin/neko" ] +# +# Stage 2: Runtime. +# +FROM debian:buster-slim as runtime + +# +# set custom user +ARG USERNAME=neko +ARG USER_UID=1000 +ARG USER_GID=$USER_UID + +# +# install dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; apt-get update; \ + apt-get install -y --no-install-recommends wget ca-certificates supervisor; \ + apt-get install -y --no-install-recommends pulseaudio dbus-x11 xserver-xorg-video-dummy xserver-xorg-input-void; \ + apt-get install -y --no-install-recommends libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx5; \ + # + # gst + apt-get install -y --no-install-recommends libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \ + gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-pulseaudio; \ + # + # create a non-root user + groupadd --gid $USER_GID $USERNAME; \ + useradd --uid $USER_UID --gid $USERNAME --shell /bin/bash --create-home $USERNAME; \ + adduser $USERNAME audio; \ + adduser $USERNAME video; \ + adduser $USERNAME pulse; \ + # + # setup pulseaudio + mkdir -p /home/$USERNAME/.config/pulse/; \ + echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \ + # + # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 + mkdir /tmp/.X11-unix; \ + chmod 1777 /tmp/.X11-unix; \ + chown $USERNAME /tmp/.X11-unix/; \ + # + # make directories for neko + mkdir -p /etc/neko /var/www /var/log/neko; \ + chmod 1777 /var/log/neko; \ + chown $USERNAME /var/log/neko/; \ + chown -R $USERNAME:$USERNAME /home/$USERNAME; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# copy runtime files +COPY runtime/dbus /usr/bin/dbus +COPY runtime/default.pa /etc/pulse/default.pa +COPY runtime/supervisord.conf /etc/neko/supervisord.conf +COPY runtime/xorg.conf /etc/neko/xorg.conf + +# +# set default envs +ENV USER=$USERNAME +ENV DISPLAY=:99.0 +ENV NEKO_BIND=:8080 + +# +# copy executabe from previous stage +COPY --from=build /src/bin/neko /usr/bin/neko + +# +# run neko +CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"] diff --git a/runtime/dbus b/runtime/dbus new file mode 100644 index 00000000..bf0d4375 --- /dev/null +++ b/runtime/dbus @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ ! -d /var/run/dbus ]; then + mkdir -p /var/run/dbus +fi + +if [ -f /var/run/dbus/pid ]; then + rm -f /var/run/dbus/pid +fi + +/usr/bin/dbus-daemon --nofork --print-pid --config-file=/usr/share/dbus-1/system.conf diff --git a/runtime/default.pa b/runtime/default.pa new file mode 100644 index 00000000..b0a26b10 --- /dev/null +++ b/runtime/default.pa @@ -0,0 +1,7 @@ +#!/usr/bin/pulseaudio -nF + +# Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices +load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1 + +### Make sure we always have a sink around, even if it is a null sink. +load-module module-always-sink diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf new file mode 100644 index 00000000..98f71bc2 --- /dev/null +++ b/runtime/supervisord.conf @@ -0,0 +1,53 @@ +[supervisord] +nodaemon=true +pidfile=/var/run/supervisord.pid +logfile=/dev/null +logfile_maxbytes=0 +loglevel=debug + +[include] +files=/etc/neko/supervisord/*.conf + +[program:dbus] +environment=HOME="/root",USER="root" +command=/usr/bin/dbus +autorestart=true +priority=100 +user=root +stdout_logfile=/var/log/neko/dbus.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true + +[program:x-server] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" +command=/usr/bin/X -config /etc/neko/xorg.conf %(ENV_DISPLAY)s +autorestart=true +priority=300 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/xorg.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true + +[program:pulseaudio] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/pulseaudio --disallow-module-loading -vvvv --disallow-exit --exit-idle-time=-1 +autorestart=true +priority=300 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/pulseaudio.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true + +[program:neko] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/neko serve -d --static "/var/www" +autorestart=true +priority=800 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/neko.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true diff --git a/runtime/xorg.conf b/runtime/xorg.conf new file mode 100644 index 00000000..eab523cb --- /dev/null +++ b/runtime/xorg.conf @@ -0,0 +1,90 @@ +# This xorg configuration file is meant to be used by xpra +# to start a dummy X11 server. +# For details, please see: +# https://xpra.org/trac/wiki/Xdummy + +Section "ServerFlags" + Option "DontVTSwitch" "true" + Option "AllowMouseOpenFail" "true" + Option "PciForceNone" "true" + Option "AutoEnableDevices" "false" + Option "AutoAddDevices" "false" +EndSection + +Section "InputDevice" + Identifier "dummy_mouse" + Option "CorePointer" "true" + Driver "void" +EndSection + +Section "InputDevice" + Identifier "dummy_keyboard" + Option "CoreKeyboard" "true" + Driver "void" +EndSection + +Section "Device" + Identifier "dummy_videocard" + Driver "dummy" + Option "ConstantDPI" "true" + #VideoRam 4096000 + #VideoRam 256000 + VideoRam 192000 +EndSection + +Section "Monitor" + Identifier "dummy_monitor" + HorizSync 5.0 - 1000.0 + VertRefresh 5.0 - 200.0 + #This can be used to get a specific DPI, but only for the default resolution: + #DisplaySize 508 317 + #NOTE: the highest modes will not work without increasing the VideoRam + # for the dummy video card. + # https://arachnoid.com/modelines/ + + # 1280x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 33.78 MHz + Modeline "1280x720_30.00" 33.78 1280 1288 1408 1536 720 721 724 733 -HSync +Vsync + + # 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz + Modeline "1280x720_60.00" 74.48 1280 1336 1472 1664 720 721 724 746 -HSync +Vsync + # 1152x648 @ 60.00 Hz (GTF) hsync: 40.26 kHz; pclk: 59.91 MHz + Modeline "1152x648_60.00" 59.91 1152 1200 1320 1488 648 649 652 671 -HSync +Vsync + # 1024x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 47.00 MHz + Modeline "1024x576_60.00" 47.00 1024 1064 1168 1312 576 577 580 597 -HSync +Vsync + # 960x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 55.86 MHz + Modeline "960x720_60.00" 55.86 960 1008 1104 1248 720 721 724 746 -HSync +Vsync + # 800x600 @ 60.00 Hz (GTF) hsync: 37.32 kHz; pclk: 38.22 MHz + Modeline "800x600_60.00" 38.22 800 832 912 1024 600 601 604 622 -HSync +Vsync + + # 1920x1080 @ 60.00 Hz (GTF) hsync: 67.08 kHz; pclk: 172.80 MHz + Modeline "1920x1080_60.00" 172.80 1920 2040 2248 2576 1080 1081 1084 1118 -HSync +Vsync + # 1920x1080 @ 30.00 Hz (GTF) hsync: 32.97 kHz; pclk: 80.18 MHz + Modeline "1920x1080_30.00" 80.18 1920 1984 2176 2432 1080 1081 1084 1099 -HSync +Vsync + # 1152x648 @ 30.00 Hz (GTF) hsync: 19.80 kHz; pclk: 26.93 MHz + Modeline "1152x648_30.00" 26.93 1152 1144 1256 1360 648 649 652 660 -HSync +Vsync + # 1024x576 @ 30.00 Hz (GTF) hsync: 17.61 kHz; pclk: 20.85 MHz + Modeline "1024x576_30.00" 20.85 1024 1008 1104 1184 576 577 580 587 -HSync +Vsync + # 960x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 25.33 MHz + Modeline "960x720_30.00" 25.33 960 960 1056 1152 720 721 724 733 -HSync +Vsync + # 800x600 @ 30.00 Hz (GTF) hsync: 18.33 kHz; pclk: 17.01 MHz + Modeline "800x600_30.00" 17.01 800 792 864 928 600 601 604 611 -HSync +Vsync +EndSection + +Section "Screen" + Identifier "dummy_screen" + Device "dummy_videocard" + Monitor "dummy_monitor" + DefaultDepth 24 + SubSection "Display" + Viewport 0 0 + Depth 24 + Modes "1280x720_30.00" "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "1920x1080_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00" + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "dummy_layout" + Screen "dummy_screen" + InputDevice "dummy_mouse" + InputDevice "dummy_keyboard" +EndSection From 194836918e39321df8ffac0bf6b2d66e990098dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 27 Nov 2020 21:51:55 +0100 Subject: [PATCH 135/876] remove build. --- build | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 build diff --git a/build b/build deleted file mode 100644 index 9c27b57b..00000000 --- a/build +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -ex - -BUILD_TIME=`date -u +'%Y-%m-%dT%H:%M:%SZ'` -GIT_COMMIT=`git rev-parse --short HEAD` -GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` -GIT_DIRTY=`git diff-index --quiet HEAD -- || echo "✗-"` - -go build -o bin/neko -ldflags "-s -X 'demodesk/neko.buildDate=${BUILD_TIME}' -X 'demodesk/neko.gitCommit=${GIT_DIRTY}${GIT_COMMIT}' -X 'demodesk/neko.gitBranch=${GIT_BRANCH}'" -i cmd/neko/main.go From 04861d092101dd80349c372b20ab1ff47322af72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 27 Nov 2020 22:16:26 +0100 Subject: [PATCH 136/876] update runtime. --- runtime/dbus | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 runtime/dbus diff --git a/runtime/dbus b/runtime/dbus old mode 100644 new mode 100755 From 7c3ee0bd0ff2466640dfec0dc72742d91a043c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 27 Nov 2020 22:25:27 +0100 Subject: [PATCH 137/876] add gitattributes. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..176a458f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto From 592b2cfd3a8230921b14b83af44af0c3cb0cd39f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 28 Nov 2020 11:08:15 +0000 Subject: [PATCH 138/876] no default static serve files. --- runtime/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf index 98f71bc2..18fc1c42 100644 --- a/runtime/supervisord.conf +++ b/runtime/supervisord.conf @@ -43,7 +43,7 @@ redirect_stderr=true [program:neko] environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/neko serve -d --static "/var/www" +command=/usr/bin/neko serve -d autorestart=true priority=800 user=%(ENV_USER)s From 3f312c84ade7984e3a973ec45e873e53c0a3af92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 28 Nov 2020 14:32:38 +0100 Subject: [PATCH 139/876] remove user kick. --- internal/types/event/events.go | 1 - internal/websocket/handler/admin.go | 31 --------------------------- internal/websocket/handler/handler.go | 5 ----- 3 files changed, 37 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 2f8432e2..825015ee 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -38,7 +38,6 @@ const ( ) const ( - ADMIN_KICK = "admin/kick" ADMIN_CONTROL = "admin/control" ADMIN_RELEASE = "admin/release" ADMIN_GIVE = "admin/give" diff --git a/internal/websocket/handler/admin.go b/internal/websocket/handler/admin.go index 0b3994bc..9dbef032 100644 --- a/internal/websocket/handler/admin.go +++ b/internal/websocket/handler/admin.go @@ -83,34 +83,3 @@ func (h *MessageHandlerCtx) adminGive(session types.Session, payload *message.Ad return nil } - -func (h *MessageHandlerCtx) adminKick(session types.Session, payload *message.Admin) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - target, ok := h.sessions.Get(payload.ID) - if !ok { - h.logger.Debug().Str("id", payload.ID).Msg("can't find target session") - return nil - } - - if target.Admin() { - h.logger.Debug().Msg("target is an admin, baling") - return nil - } - - if err := target.Disconnect("kicked"); err != nil { - return err - } - - h.sessions.Broadcast( - message.AdminTarget{ - Event: event.ADMIN_KICK, - Target: target.ID(), - ID: session.ID(), - }, []string{payload.ID}) - - return nil -} diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 9eadc80f..055e3aff 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -104,11 +104,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { err = utils.Unmarshal(payload, raw, func() error { return h.adminGive(session, payload) }) - case event.ADMIN_KICK: - payload := &message.Admin{} - err = utils.Unmarshal(payload, raw, func() error { - return h.adminKick(session, payload) - }) default: return errors.Errorf("unknown message event %s", header.Event) } From c4978ba37699d7d29953aff8334c21337582141c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 28 Nov 2020 15:00:21 +0100 Subject: [PATCH 140/876] http response name convention. --- internal/api/members/crud.go | 4 ++-- internal/api/room/broadcast.go | 2 +- internal/api/room/screen.go | 2 +- internal/api/router.go | 2 +- internal/http/auth/auth.go | 6 +++--- internal/utils/http.go | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index 228d1d90..fb7649fd 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -30,7 +30,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { id, err := utils.NewUID(32) if err != nil { - utils.HttpInternalServer(w, err) + utils.HttpInternalServerError(w, err) return } @@ -74,7 +74,7 @@ func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) { member := GetMember(r) if err := h.sessions.Delete(member.ID()); err != nil { - utils.HttpInternalServer(w, err) + utils.HttpInternalServerError(w, err) return } diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index 07f0fa46..de2c72f6 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -37,7 +37,7 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { } if err := h.capture.StartBroadcast(data.URL); err != nil { - utils.HttpInternalServer(w, err) + utils.HttpInternalServerError(w, err) return } diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 315c6e76..7afc2117 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -19,7 +19,7 @@ func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request size := h.desktop.GetScreenSize() if size == nil { - utils.HttpInternalServer(w, "Unable to get screen configuration.") + utils.HttpInternalServerError(w, "Unable to get screen configuration.") return } diff --git a/internal/api/router.go b/internal/api/router.go index e828084c..7573d916 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -52,7 +52,7 @@ func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session, err := api.sessions.Authenticate(r) if err != nil { - utils.HttpNotAuthenticated(w, err) + utils.HttpUnauthorized(w, err) } else { next.ServeHTTP(w, auth.SetSession(r, session)) } diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index d0a9c3a6..077f8518 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -27,7 +27,7 @@ func AdminsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Admin() { - utils.HttpNotAuthorized(w) + utils.HttpForbidden(w) } else { next.ServeHTTP(w, r) } @@ -38,7 +38,7 @@ func HostsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.IsHost() { - utils.HttpNotAuthorized(w, "Only host can do this.") + utils.HttpForbidden(w, "Only host can do this.") } else { next.ServeHTTP(w, r) } @@ -49,7 +49,7 @@ func HostsOrAdminsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.IsHost() && !session.Admin() { - utils.HttpNotAuthorized(w, "Only host can do this.") + utils.HttpForbidden(w, "Only host can do this.") } else { next.ServeHTTP(w, r) } diff --git a/internal/utils/http.go b/internal/utils/http.go index f520f010..4bf3e611 100644 --- a/internal/utils/http.go +++ b/internal/utils/http.go @@ -50,11 +50,11 @@ func HttpBadRequest(w http.ResponseWriter, res ...interface{}) { defHttpError(w, http.StatusBadRequest, "Bad Request.", res...) } -func HttpNotAuthorized(w http.ResponseWriter, res ...interface{}) { +func HttpUnauthorized(w http.ResponseWriter, res ...interface{}) { defHttpError(w, http.StatusUnauthorized, "Access token does not have the required scope.", res...) } -func HttpNotAuthenticated(w http.ResponseWriter, res ...interface{}) { +func HttpForbidden(w http.ResponseWriter, res ...interface{}) { defHttpError(w, http.StatusForbidden, "Invalid or missing access token.", res...) } @@ -66,7 +66,7 @@ func HttpUnprocessableEntity(w http.ResponseWriter, res ...interface{}) { defHttpError(w, http.StatusUnprocessableEntity, "Unprocessable Entity.", res...) } -func HttpInternalServer(w http.ResponseWriter, res ...interface{}) { +func HttpInternalServerError(w http.ResponseWriter, res ...interface{}) { defHttpError(w, http.StatusInternalServerError, "Internal server error.", res...) } From b675e4cc826b6fb7df457ab407839342611b1c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 28 Nov 2020 15:03:38 +0100 Subject: [PATCH 141/876] member name refactor. --- internal/session/session.go | 4 ---- internal/types/message/messages.go | 5 ++--- internal/types/session.go | 1 - internal/websocket/handler/signal.go | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 1799d767..52f1b16b 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -43,10 +43,6 @@ func (session *SessionCtx) Connected() bool { return session.websocket_connected && session.webrtc_connected } -func (session *SessionCtx) SetName(name string) { - session.profile.Name = name -} - func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { session.websocket_peer = websocket_peer session.manager.emmiter.Emit("created", session) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 078bf4b4..9de7bd37 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -23,7 +23,6 @@ type SignalProvide struct { type SignalAnswer struct { Event string `json:"event"` - Name string `json:"displayname"` // TODO: Change. SDP string `json:"sdp"` } @@ -34,14 +33,14 @@ type MembersList struct { type MembersListEntry struct { ID string `json:"id"` - Name string `json:"displayname"` // TODO: Change. + Name string `json:"name"` Admin bool `json:"admin"` } type Member struct { Event string `json:"event"` ID string `json:"id"` - Name string `json:"displayname"` // TODO: Change. + Name string `json:"name"` Admin bool `json:"admin"` } diff --git a/internal/types/session.go b/internal/types/session.go index cc54a828..cf525f51 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -20,7 +20,6 @@ type Session interface { IsHost() bool Connected() bool VerifySecret(secret string) bool - SetName(name string) SetWebSocketPeer(websocket_peer WebSocketPeer) SetWebSocketConnected(connected bool) SetWebRTCPeer(webrtc_peer WebRTCPeer) diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 377a4578..62027629 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -23,6 +23,5 @@ func (h *MessageHandlerCtx) signalProvide(session types.Session) error { } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { - session.SetName(payload.Name) return session.SignalAnswer(payload.SDP) } From 5699ad0bf975388f688e67a4d97c8c4a2c8dc34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 28 Nov 2020 15:22:04 +0100 Subject: [PATCH 142/876] allow login using Query. --- internal/session/auth.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/internal/session/auth.go b/internal/session/auth.go index 9ccfa4ea..49c5fd68 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -8,7 +8,7 @@ import ( ) func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, error) { - id, secret, ok := r.BasicAuth() + id, secret, ok := getAuthData(r) if !ok { return nil, fmt.Errorf("no authentication provided") } @@ -24,3 +24,19 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, return session, nil } + +func getAuthData(r *http.Request) (string, string, bool) { + id, secret, ok := r.BasicAuth() + if ok { + return id, secret, true + } + + id = r.URL.Query().Get("id") + secret = r.URL.Query().Get("secret") + + if id != "" && secret != "" { + return id, secret, true + } + + return "", "", false +} \ No newline at end of file From 179a22476c6f43f68f9310dcdc4c6d3e13c376ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 28 Nov 2020 15:30:35 +0100 Subject: [PATCH 143/876] do not remove user on disconnect. --- internal/websocket/manager.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 6404cdad..ff4c5588 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -164,9 +164,6 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e Msg("connection ended") session.SetWebSocketConnected(false) - - // TODO: Enable persistent user autentication. - _ = ws.sessions.Delete(session.ID()) }() ws.handle(connection, session) From f9b62073ef88cc21b0539b4b6c57c65ab2143c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Nov 2020 15:58:26 +0100 Subject: [PATCH 144/876] add control reset. --- internal/api/room/control.go | 18 ++++++++++++++++++ internal/api/room/handler.go | 1 + 2 files changed, 19 insertions(+) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 7539ae26..05d7fd55 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -106,3 +106,21 @@ func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } + +func (h *RoomHandler) controlReset(w http.ResponseWriter, r *http.Request) { + host := h.sessions.GetHost() + if host == nil { + utils.HttpSuccess(w) + return + } + + h.sessions.ClearHost() + + h.sessions.Broadcast( + message.Control{ + Event: event.CONTROL_RELEASE, + ID: host.ID(), + }, nil) + + utils.HttpSuccess(w) +} diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index cca2b044..a073f7a0 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -58,6 +58,7 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Post("/take", h.controlTake) r.With(auth.AdminsOnly).Post("/give", h.controlGive) + r.With(auth.AdminsOnly).Post("/reset", h.controlReset) }) r.Route("/screen", func(r chi.Router) { From 147aa0e1a305e85786b2560aeb6fcdfeb4650b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 15:48:19 +0100 Subject: [PATCH 145/876] updated websocket events with TODO comments. --- internal/types/event/events.go | 54 +++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 825015ee..b6f22c5f 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -1,44 +1,64 @@ package event const ( + SYSTEM_CONNECT = "system/connect" // TODO: New. SYSTEM_DISCONNECT = "system/disconnect" ) const ( + SIGNAL_REQUEST = "signal/request" // TODO: New. SIGNAL_ANSWER = "signal/answer" SIGNAL_PROVIDE = "signal/provide" ) const ( - MEMBER_LIST = "member/list" + MEMBER_LIST = "member/list" // TODO: Remove. MEMBER_CONNECTED = "member/connected" + MEMBER_UPDATED = "member/updated" // TODO: New. MEMBER_DISCONNECTED = "member/disconnected" ) const ( - CONTROL_LOCKED = "control/locked" - CONTROL_RELEASE = "control/release" - CONTROL_REQUEST = "control/request" - CONTROL_REQUESTING = "control/requesting" - CONTROL_GIVE = "control/give" - CONTROL_CLIPBOARD = "control/clipboard" - CONTROL_KEYBOARD = "control/keyboard" + CONTROL_LOCKED = "control/locked" // TODO: Remove. + CONTROL_REQUESTING = "control/requesting" // TODO: Remove. + CONTROL_GIVE = "control/give" // TODO: Remove. + CONTROL_CLIPBOARD = "control/clipboard" // TODO: Remove. + CONTROL_KEYBOARD = "control/keyboard" // TODO: Remove. + CONTROL_UPDATED = "control/updated" // TODO: New. + CONTROL_RELEASE = "control/release" + CONTROL_REQUEST = "control/request" + CONTROL_MOVE = "control/move" // TODO: New. (fallback) + CONTROL_SCROLL = "control/scroll" // TODO: New. (fallback) + CONTROL_KEYDOWN = "control/keydown" // TODO: New. (fallback) + CONTROL_KEYUP = "control/keyup" // TODO: New. (fallback) ) const ( - SCREEN_CONFIGURATIONS = "screen/configurations" - SCREEN_RESOLUTION = "screen/resolution" - SCREEN_SET = "screen/set" + SCREEN_CONFIGURATIONS = "screen/configurations" // TODO: Remove. + SCREEN_RESOLUTION = "screen/resolution" // TODO: Remove. + + SCREEN_UPDATED = "screen/updated" // TODO: New. + SCREEN_SET = "screen/set" ) const ( - BORADCAST_STATUS = "broadcast/status" - BORADCAST_CREATE = "broadcast/create" - BORADCAST_DESTROY = "broadcast/destroy" + CLIPBOARD_UPDATED = "clipboard/updated" // TODO: New. + CLIPBOARD_SET = "clipboard/set" // TODO: New. ) const ( - ADMIN_CONTROL = "admin/control" - ADMIN_RELEASE = "admin/release" - ADMIN_GIVE = "admin/give" + KEYBOARD_MODIFIERS = "keyboard/modifiers" // TODO: New. + KEYBOARD_LAYOUT = "keyboard/layout" // TODO: New. +) + +const ( + BORADCAST_STATUS = "broadcast/status" // TODO: Remove. + BORADCAST_CREATE = "broadcast/create" // TODO: Remove. + BORADCAST_DESTROY = "broadcast/destroy" // TODO: Remove. +) + +const ( + ADMIN_CONTROL = "admin/control" // TODO: Remove. + ADMIN_RELEASE = "admin/release" // TODO: Remove. + ADMIN_GIVE = "admin/give" // TODO: Remove. ) From 8cce32c73cc5cf2cef3f2d6f94b960cb132d1701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 17:06:42 +0100 Subject: [PATCH 146/876] edit control event as host. --- internal/types/event/events.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index b6f22c5f..5ce91e4f 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -24,7 +24,7 @@ const ( CONTROL_GIVE = "control/give" // TODO: Remove. CONTROL_CLIPBOARD = "control/clipboard" // TODO: Remove. CONTROL_KEYBOARD = "control/keyboard" // TODO: Remove. - CONTROL_UPDATED = "control/updated" // TODO: New. + CONTROL_HOST = "control/host" // TODO: New. CONTROL_RELEASE = "control/release" CONTROL_REQUEST = "control/request" CONTROL_MOVE = "control/move" // TODO: New. (fallback) From 8f9671689f55496e122edca8850d64cd9908e877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 17:09:14 +0100 Subject: [PATCH 147/876] add new messages. --- internal/types/message/messages.go | 120 +++++++++++++++++++++++++++-- 1 file changed, 114 insertions(+), 6 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 9de7bd37..d009d367 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -5,38 +5,135 @@ import ( ) type Message struct { - Event string `json:"event"` + Event string `json:"event"` + Payload interface{} `json:"payload"` // TODO: New. } -type Disconnect struct { - Event string `json:"event"` +// System +// TODO: New. +type SystemConnect struct { + Event string `json:"event,omitempty"` + ControlHost ControlHost `json:"control_host"` + ScreenSize ScreenSize `json:"screen_size"` + Members []MemberData `json:"members"` + ScreenSizesList *[]ScreenSize `json:"screen_sizes_list,omitempty"` +} + +// TODO: New. +type SystemDisconnect struct { + Event string `json:"event,omitempty"` Message string `json:"message"` } +// Signal type SignalProvide struct { - Event string `json:"event"` - ID string `json:"id"` + Event string `json:"event,omitempty"` + ID string `json:"id"` // TODO: Remove SDP string `json:"sdp"` Lite bool `json:"lite"` ICE []string `json:"ice"` } type SignalAnswer struct { - Event string `json:"event"` + Event string `json:"event,omitempty"` SDP string `json:"sdp"` } + +// Member +// TODO: New. +type MemberID struct { + Event string `json:"event,omitempty"` + ID string `json:"id"` +} + +// TODO: New. +type MemberData struct { + Event string `json:"event,omitempty"` + ID string `json:"id"` + Name string `json:"name"` + IsAdmin bool `json:"is_admin"` +} + +// Control +// TODO: New. +type ControlHost struct { + Event string `json:"event,omitempty"` + HasHost bool `json:"has_host"` + HostID string `json:"id,omitempty"` +} + +// TODO: New. +type ControlMove struct { + Event string `json:"event,omitempty"` + X uint16 `json:"x"` + Y uint16 `json:"y"` +} + +// TODO: New. +type ControlScroll struct { + Event string `json:"event,omitempty"` + X int16 `json:"x"` + Y int16 `json:"y"` +} + +// TODO: New. +type ControlKey struct { + Event string `json:"event,omitempty"` + Key uint64 `json:"key"` +} + +// Screen +// TODO: New. +type ScreenSize struct { + Event string `json:"event,omitempty"` + Width int `json:"width"` + Height int `json:"height"` + Rate int `json:"rate"` +} + +// Clipboard +// TODO: New. +type ClipboardData struct { + Event string `json:"event,omitempty"` + Text string `json:"text"` +} + +// Keyboard +// TODO: New. +type KeyboardModifiers struct { + Event string `json:"event,omitempty"` + CapsLock bool `json:"caps_lock"` + NumLock bool `json:"num_lock"` + ScrollLock bool `json:"scroll_lock"` +} + +// TODO: New. +type KeyboardLayout struct { + Event string `json:"event,omitempty"` + Layout string `json:"layout"` +} + +// TODO: Remove. +type Disconnect struct { + Event string `json:"event"` + Message string `json:"message"` +} + +// TODO: Remove. type MembersList struct { Event string `json:"event"` Memebers []*MembersListEntry `json:"members"` } +// TODO: Remove. type MembersListEntry struct { ID string `json:"id"` Name string `json:"name"` Admin bool `json:"admin"` } +// TODO: Remove. type Member struct { Event string `json:"event"` ID string `json:"id"` @@ -44,16 +141,19 @@ type Member struct { Admin bool `json:"admin"` } +// TODO: Remove. type MemberDisconnected struct { Event string `json:"event"` ID string `json:"id"` } +// TODO: Remove. type Clipboard struct { Event string `json:"event"` Text string `json:"text"` } +// TODO: Remove. type Keyboard struct { Event string `json:"event"` Layout *string `json:"layout,omitempty"` @@ -62,28 +162,33 @@ type Keyboard struct { ScrollLock *bool `json:"scrollLock,omitempty"` } +// TODO: Remove. type Control struct { Event string `json:"event"` ID string `json:"id"` } +// TODO: Remove. type ControlTarget struct { Event string `json:"event"` ID string `json:"id"` Target string `json:"target"` } +// TODO: Remove. type Admin struct { Event string `json:"event"` ID string `json:"id"` } +// TODO: Remove. type AdminTarget struct { Event string `json:"event"` Target string `json:"target"` ID string `json:"id"` } +// TODO: Remove. type ScreenResolution struct { Event string `json:"event"` ID string `json:"id,omitempty"` @@ -92,17 +197,20 @@ type ScreenResolution struct { Rate int `json:"rate"` } +// TODO: Remove. type ScreenConfigurations struct { Event string `json:"event"` Configurations map[int]types.ScreenConfiguration `json:"configurations"` } +// TODO: Remove. type BroadcastStatus struct { Event string `json:"event"` URL string `json:"url"` IsActive bool `json:"isActive"` } +// TODO: Remove. type BroadcastCreate struct { Event string `json:"event"` URL string `json:"url"` From def6248ca7b85db3e0036ec684adadd1a3e7a207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 17:27:11 +0100 Subject: [PATCH 148/876] revert broadcast status. --- internal/types/event/events.go | 2 +- internal/types/message/messages.go | 30 ++++++++++++------------------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 5ce91e4f..554c9187 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -52,7 +52,7 @@ const ( ) const ( - BORADCAST_STATUS = "broadcast/status" // TODO: Remove. + BORADCAST_STATUS = "broadcast/status" BORADCAST_CREATE = "broadcast/create" // TODO: Remove. BORADCAST_DESTROY = "broadcast/destroy" // TODO: Remove. ) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index d009d367..9bccdddd 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -12,11 +12,12 @@ type Message struct { // System // TODO: New. type SystemConnect struct { - Event string `json:"event,omitempty"` - ControlHost ControlHost `json:"control_host"` - ScreenSize ScreenSize `json:"screen_size"` - Members []MemberData `json:"members"` - ScreenSizesList *[]ScreenSize `json:"screen_sizes_list,omitempty"` + Event string `json:"event,omitempty"` + ControlHost ControlHost `json:"control_host"` + ScreenSize ScreenSize `json:"screen_size"` + Members []MemberData `json:"members"` + ScreenSizesList *[]ScreenSize `json:"screen_sizes_list,omitempty"` + BroadcastStatus BroadcastStatus `json:"members,omitempty"` } // TODO: New. @@ -114,6 +115,12 @@ type KeyboardLayout struct { Layout string `json:"layout"` } +type BroadcastStatus struct { + Event string `json:"event"` + URL string `json:"url"` + IsActive bool `json:"is_active"` +} + // TODO: Remove. type Disconnect struct { Event string `json:"event"` @@ -202,16 +209,3 @@ type ScreenConfigurations struct { Event string `json:"event"` Configurations map[int]types.ScreenConfiguration `json:"configurations"` } - -// TODO: Remove. -type BroadcastStatus struct { - Event string `json:"event"` - URL string `json:"url"` - IsActive bool `json:"isActive"` -} - -// TODO: Remove. -type BroadcastCreate struct { - Event string `json:"event"` - URL string `json:"url"` -} From 994a91886dffc281b7b6e65d1564da0bc25dff84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 17:29:05 +0100 Subject: [PATCH 149/876] remove broadcast from websocket. --- internal/types/event/events.go | 2 -- internal/websocket/handler/broadcast.go | 44 ------------------------- internal/websocket/handler/handler.go | 9 ----- internal/websocket/handler/session.go | 5 --- 4 files changed, 60 deletions(-) delete mode 100644 internal/websocket/handler/broadcast.go diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 554c9187..31743ef2 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -53,8 +53,6 @@ const ( const ( BORADCAST_STATUS = "broadcast/status" - BORADCAST_CREATE = "broadcast/create" // TODO: Remove. - BORADCAST_DESTROY = "broadcast/destroy" // TODO: Remove. ) const ( diff --git a/internal/websocket/handler/broadcast.go b/internal/websocket/handler/broadcast.go deleted file mode 100644 index 7eda5b5f..00000000 --- a/internal/websocket/handler/broadcast.go +++ /dev/null @@ -1,44 +0,0 @@ -package handler - -import ( - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" -) - -func (h *MessageHandlerCtx) boradcastCreate(session types.Session, payload *message.BroadcastCreate) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - if err := h.capture.StartBroadcast(payload.URL); err != nil { - return err - } - - return h.boradcastStatus(session) -} - -func (h *MessageHandlerCtx) boradcastDestroy(session types.Session) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - h.capture.StopBroadcast() - return h.boradcastStatus(session) -} - -func (h *MessageHandlerCtx) boradcastStatus(session types.Session) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - return session.Send( - message.BroadcastStatus{ - Event: event.BORADCAST_STATUS, - IsActive: h.capture.BroadcastEnabled(), - URL: h.capture.BroadcastUrl(), - }) -} diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 055e3aff..9daa01a4 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -85,15 +85,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { return h.screenSizeChange(session, payload) }) - // Boradcast Events - case event.BORADCAST_CREATE: - payload := &message.BroadcastCreate{} - err = utils.Unmarshal(payload, raw, func() error { - return h.boradcastCreate(session, payload) - }) - case event.BORADCAST_DESTROY: - err = h.boradcastDestroy(session) - // Admin Events case event.ADMIN_CONTROL: err = h.adminControl(session) diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 1ba9adb6..fb9a23b0 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -17,11 +17,6 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { if err := h.screenConfigurations(session); err != nil { return err } - - // send broadcast status if admin - if err := h.boradcastStatus(session); err != nil { - return err - } } return nil From 0a7595035699c2655481cf2c29646d219ca82ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 17:31:29 +0100 Subject: [PATCH 150/876] remove admin from websockets. --- internal/types/event/events.go | 6 -- internal/types/message/messages.go | 13 ---- internal/websocket/handler/admin.go | 85 --------------------------- internal/websocket/handler/handler.go | 11 ---- 4 files changed, 115 deletions(-) delete mode 100644 internal/websocket/handler/admin.go diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 31743ef2..4b56299e 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -54,9 +54,3 @@ const ( const ( BORADCAST_STATUS = "broadcast/status" ) - -const ( - ADMIN_CONTROL = "admin/control" // TODO: Remove. - ADMIN_RELEASE = "admin/release" // TODO: Remove. - ADMIN_GIVE = "admin/give" // TODO: Remove. -) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 9bccdddd..bb8e1f31 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -182,19 +182,6 @@ type ControlTarget struct { Target string `json:"target"` } -// TODO: Remove. -type Admin struct { - Event string `json:"event"` - ID string `json:"id"` -} - -// TODO: Remove. -type AdminTarget struct { - Event string `json:"event"` - Target string `json:"target"` - ID string `json:"id"` -} - // TODO: Remove. type ScreenResolution struct { Event string `json:"event"` diff --git a/internal/websocket/handler/admin.go b/internal/websocket/handler/admin.go deleted file mode 100644 index 9dbef032..00000000 --- a/internal/websocket/handler/admin.go +++ /dev/null @@ -1,85 +0,0 @@ -package handler - -import ( - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" -) - -func (h *MessageHandlerCtx) adminControl(session types.Session) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - host := h.sessions.GetHost() - h.sessions.SetHost(session) - - if host != nil { - h.sessions.Broadcast( - message.AdminTarget{ - Event: event.ADMIN_CONTROL, - ID: session.ID(), - Target: host.ID(), - }, nil) - } else { - h.sessions.Broadcast( - message.Admin{ - Event: event.ADMIN_CONTROL, - ID: session.ID(), - }, nil) - } - - return nil -} - -func (h *MessageHandlerCtx) adminRelease(session types.Session) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - host := h.sessions.GetHost() - h.sessions.ClearHost() - - if host != nil { - h.sessions.Broadcast( - message.AdminTarget{ - Event: event.ADMIN_RELEASE, - ID: session.ID(), - Target: host.ID(), - }, nil) - } else { - h.sessions.Broadcast( - message.Admin{ - Event: event.ADMIN_RELEASE, - ID: session.ID(), - }, nil) - } - - return nil -} - -func (h *MessageHandlerCtx) adminGive(session types.Session, payload *message.Admin) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - target, ok := h.sessions.Get(payload.ID) - if !ok { - h.logger.Debug().Str("id", payload.ID).Msg("can't find target session") - return nil - } - - h.sessions.SetHost(target) - - h.sessions.Broadcast( - message.AdminTarget{ - Event: event.CONTROL_GIVE, - ID: session.ID(), - Target: target.ID(), - }, nil) - - return nil -} diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 9daa01a4..6e0a5d4d 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -84,17 +84,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { err = utils.Unmarshal(payload, raw, func() error { return h.screenSizeChange(session, payload) }) - - // Admin Events - case event.ADMIN_CONTROL: - err = h.adminControl(session) - case event.ADMIN_RELEASE: - err = h.adminRelease(session) - case event.ADMIN_GIVE: - payload := &message.Admin{} - err = utils.Unmarshal(payload, raw, func() error { - return h.adminGive(session, payload) - }) default: return errors.Errorf("unknown message event %s", header.Event) } From 2c210f3cf1ec7502bda6623ab0c24e0b18a9a184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 17:33:34 +0100 Subject: [PATCH 151/876] signal provide remove ID. --- internal/types/message/messages.go | 1 - internal/websocket/handler/signal.go | 1 - 2 files changed, 2 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index bb8e1f31..4ec92cf7 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -29,7 +29,6 @@ type SystemDisconnect struct { // Signal type SignalProvide struct { Event string `json:"event,omitempty"` - ID string `json:"id"` // TODO: Remove SDP string `json:"sdp"` Lite bool `json:"lite"` ICE []string `json:"ice"` diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 62027629..8acd7741 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -15,7 +15,6 @@ func (h *MessageHandlerCtx) signalProvide(session types.Session) error { return session.Send( message.SignalProvide{ Event: event.SIGNAL_PROVIDE, - ID: session.ID(), SDP: sdp, Lite: lite, ICE: ice, From e93d167be63dc1b6f3dbdd63a4656bfa25144745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 17:40:38 +0100 Subject: [PATCH 152/876] update clipboard WS. --- internal/types/event/events.go | 5 ++--- internal/types/message/messages.go | 7 ------- internal/websocket/handler/clipboard.go | 16 ++++++++++++++++ internal/websocket/handler/control.go | 10 ---------- internal/websocket/handler/handler.go | 12 +++++++----- internal/websocket/manager.go | 4 ++-- 6 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 internal/websocket/handler/clipboard.go diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 4b56299e..0ba2b473 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -22,7 +22,6 @@ const ( CONTROL_LOCKED = "control/locked" // TODO: Remove. CONTROL_REQUESTING = "control/requesting" // TODO: Remove. CONTROL_GIVE = "control/give" // TODO: Remove. - CONTROL_CLIPBOARD = "control/clipboard" // TODO: Remove. CONTROL_KEYBOARD = "control/keyboard" // TODO: Remove. CONTROL_HOST = "control/host" // TODO: New. CONTROL_RELEASE = "control/release" @@ -42,8 +41,8 @@ const ( ) const ( - CLIPBOARD_UPDATED = "clipboard/updated" // TODO: New. - CLIPBOARD_SET = "clipboard/set" // TODO: New. + CLIPBOARD_UPDATED = "clipboard/updated" + CLIPBOARD_SET = "clipboard/set" ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 4ec92cf7..4158b336 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -93,7 +93,6 @@ type ScreenSize struct { } // Clipboard -// TODO: New. type ClipboardData struct { Event string `json:"event,omitempty"` Text string `json:"text"` @@ -153,12 +152,6 @@ type MemberDisconnected struct { ID string `json:"id"` } -// TODO: Remove. -type Clipboard struct { - Event string `json:"event"` - Text string `json:"text"` -} - // TODO: Remove. type Keyboard struct { Event string `json:"event"` diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go new file mode 100644 index 00000000..ee0e0f25 --- /dev/null +++ b/internal/websocket/handler/clipboard.go @@ -0,0 +1,16 @@ +package handler + +import ( + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/message" +) + +func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { + if !session.IsHost() { + h.logger.Debug().Str("id", session.ID()).Msg("is not the host") + return nil + } + + h.desktop.WriteClipboard(payload.Text) + return nil +} diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index b575323c..1051dae5 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -82,16 +82,6 @@ func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message. return nil } -func (h *MessageHandlerCtx) controlClipboard(session types.Session, payload *message.Clipboard) error { - if !session.IsHost() { - h.logger.Debug().Str("id", session.ID()).Msg("is not the host") - return nil - } - - h.desktop.WriteClipboard(payload.Text) - return nil -} - func (h *MessageHandlerCtx) controlKeyboard(session types.Session, payload *message.Keyboard) error { if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 6e0a5d4d..b3068461 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -63,17 +63,19 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { err = utils.Unmarshal(payload, raw, func() error { return h.controlGive(session, payload) }) - case event.CONTROL_CLIPBOARD: - payload := &message.Clipboard{} - err = utils.Unmarshal(payload, raw, func() error { - return h.controlClipboard(session, payload) - }) case event.CONTROL_KEYBOARD: payload := &message.Keyboard{} err = utils.Unmarshal(payload, raw, func() error { return h.controlKeyboard(session, payload) }) + // Clipboard Events + case event.CLIPBOARD_SET: + payload := &message.ClipboardData{} + err = utils.Unmarshal(payload, raw, func() error { + return h.clipboardSet(session, payload) + }) + // Screen Events case event.SCREEN_RESOLUTION: err = h.screenSize(session) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index ff4c5588..027fe3e0 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -98,8 +98,8 @@ func (ws *WebSocketManagerCtx) Start() { } if err := session.Send( - message.Clipboard{ - Event: event.CONTROL_CLIPBOARD, + message.ClipboardData{ + Event: event.CLIPBOARD_UPDATED, Text: text, }); err != nil { ws.logger.Warn().Err(err).Msg("could not sync clipboard") From 83be51ea0fc0f238666ed4fcfaafd2737d1e236b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 17:45:53 +0100 Subject: [PATCH 153/876] update keyboard WS. --- internal/types/event/events.go | 5 ++- internal/types/message/messages.go | 17 ++------- internal/websocket/handler/control.go | 42 ---------------------- internal/websocket/handler/handler.go | 17 ++++++--- internal/websocket/handler/keyboard.go | 48 ++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 64 deletions(-) create mode 100644 internal/websocket/handler/keyboard.go diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 0ba2b473..cfb5510f 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -22,7 +22,6 @@ const ( CONTROL_LOCKED = "control/locked" // TODO: Remove. CONTROL_REQUESTING = "control/requesting" // TODO: Remove. CONTROL_GIVE = "control/give" // TODO: Remove. - CONTROL_KEYBOARD = "control/keyboard" // TODO: Remove. CONTROL_HOST = "control/host" // TODO: New. CONTROL_RELEASE = "control/release" CONTROL_REQUEST = "control/request" @@ -46,8 +45,8 @@ const ( ) const ( - KEYBOARD_MODIFIERS = "keyboard/modifiers" // TODO: New. - KEYBOARD_LAYOUT = "keyboard/layout" // TODO: New. + KEYBOARD_MODIFIERS = "keyboard/modifiers" + KEYBOARD_LAYOUT = "keyboard/layout" ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 4158b336..55f82828 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -99,15 +99,13 @@ type ClipboardData struct { } // Keyboard -// TODO: New. type KeyboardModifiers struct { Event string `json:"event,omitempty"` - CapsLock bool `json:"caps_lock"` - NumLock bool `json:"num_lock"` - ScrollLock bool `json:"scroll_lock"` + CapsLock *bool `json:"caps_lock"` + NumLock *bool `json:"num_lock"` + ScrollLock *bool `json:"scroll_lock"` } -// TODO: New. type KeyboardLayout struct { Event string `json:"event,omitempty"` Layout string `json:"layout"` @@ -152,15 +150,6 @@ type MemberDisconnected struct { ID string `json:"id"` } -// TODO: Remove. -type Keyboard struct { - Event string `json:"event"` - Layout *string `json:"layout,omitempty"` - CapsLock *bool `json:"capsLock,omitempty"` - NumLock *bool `json:"numLock,omitempty"` - ScrollLock *bool `json:"scrollLock,omitempty"` -} - // TODO: Remove. type Control struct { Event string `json:"event"` diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 1051dae5..c609c48b 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -81,45 +81,3 @@ func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message. return nil } - -func (h *MessageHandlerCtx) controlKeyboard(session types.Session, payload *message.Keyboard) error { - if !session.IsHost() { - h.logger.Debug().Str("id", session.ID()).Msg("is not the host") - return nil - } - - // change layout - if payload.Layout != nil { - h.desktop.SetKeyboardLayout(*payload.Layout) - } - - var NumLock = 0 - if payload.NumLock == nil { - NumLock = -1 - } else if *payload.NumLock { - NumLock = 1 - } - - var CapsLock = 0 - if payload.CapsLock == nil { - CapsLock = -1 - } else if *payload.CapsLock { - CapsLock = 1 - } - - var ScrollLock = 0 - if payload.ScrollLock == nil { - ScrollLock = -1 - } else if *payload.ScrollLock { - ScrollLock = 1 - } - - h.logger.Debug(). - Int("NumLock", NumLock). - Int("CapsLock", CapsLock). - Int("ScrollLock", ScrollLock). - Msg("setting keyboard modifiers") - - h.desktop.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) - return nil -} diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index b3068461..a78f19ee 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -63,11 +63,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { err = utils.Unmarshal(payload, raw, func() error { return h.controlGive(session, payload) }) - case event.CONTROL_KEYBOARD: - payload := &message.Keyboard{} - err = utils.Unmarshal(payload, raw, func() error { - return h.controlKeyboard(session, payload) - }) // Clipboard Events case event.CLIPBOARD_SET: @@ -76,6 +71,18 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { return h.clipboardSet(session, payload) }) + // Keyboard Events + case event.KEYBOARD_MODIFIERS: + payload := &message.KeyboardLayout{} + err = utils.Unmarshal(payload, raw, func() error { + return h.keyboardLayout(session, payload) + }) + case event.KEYBOARD_LAYOUT: + payload := &message.KeyboardModifiers{} + err = utils.Unmarshal(payload, raw, func() error { + return h.keyboardModifiers(session, payload) + }) + // Screen Events case event.SCREEN_RESOLUTION: err = h.screenSize(session) diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go new file mode 100644 index 00000000..4776eef6 --- /dev/null +++ b/internal/websocket/handler/keyboard.go @@ -0,0 +1,48 @@ +package handler + +import ( + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/message" +) + + +func (h *MessageHandlerCtx) keyboardLayout(session types.Session, payload *message.KeyboardLayout) error { + if !session.IsHost() { + h.logger.Debug().Str("id", session.ID()).Msg("is not the host") + return nil + } + + h.desktop.SetKeyboardLayout(payload.Layout) + return nil +} + +func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *message.KeyboardModifiers) error { + if !session.IsHost() { + h.logger.Debug().Str("id", session.ID()).Msg("is not the host") + return nil + } + + var NumLock = 0 + if payload.NumLock == nil { + NumLock = -1 + } else if *payload.NumLock { + NumLock = 1 + } + + var CapsLock = 0 + if payload.CapsLock == nil { + CapsLock = -1 + } else if *payload.CapsLock { + CapsLock = 1 + } + + var ScrollLock = 0 + if payload.ScrollLock == nil { + ScrollLock = -1 + } else if *payload.ScrollLock { + ScrollLock = 1 + } + + h.desktop.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) + return nil +} From 4bbf3bb03901fd6959580212e707b1ef7c70880b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 17:53:05 +0100 Subject: [PATCH 154/876] update screen WS. --- internal/api/room/screen.go | 8 ++---- internal/types/event/events.go | 5 +--- internal/types/message/messages.go | 20 --------------- internal/websocket/handler/handler.go | 18 ++++++-------- internal/websocket/handler/screen.go | 36 +++------------------------ internal/websocket/handler/session.go | 12 --------- 6 files changed, 13 insertions(+), 86 deletions(-) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 7afc2117..06a3b729 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -6,7 +6,6 @@ import ( "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" "demodesk/neko/internal/utils" - "demodesk/neko/internal/http/auth" ) type ScreenConfigurationPayload struct { @@ -41,12 +40,9 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R return } - session := auth.GetSession(r) - h.sessions.Broadcast( - message.ScreenResolution{ - Event: event.SCREEN_RESOLUTION, - ID: session.ID(), + message.ScreenSize{ + Event: event.SCREEN_UPDATED, Width: data.Width, Height: data.Height, Rate: data.Rate, diff --git a/internal/types/event/events.go b/internal/types/event/events.go index cfb5510f..e1bc0a8d 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -32,10 +32,7 @@ const ( ) const ( - SCREEN_CONFIGURATIONS = "screen/configurations" // TODO: Remove. - SCREEN_RESOLUTION = "screen/resolution" // TODO: Remove. - - SCREEN_UPDATED = "screen/updated" // TODO: New. + SCREEN_UPDATED = "screen/updated" SCREEN_SET = "screen/set" ) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 55f82828..f18a2153 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -1,9 +1,5 @@ package message -import ( - "demodesk/neko/internal/types" -) - type Message struct { Event string `json:"event"` Payload interface{} `json:"payload"` // TODO: New. @@ -84,7 +80,6 @@ type ControlKey struct { } // Screen -// TODO: New. type ScreenSize struct { Event string `json:"event,omitempty"` Width int `json:"width"` @@ -162,18 +157,3 @@ type ControlTarget struct { ID string `json:"id"` Target string `json:"target"` } - -// TODO: Remove. -type ScreenResolution struct { - Event string `json:"event"` - ID string `json:"id,omitempty"` - Width int `json:"width"` - Height int `json:"height"` - Rate int `json:"rate"` -} - -// TODO: Remove. -type ScreenConfigurations struct { - Event string `json:"event"` - Configurations map[int]types.ScreenConfiguration `json:"configurations"` -} diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index a78f19ee..4d1e1d0b 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -64,6 +64,13 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { return h.controlGive(session, payload) }) + // Screen Events + case event.SCREEN_SET: + payload := &message.ScreenSize{} + err = utils.Unmarshal(payload, raw, func() error { + return h.screenSet(session, payload) + }) + // Clipboard Events case event.CLIPBOARD_SET: payload := &message.ClipboardData{} @@ -82,17 +89,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { err = utils.Unmarshal(payload, raw, func() error { return h.keyboardModifiers(session, payload) }) - - // Screen Events - case event.SCREEN_RESOLUTION: - err = h.screenSize(session) - case event.SCREEN_CONFIGURATIONS: - err = h.screenConfigurations(session) - case event.SCREEN_SET: - payload := &message.ScreenResolution{} - err = utils.Unmarshal(payload, raw, func() error { - return h.screenSizeChange(session, payload) - }) default: return errors.Errorf("unknown message event %s", header.Event) } diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index acf00f52..0b9680cb 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -6,7 +6,7 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandlerCtx) screenSizeChange(session types.Session, payload *message.ScreenResolution) error { +func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { if !session.Admin() { h.logger.Debug().Msg("user not admin") return nil @@ -17,9 +17,8 @@ func (h *MessageHandlerCtx) screenSizeChange(session types.Session, payload *mes } h.sessions.Broadcast( - message.ScreenResolution{ - Event: event.SCREEN_RESOLUTION, - ID: session.ID(), + message.ScreenSize{ + Event: event.SCREEN_UPDATED, Width: payload.Width, Height: payload.Height, Rate: payload.Rate, @@ -27,32 +26,3 @@ func (h *MessageHandlerCtx) screenSizeChange(session types.Session, payload *mes return nil } - -func (h *MessageHandlerCtx) screenSize(session types.Session) error { - size := h.desktop.GetScreenSize() - if size == nil { - h.logger.Debug().Msg("could not get screen size") - return nil - } - - return session.Send( - message.ScreenResolution{ - Event: event.SCREEN_RESOLUTION, - Width: size.Width, - Height: size.Height, - Rate: int(size.Rate), - }) -} - -func (h *MessageHandlerCtx) screenConfigurations(session types.Session) error { - if !session.Admin() { - h.logger.Debug().Msg("user not admin") - return nil - } - - return session.Send( - message.ScreenConfigurations{ - Event: event.SCREEN_CONFIGURATIONS, - Configurations: h.desktop.ScreenConfigurations(), - }) -} diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index fb9a23b0..d8f13220 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -12,13 +12,6 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { return err } - if session.Admin() { - // send screen configurations if admin - if err := h.screenConfigurations(session); err != nil { - return err - } - } - return nil } @@ -42,11 +35,6 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { return err } - // send current screen size - if err := h.screenSize(session); err != nil { - return err - } - // tell session there is a host host := h.sessions.GetHost() if host != nil { From 2e090eb54d90cbc9c1d22da99e25718e22bd1aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 18:24:38 +0100 Subject: [PATCH 155/876] update control WS. --- internal/api/room/control.go | 34 ++++++++------ internal/types/event/events.go | 5 +- internal/types/message/messages.go | 14 ------ internal/websocket/handler/control.go | 66 ++++++--------------------- internal/websocket/handler/handler.go | 5 -- internal/websocket/handler/session.go | 13 +++--- 6 files changed, 42 insertions(+), 95 deletions(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 05d7fd55..a4c8e1cf 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -44,9 +44,10 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { h.sessions.SetHost(session) h.sessions.Broadcast( - message.Control{ - Event: event.CONTROL_LOCKED, - ID: session.ID(), + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: true, + HostID: session.ID(), }, nil) utils.HttpSuccess(w) @@ -62,9 +63,10 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { h.sessions.ClearHost() h.sessions.Broadcast( - message.Control{ - Event: event.CONTROL_RELEASE, - ID: session.ID(), + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: false, + HostID: session.ID(), }, nil) utils.HttpSuccess(w) @@ -76,9 +78,10 @@ func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { h.sessions.SetHost(session) h.sessions.Broadcast( - message.Control{ - Event: event.CONTROL_LOCKED, - ID: session.ID(), + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: true, + HostID: session.ID(), }, nil) utils.HttpSuccess(w) @@ -99,9 +102,10 @@ func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { h.sessions.SetHost(target) h.sessions.Broadcast( - message.Control{ - Event: event.CONTROL_LOCKED, - ID: target.ID(), + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: true, + HostID: target.ID(), }, nil) utils.HttpSuccess(w) @@ -117,9 +121,9 @@ func (h *RoomHandler) controlReset(w http.ResponseWriter, r *http.Request) { h.sessions.ClearHost() h.sessions.Broadcast( - message.Control{ - Event: event.CONTROL_RELEASE, - ID: host.ID(), + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: false, }, nil) utils.HttpSuccess(w) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index e1bc0a8d..3c4fe972 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -19,10 +19,7 @@ const ( ) const ( - CONTROL_LOCKED = "control/locked" // TODO: Remove. - CONTROL_REQUESTING = "control/requesting" // TODO: Remove. - CONTROL_GIVE = "control/give" // TODO: Remove. - CONTROL_HOST = "control/host" // TODO: New. + CONTROL_HOST = "control/host" CONTROL_RELEASE = "control/release" CONTROL_REQUEST = "control/request" CONTROL_MOVE = "control/move" // TODO: New. (fallback) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index f18a2153..5edd4490 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -52,7 +52,6 @@ type MemberData struct { } // Control -// TODO: New. type ControlHost struct { Event string `json:"event,omitempty"` HasHost bool `json:"has_host"` @@ -144,16 +143,3 @@ type MemberDisconnected struct { Event string `json:"event"` ID string `json:"id"` } - -// TODO: Remove. -type Control struct { - Event string `json:"event"` - ID string `json:"id"` -} - -// TODO: Remove. -type ControlTarget struct { - Event string `json:"event"` - ID string `json:"id"` - Target string `json:"target"` -} diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index c609c48b..9ad26394 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -12,71 +12,35 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { return nil } - h.logger.Debug().Str("id", session.ID()).Msgf("host called %s", event.CONTROL_RELEASE) h.sessions.ClearHost() - h.sessions.Broadcast( - message.Control{ - Event: event.CONTROL_RELEASE, - ID: session.ID(), + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: false, }, nil) return nil } func (h *MessageHandlerCtx) controlRequest(session types.Session) error { + // TODO: Allow implicit requests. host := h.sessions.GetHost() - - if host == nil { - // set host - h.sessions.SetHost(session) - - // let everyone know - h.sessions.Broadcast( - message.Control{ - Event: event.CONTROL_LOCKED, - ID: session.ID(), - }, nil) - } else { + if host != nil { // tell session there is a host - if err := session.Send( - message.Control{ - Event: event.CONTROL_REQUEST, - ID: host.ID(), - }); err != nil { - return err - } - - // tell host session wants to be host - return host.Send( - message.Control{ - Event: event.CONTROL_REQUESTING, - ID: session.ID(), + return session.Send( + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: true, + HostID: host.ID(), }) } - return nil -} - -func (h *MessageHandlerCtx) controlGive(session types.Session, payload *message.Control) error { - if !session.IsHost() { - h.logger.Debug().Str("id", session.ID()).Msg("is not the host") - return nil - } - - target, ok := h.sessions.Get(payload.ID) - if !ok { - h.logger.Debug().Str("id", payload.ID).Msg("can't find target session") - return nil - } - - h.sessions.SetHost(target) - + h.sessions.SetHost(session) h.sessions.Broadcast( - message.ControlTarget{ - Event: event.CONTROL_GIVE, - ID: session.ID(), - Target: target.ID(), + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: true, + HostID: session.ID(), }, nil) return nil diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 4d1e1d0b..a1552296 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -58,11 +58,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { err = h.controlRelease(session) case event.CONTROL_REQUEST: err = h.controlRequest(session) - case event.CONTROL_GIVE: - payload := &message.Control{} - err = utils.Unmarshal(payload, raw, func() error { - return h.controlGive(session, payload) - }) // Screen Events case event.SCREEN_SET: diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index d8f13220..add341aa 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -39,9 +39,10 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { host := h.sessions.GetHost() if host != nil { if err := session.Send( - message.Control{ - Event: event.CONTROL_LOCKED, - ID: host.ID(), + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: true, + HostID: host.ID(), }); err != nil { return err } @@ -65,9 +66,9 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { h.sessions.ClearHost() h.sessions.Broadcast( - message.Control{ - Event: event.CONTROL_RELEASE, - ID: session.ID(), + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: false, }, nil) } From 743ab2bf6ac5e43bf5563053fb07b50f66a1bb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 18:27:25 +0100 Subject: [PATCH 156/876] signal provide upon request WS. --- internal/types/event/events.go | 2 +- internal/websocket/handler/handler.go | 2 ++ internal/websocket/handler/session.go | 5 ----- internal/websocket/handler/signal.go | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 3c4fe972..f2f95380 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -6,7 +6,7 @@ const ( ) const ( - SIGNAL_REQUEST = "signal/request" // TODO: New. + SIGNAL_REQUEST = "signal/request" SIGNAL_ANSWER = "signal/answer" SIGNAL_PROVIDE = "signal/provide" ) diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index a1552296..e6b01a49 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -47,6 +47,8 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { var err error switch header.Event { // Signal Events + case event.SIGNAL_REQUEST: + err = h.signalRequest(session) case event.SIGNAL_ANSWER: payload := &message.SignalAnswer{} err = utils.Unmarshal(payload, raw, func() error { diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index add341aa..2299120e 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -7,11 +7,6 @@ import ( ) func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { - // send sdp and id over to client - if err := h.signalProvide(session); err != nil { - return err - } - return nil } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 8acd7741..c6cd9cbd 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -6,7 +6,7 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandlerCtx) signalProvide(session types.Session) error { +func (h *MessageHandlerCtx) signalRequest(session types.Session) error { sdp, lite, ice, err := h.webrtc.CreatePeer(session) if err != nil { return err From 753fb01955472335836ee92540f84ce502bbd7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 18:52:16 +0100 Subject: [PATCH 157/876] removed OnCreated event. --- internal/session/manager.go | 10 ++-------- internal/session/session.go | 1 - internal/types/session.go | 1 - internal/websocket/handler/session.go | 4 ---- internal/websocket/manager.go | 8 -------- 5 files changed, 2 insertions(+), 22 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index be48a6cf..7803c144 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -220,8 +220,8 @@ func (manager *SessionManagerCtx) OnHostCleared(listener func(session types.Sess }) } -func (manager *SessionManagerCtx) OnCreated(listener func(session types.Session)) { - manager.emmiter.On("created", func(payload ...interface{}) { +func (manager *SessionManagerCtx) OnConnected(listener func(session types.Session)) { + manager.emmiter.On("connected", func(payload ...interface{}) { // Start streaming, when first joins if !manager.capture.Streaming() { manager.capture.StartStream() @@ -231,12 +231,6 @@ func (manager *SessionManagerCtx) OnCreated(listener func(session types.Session) }) } -func (manager *SessionManagerCtx) OnConnected(listener func(session types.Session)) { - manager.emmiter.On("connected", func(payload ...interface{}) { - listener(payload[0].(*SessionCtx)) - }) -} - func (manager *SessionManagerCtx) OnDisconnected(listener func(session types.Session)) { manager.emmiter.On("disconnected", func(payload ...interface{}) { // Stop streaming, if everyone left diff --git a/internal/session/session.go b/internal/session/session.go index 52f1b16b..cbf75e0d 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -45,7 +45,6 @@ func (session *SessionCtx) Connected() bool { func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { session.websocket_peer = websocket_peer - session.manager.emmiter.Emit("created", session) } func (session *SessionCtx) SetWebSocketConnected(connected bool) { diff --git a/internal/types/session.go b/internal/types/session.go index cf525f51..c28475a7 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -46,7 +46,6 @@ type SessionManager interface { OnHost(listener func(session Session)) OnHostCleared(listener func(session Session)) - OnCreated(listener func(session Session)) OnConnected(listener func(session Session)) OnDisconnected(listener func(session Session)) diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 2299120e..b3d761e5 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -6,10 +6,6 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { - return nil -} - func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { // create member list members := []*message.MembersListEntry{} diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 027fe3e0..14647c57 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -49,14 +49,6 @@ type WebSocketManagerCtx struct { } func (ws *WebSocketManagerCtx) Start() { - ws.sessions.OnCreated(func(session types.Session) { - if err := ws.handler.SessionCreated(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with an error") - } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session created") - } - }) - ws.sessions.OnConnected(func(session types.Session) { if err := ws.handler.SessionConnected(session); err != nil { ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with an error") From 745ef00cd2c809061bfeed8910b853daa595127c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 19:13:17 +0100 Subject: [PATCH 158/876] update connected / disconnected events. --- internal/session/session.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index cbf75e0d..37bcf469 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -40,6 +40,7 @@ func (session *SessionCtx) VerifySecret(secret string) bool { } func (session *SessionCtx) Connected() bool { + // TODO: Refactor. return session.websocket_connected && session.webrtc_connected } @@ -50,7 +51,10 @@ func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) func (session *SessionCtx) SetWebSocketConnected(connected bool) { if connected { session.websocket_connected = true - session.manager.emmiter.Emit("websocket_connected", session) + + // TODO: Refactor. + //session.manager.emmiter.Emit("websocket_connected", session) + session.manager.emmiter.Emit("connected", session) } else { session.websocket_connected = false @@ -69,10 +73,7 @@ func (session *SessionCtx) SetWebRTCPeer(webrtc_peer types.WebRTCPeer) { func (session *SessionCtx) SetWebRTCConnected(connected bool) { if connected { session.webrtc_connected = true - - // TODO: Refactor. - //session.manager.emmiter.Emit("webrtc_connected", session) - session.manager.emmiter.Emit("connected", session) + session.manager.emmiter.Emit("webrtc_connected", session) } else { session.webrtc_connected = false session.manager.emmiter.Emit("webrtc_disconnected", session) From d00015ee9116407d725003e55d97a3eb5dc13a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 20:07:19 +0100 Subject: [PATCH 159/876] system init WS. --- internal/types/event/events.go | 3 +- internal/types/message/messages.go | 23 +++++---- internal/websocket/handler/session.go | 30 ++---------- internal/websocket/handler/system.go | 69 +++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 37 deletions(-) create mode 100644 internal/websocket/handler/system.go diff --git a/internal/types/event/events.go b/internal/types/event/events.go index f2f95380..dd7a275b 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -1,7 +1,8 @@ package event const ( - SYSTEM_CONNECT = "system/connect" // TODO: New. + SYSTEM_INIT = "system/init" + SYSTEM_ADMIN = "system/admin" SYSTEM_DISCONNECT = "system/disconnect" ) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 5edd4490..549c5d1b 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -6,14 +6,17 @@ type Message struct { } // System -// TODO: New. -type SystemConnect struct { - Event string `json:"event,omitempty"` - ControlHost ControlHost `json:"control_host"` - ScreenSize ScreenSize `json:"screen_size"` - Members []MemberData `json:"members"` - ScreenSizesList *[]ScreenSize `json:"screen_sizes_list,omitempty"` - BroadcastStatus BroadcastStatus `json:"members,omitempty"` +type SystemInit struct { + Event string `json:"event,omitempty"` + ControlHost ControlHost `json:"control_host"` + ScreenSize ScreenSize `json:"screen_size"` + Members []MemberData `json:"members"` +} + +type SystemAdmin struct { + Event string `json:"event,omitempty"` + ScreenSizesList []ScreenSize `json:"screen_sizes_list"` + BroadcastStatus BroadcastStatus `json:"broadcast_status"` } // TODO: New. @@ -106,9 +109,9 @@ type KeyboardLayout struct { } type BroadcastStatus struct { - Event string `json:"event"` - URL string `json:"url"` + Event string `json:"event,omitempty"` IsActive bool `json:"is_active"` + URL string `json:"url,omitempty"` } // TODO: Remove. diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index b3d761e5..c02a9089 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -7,34 +7,12 @@ import ( ) func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { - // create member list - members := []*message.MembersListEntry{} - for _, session := range h.sessions.Members() { - members = append(members, &message.MembersListEntry{ - ID: session.ID(), - Name: session.Name(), - Admin: session.Admin(), - }) - } - - // send list of members to session - if err := session.Send( - message.MembersList{ - Event: event.MEMBER_LIST, - Memebers: members, - }); err != nil { + if err := h.systemInit(session); err != nil { return err } - // tell session there is a host - host := h.sessions.GetHost() - if host != nil { - if err := session.Send( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: true, - HostID: host.ID(), - }); err != nil { + if session.Admin() { + if err := h.systemAdmin(session); err != nil { return err } } @@ -42,7 +20,7 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { // let everyone know there is a new session h.sessions.Broadcast( message.Member{ - Event: event.MEMBER_CONNECTED, + Event: event.MEMBER_CONNECTED, ID: session.ID(), Name: session.Name(), Admin: session.Admin(), diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go new file mode 100644 index 00000000..83df6de6 --- /dev/null +++ b/internal/websocket/handler/system.go @@ -0,0 +1,69 @@ +package handler + +import ( + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" +) + +func (h *MessageHandlerCtx) systemInit(session types.Session) error { + host := h.sessions.GetHost() + + controlHost := message.ControlHost{ + HasHost: host != nil, + } + + if controlHost.HasHost { + controlHost.HostID = host.ID() + } + + size := h.desktop.GetScreenSize() + if size == nil { + h.logger.Debug().Msg("could not get screen size") + return nil + } + + members := []message.MemberData{} + for _, session := range h.sessions.Members() { + members = append(members, message.MemberData{ + ID: session.ID(), + Name: session.Name(), + IsAdmin: session.Admin(), + }) + } + + return session.Send( + message.SystemInit{ + Event: event.SYSTEM_INIT, + ControlHost: controlHost, + Members: members, + ScreenSize: message.ScreenSize{ + Width: size.Width, + Height: size.Height, + Rate: int(size.Rate), + }, + }) +} + +func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { + screenSizesList := []message.ScreenSize{} + for _, size := range h.desktop.ScreenConfigurations() { + for _, fps := range size.Rates { + screenSizesList = append(screenSizesList, message.ScreenSize{ + Width: size.Width, + Height: size.Height, + Rate: int(fps), + }) + } + } + + return session.Send( + message.SystemAdmin{ + Event: event.SYSTEM_ADMIN, + ScreenSizesList: screenSizesList, + BroadcastStatus: message.BroadcastStatus{ + IsActive: h.capture.BroadcastEnabled(), + URL: h.capture.BroadcastUrl(), + }, + }) +} From caa4be4d3bcf2741c2400c335e1bb24e8ace5a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 21:06:19 +0100 Subject: [PATCH 160/876] remove unused MEMBER_LIST. --- internal/types/event/events.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index dd7a275b..57e180d1 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -13,7 +13,6 @@ const ( ) const ( - MEMBER_LIST = "member/list" // TODO: Remove. MEMBER_CONNECTED = "member/connected" MEMBER_UPDATED = "member/updated" // TODO: New. MEMBER_DISCONNECTED = "member/disconnected" From 5c0dee93ac22860d5dab6f56019ce92313f9c594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 21:06:37 +0100 Subject: [PATCH 161/876] messages highlight comments. --- internal/types/message/messages.go | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 549c5d1b..e6c74ebb 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -5,7 +5,10 @@ type Message struct { Payload interface{} `json:"payload"` // TODO: New. } +///////////////////////////// // System +///////////////////////////// + type SystemInit struct { Event string `json:"event,omitempty"` ControlHost ControlHost `json:"control_host"` @@ -25,7 +28,10 @@ type SystemDisconnect struct { Message string `json:"message"` } +///////////////////////////// // Signal +///////////////////////////// + type SignalProvide struct { Event string `json:"event,omitempty"` SDP string `json:"sdp"` @@ -38,8 +44,10 @@ type SignalAnswer struct { SDP string `json:"sdp"` } - +///////////////////////////// // Member +///////////////////////////// + // TODO: New. type MemberID struct { Event string `json:"event,omitempty"` @@ -54,7 +62,10 @@ type MemberData struct { IsAdmin bool `json:"is_admin"` } +///////////////////////////// // Control +///////////////////////////// + type ControlHost struct { Event string `json:"event,omitempty"` HasHost bool `json:"has_host"` @@ -81,7 +92,10 @@ type ControlKey struct { Key uint64 `json:"key"` } +///////////////////////////// // Screen +///////////////////////////// + type ScreenSize struct { Event string `json:"event,omitempty"` Width int `json:"width"` @@ -89,13 +103,19 @@ type ScreenSize struct { Rate int `json:"rate"` } +///////////////////////////// // Clipboard +///////////////////////////// + type ClipboardData struct { Event string `json:"event,omitempty"` Text string `json:"text"` } +///////////////////////////// // Keyboard +///////////////////////////// + type KeyboardModifiers struct { Event string `json:"event,omitempty"` CapsLock *bool `json:"caps_lock"` @@ -108,6 +128,10 @@ type KeyboardLayout struct { Layout string `json:"layout"` } +///////////////////////////// +// Broadcast +///////////////////////////// + type BroadcastStatus struct { Event string `json:"event,omitempty"` IsActive bool `json:"is_active"` From 2c7291324c71411baf15840b48126258731630b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 21:27:43 +0100 Subject: [PATCH 162/876] fix Host ID json name. --- internal/types/message/messages.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index e6c74ebb..59cc89d2 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -69,7 +69,7 @@ type MemberData struct { type ControlHost struct { Event string `json:"event,omitempty"` HasHost bool `json:"has_host"` - HostID string `json:"id,omitempty"` + HostID string `json:"host_id,omitempty"` } // TODO: New. From b194f8034ad2cb7a21ef27b15f653d427ed6a53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 22:24:58 +0100 Subject: [PATCH 163/876] add MemberId to init. --- internal/types/message/messages.go | 1 + internal/websocket/handler/system.go | 1 + 2 files changed, 2 insertions(+) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 59cc89d2..17cbe3aa 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -11,6 +11,7 @@ type Message struct { type SystemInit struct { Event string `json:"event,omitempty"` + MemberId string `json:"member_id"` ControlHost ControlHost `json:"control_host"` ScreenSize ScreenSize `json:"screen_size"` Members []MemberData `json:"members"` diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 83df6de6..3d28205e 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -35,6 +35,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return session.Send( message.SystemInit{ Event: event.SYSTEM_INIT, + MemberId: session.ID(), ControlHost: controlHost, Members: members, ScreenSize: message.ScreenSize{ From 21293256ed7de4c8f7c9e042f980ca67f9f234d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 22:28:13 +0100 Subject: [PATCH 164/876] connected session only websocket. --- internal/session/session.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/session/session.go b/internal/session/session.go index 37bcf469..d7c05710 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -41,7 +41,7 @@ func (session *SessionCtx) VerifySecret(secret string) bool { func (session *SessionCtx) Connected() bool { // TODO: Refactor. - return session.websocket_connected && session.webrtc_connected + return session.websocket_connected// && session.webrtc_connected } func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { From 1b6bc44f2a98755514bfa3e68187b07246d39e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 1 Dec 2020 19:44:23 +0100 Subject: [PATCH 165/876] event SystemDisconnect. --- internal/session/session.go | 2 +- internal/types/message/messages.go | 6 ------ internal/websocket/manager.go | 9 +++++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index d7c05710..972af4dc 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -84,7 +84,7 @@ func (session *SessionCtx) SetWebRTCConnected(connected bool) { func (session *SessionCtx) Disconnect(reason string) error { if err := session.Send( - message.Disconnect{ + message.SystemDisconnect{ Event: event.SYSTEM_DISCONNECT, Message: reason, }); err != nil { diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 17cbe3aa..47217f45 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -23,7 +23,6 @@ type SystemAdmin struct { BroadcastStatus BroadcastStatus `json:"broadcast_status"` } -// TODO: New. type SystemDisconnect struct { Event string `json:"event,omitempty"` Message string `json:"message"` @@ -139,11 +138,6 @@ type BroadcastStatus struct { URL string `json:"url,omitempty"` } -// TODO: Remove. -type Disconnect struct { - Event string `json:"event"` - Message string `json:"message"` -} // TODO: Remove. type MembersList struct { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 14647c57..4272221e 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -124,10 +124,11 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e ws.logger.Warn().Err(err).Msg("authentication failed") // TODO: Refactor - if err = connection.WriteJSON(message.Disconnect{ - Event: event.SYSTEM_DISCONNECT, - Message: "authentication failed", - }); err != nil { + if err = connection.WriteJSON( + message.SystemDisconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: "authentication failed", + }); err != nil { ws.logger.Error().Err(err).Msg("failed to send disconnect") } From 6599a093c0fd6beb6fce966ac17da9eda26ded73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 1 Dec 2020 19:45:21 +0100 Subject: [PATCH 166/876] remove MemberList structs. --- internal/types/message/messages.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 47217f45..206eaff6 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -138,20 +138,6 @@ type BroadcastStatus struct { URL string `json:"url,omitempty"` } - -// TODO: Remove. -type MembersList struct { - Event string `json:"event"` - Memebers []*MembersListEntry `json:"members"` -} - -// TODO: Remove. -type MembersListEntry struct { - ID string `json:"id"` - Name string `json:"name"` - Admin bool `json:"admin"` -} - // TODO: Remove. type Member struct { Event string `json:"event"` From b82fbae597e494fe6189e908ea79c0d7b731e36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 1 Dec 2020 19:47:50 +0100 Subject: [PATCH 167/876] replace old Member structures. --- internal/types/message/messages.go | 16 ---------------- internal/websocket/handler/session.go | 12 ++++++------ 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 206eaff6..e13cdacb 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -48,13 +48,11 @@ type SignalAnswer struct { // Member ///////////////////////////// -// TODO: New. type MemberID struct { Event string `json:"event,omitempty"` ID string `json:"id"` } -// TODO: New. type MemberData struct { Event string `json:"event,omitempty"` ID string `json:"id"` @@ -137,17 +135,3 @@ type BroadcastStatus struct { IsActive bool `json:"is_active"` URL string `json:"url,omitempty"` } - -// TODO: Remove. -type Member struct { - Event string `json:"event"` - ID string `json:"id"` - Name string `json:"name"` - Admin bool `json:"admin"` -} - -// TODO: Remove. -type MemberDisconnected struct { - Event string `json:"event"` - ID string `json:"id"` -} diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index c02a9089..5a42aa11 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -19,11 +19,11 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { // let everyone know there is a new session h.sessions.Broadcast( - message.Member{ - Event: event.MEMBER_CONNECTED, - ID: session.ID(), - Name: session.Name(), - Admin: session.Admin(), + message.MemberData{ + Event: event.MEMBER_CONNECTED, + ID: session.ID(), + Name: session.Name(), + IsAdmin: session.Admin(), }, nil) return nil @@ -43,7 +43,7 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { // let everyone know session disconnected h.sessions.Broadcast( - message.MemberDisconnected{ + message.MemberID{ Event: event.MEMBER_DISCONNECTED, ID: session.ID(), }, nil); From bdd8bdab72e43a9bff7ab5a13e01d3b9bcf26c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 1 Dec 2020 22:56:08 +0100 Subject: [PATCH 168/876] members as map. --- internal/types/message/messages.go | 10 +++++----- internal/websocket/handler/system.go | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index e13cdacb..37b16bb9 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -10,11 +10,11 @@ type Message struct { ///////////////////////////// type SystemInit struct { - Event string `json:"event,omitempty"` - MemberId string `json:"member_id"` - ControlHost ControlHost `json:"control_host"` - ScreenSize ScreenSize `json:"screen_size"` - Members []MemberData `json:"members"` + Event string `json:"event,omitempty"` + MemberId string `json:"member_id"` + ControlHost ControlHost `json:"control_host"` + ScreenSize ScreenSize `json:"screen_size"` + Members map[string]MemberData `json:"members"` } type SystemAdmin struct { diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 3d28205e..81684499 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -23,13 +23,13 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return nil } - members := []message.MemberData{} + members := map[string]message.MemberData{} for _, session := range h.sessions.Members() { - members = append(members, message.MemberData{ + members[session.ID()] = message.MemberData{ ID: session.ID(), Name: session.Name(), IsAdmin: session.Admin(), - }) + } } return session.Send( From 964588b32876a6c23e49bf1b06cdfb494393b4d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 00:04:36 +0100 Subject: [PATCH 169/876] remove HostID. --- internal/api/room/control.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index a4c8e1cf..0ff8a6cb 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -66,7 +66,6 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { message.ControlHost{ Event: event.CONTROL_HOST, HasHost: false, - HostID: session.ID(), }, nil) utils.HttpSuccess(w) From b7103ca809b532147b8fb27f039706d50ecfb415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 10:46:00 +0100 Subject: [PATCH 170/876] ResetKeys on ClearHost. --- internal/api/room/control.go | 4 +++- internal/websocket/handler/control.go | 2 ++ internal/websocket/handler/session.go | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 0ff8a6cb..659b87ba 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -60,6 +60,7 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { return } + h.desktop.ResetKeys() h.sessions.ClearHost() h.sessions.Broadcast( @@ -117,8 +118,9 @@ func (h *RoomHandler) controlReset(w http.ResponseWriter, r *http.Request) { return } + h.desktop.ResetKeys() h.sessions.ClearHost() - + h.sessions.Broadcast( message.ControlHost{ Event: event.CONTROL_HOST, diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 9ad26394..af436fec 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -12,7 +12,9 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { return nil } + h.desktop.ResetKeys() h.sessions.ClearHost() + h.sessions.Broadcast( message.ControlHost{ Event: event.CONTROL_HOST, diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 5a42aa11..49b64384 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -32,6 +32,7 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { // clear host if exists if session.IsHost() { + h.desktop.ResetKeys() h.sessions.ClearHost() h.sessions.Broadcast( From 26c0fea840dd979b034c9c98f348e2290a74a8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 10:47:20 +0100 Subject: [PATCH 171/876] controlRequest if already is the host. --- internal/websocket/handler/control.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index af436fec..1f4f0026 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -25,6 +25,11 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { } func (h *MessageHandlerCtx) controlRequest(session types.Session) error { + if session.IsHost() { + h.logger.Debug().Str("id", session.ID()).Msg("is already the host") + return nil + } + // TODO: Allow implicit requests. host := h.sessions.GetHost() if host != nil { From 1677e3893555ee386bed28e153bd88543aa556d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 11:24:20 +0100 Subject: [PATCH 172/876] introduced ImplicitHosting. --- internal/config/session.go | 11 +++++++++-- internal/session/manager.go | 4 ++++ internal/types/message/messages.go | 1 + internal/types/session.go | 1 + internal/websocket/handler/control.go | 20 ++++++++++---------- internal/websocket/handler/system.go | 11 ++++++----- 6 files changed, 31 insertions(+), 17 deletions(-) diff --git a/internal/config/session.go b/internal/config/session.go index 2b06895f..33ebc50e 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -6,8 +6,9 @@ import ( ) type Session struct { - Password string - AdminPassword string + Password string + AdminPassword string + ImplicitHosting bool } func (Session) Init(cmd *cobra.Command) error { @@ -21,10 +22,16 @@ func (Session) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("implicit_hosting", true, "allow implicit control switching") + if err := viper.BindPFlag("implicit_hosting", cmd.PersistentFlags().Lookup("implicit_hosting")); err != nil { + return err + } + return nil } func (s *Session) Set() { s.Password = viper.GetString("password") s.AdminPassword = viper.GetString("password_admin") + s.ImplicitHosting = viper.GetBool("implicit_hosting") } diff --git a/internal/session/manager.go b/internal/session/manager.go index 7803c144..c133872d 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -241,3 +241,7 @@ func (manager *SessionManagerCtx) OnDisconnected(listener func(session types.Ses listener(payload[0].(*SessionCtx)) }) } + +func (manager *SessionManagerCtx) ImplicitHosting() bool { + return manager.config.ImplicitHosting +} diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 37b16bb9..7fddbb3c 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -15,6 +15,7 @@ type SystemInit struct { ControlHost ControlHost `json:"control_host"` ScreenSize ScreenSize `json:"screen_size"` Members map[string]MemberData `json:"members"` + ImplicitHosting bool `json:"implicit_hosting"` } type SystemAdmin struct { diff --git a/internal/types/session.go b/internal/types/session.go index c28475a7..0233d2c9 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -48,6 +48,7 @@ type SessionManager interface { OnHostCleared(listener func(session Session)) OnConnected(listener func(session Session)) OnDisconnected(listener func(session Session)) + ImplicitHosting() bool // auth Authenticate(r *http.Request) (Session, error) diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 1f4f0026..6428311e 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -30,16 +30,16 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { return nil } - // TODO: Allow implicit requests. - host := h.sessions.GetHost() - if host != nil { - // tell session there is a host - return session.Send( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: true, - HostID: host.ID(), - }) + if !h.sessions.ImplicitHosting() { + // tell session if there is a host + if host := h.sessions.GetHost(); host != nil { + return session.Send( + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: true, + HostID: host.ID(), + }) + } } h.sessions.SetHost(session) diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 81684499..57876a16 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -34,15 +34,16 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return session.Send( message.SystemInit{ - Event: event.SYSTEM_INIT, - MemberId: session.ID(), - ControlHost: controlHost, - Members: members, - ScreenSize: message.ScreenSize{ + Event: event.SYSTEM_INIT, + MemberId: session.ID(), + ControlHost: controlHost, + ScreenSize: message.ScreenSize{ Width: size.Width, Height: size.Height, Rate: int(size.Rate), }, + Members: members, + ImplicitHosting: h.sessions.ImplicitHosting(), }) } From 25fec634553e6a556a44a219f128930017fb755c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 11:45:22 +0100 Subject: [PATCH 173/876] WS do not connect if already connected. --- internal/websocket/manager.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 4272221e..1d263dc7 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -135,6 +135,19 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return connection.Close() } + if session.Connected() { + // TODO: Refactor + if err = connection.WriteJSON( + message.SystemDisconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: "already connected", + }); err != nil { + ws.logger.Error().Err(err).Msg("failed to send disconnect") + } + + return connection.Close() + } + session.SetWebSocketPeer(&WebSocketPeerCtx{ session: session, ws: ws, From 123fbd8317fc7878828a0f85c0f3d80200fb94c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 16:49:51 +0100 Subject: [PATCH 174/876] IsAdmin + IsConnected. --- internal/http/auth/auth.go | 4 ++-- internal/session/manager.go | 10 +++++----- internal/session/session.go | 4 ++-- internal/types/session.go | 4 ++-- internal/websocket/handler/screen.go | 2 +- internal/websocket/handler/session.go | 4 ++-- internal/websocket/handler/system.go | 2 +- internal/websocket/manager.go | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index 077f8518..e1cbd356 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -26,7 +26,7 @@ func GetSession(r *http.Request) types.Session { func AdminsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) - if !session.Admin() { + if !session.IsAdmin() { utils.HttpForbidden(w) } else { next.ServeHTTP(w, r) @@ -48,7 +48,7 @@ func HostsOnly(next http.Handler) http.Handler { func HostsOrAdminsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) - if !session.IsHost() && !session.Admin() { + if !session.IsHost() && !session.IsAdmin() { utils.HttpForbidden(w, "Only host can do this.") } else { next.ServeHTTP(w, r) diff --git a/internal/session/manager.go b/internal/session/manager.go index c133872d..9b50de84 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -87,7 +87,7 @@ func (manager *SessionManagerCtx) Delete(id string) error { delete(manager.members, id) - if session.Connected() { + if session.IsConnected() { return session.Disconnect("member deleted") } @@ -137,7 +137,7 @@ func (manager *SessionManagerCtx) Admins() []types.Session { var sessions []types.Session for _, session := range manager.members { - if !session.Connected() || !session.Admin() { + if !session.IsConnected() || !session.IsAdmin() { continue } @@ -153,7 +153,7 @@ func (manager *SessionManagerCtx) Members() []types.Session { var sessions []types.Session for _, session := range manager.members { - if !session.Connected() { + if !session.IsConnected() { continue } @@ -168,7 +168,7 @@ func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) defer manager.membersMu.Unlock() for id, session := range manager.members { - if !session.Connected() { + if !session.IsConnected() { continue } @@ -189,7 +189,7 @@ func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interfac defer manager.membersMu.Unlock() for id, session := range manager.members { - if !session.Connected() || !session.Admin() { + if !session.IsConnected() || !session.IsAdmin() { continue } diff --git a/internal/session/session.go b/internal/session/session.go index 972af4dc..8da9c08b 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -27,7 +27,7 @@ func (session *SessionCtx) Name() string { return session.profile.Name } -func (session *SessionCtx) Admin() bool { +func (session *SessionCtx) IsAdmin() bool { return session.profile.IsAdmin } @@ -39,7 +39,7 @@ func (session *SessionCtx) VerifySecret(secret string) bool { return session.profile.Secret == secret } -func (session *SessionCtx) Connected() bool { +func (session *SessionCtx) IsConnected() bool { // TODO: Refactor. return session.websocket_connected// && session.webrtc_connected } diff --git a/internal/types/session.go b/internal/types/session.go index 0233d2c9..0415b23e 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -16,9 +16,9 @@ type MemberProfile struct { type Session interface { ID() string Name() string - Admin() bool + IsAdmin() bool IsHost() bool - Connected() bool + IsConnected() bool VerifySecret(secret string) bool SetWebSocketPeer(websocket_peer WebSocketPeer) SetWebSocketConnected(connected bool) diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 0b9680cb..1927ed42 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -7,7 +7,7 @@ import ( ) func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { - if !session.Admin() { + if !session.IsAdmin() { h.logger.Debug().Msg("user not admin") return nil } diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 49b64384..83ee1679 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -11,7 +11,7 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { return err } - if session.Admin() { + if session.IsAdmin() { if err := h.systemAdmin(session); err != nil { return err } @@ -23,7 +23,7 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { Event: event.MEMBER_CONNECTED, ID: session.ID(), Name: session.Name(), - IsAdmin: session.Admin(), + IsAdmin: session.IsAdmin(), }, nil) return nil diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 57876a16..fe373a5e 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -28,7 +28,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { members[session.ID()] = message.MemberData{ ID: session.ID(), Name: session.Name(), - IsAdmin: session.Admin(), + IsAdmin: session.IsAdmin(), } } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 1d263dc7..0e81a5a4 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -135,7 +135,7 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e return connection.Close() } - if session.Connected() { + if session.IsConnected() { // TODO: Refactor if err = connection.WriteJSON( message.SystemDisconnect{ From 5541675f57b0205f2de70440481c2dfd25e8e0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 16:50:30 +0100 Subject: [PATCH 175/876] use member id or create new. --- internal/api/members/crud.go | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index fb7649fd..357c27e1 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -28,13 +28,20 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { return } - id, err := utils.NewUID(32) - if err != nil { - utils.HttpInternalServerError(w, err) - return + if data.ID == "" { + var err error + if data.ID, err = utils.NewUID(32); err != nil { + utils.HttpInternalServerError(w, err) + return + } + } else { + if _, ok := h.sessions.Get(data.ID); ok { + utils.HttpBadRequest(w, "Member ID already exists.") + return + } } - session := h.sessions.Create(id, types.MemberProfile{ + session := h.sessions.Create(data.ID, types.MemberProfile{ Secret: data.Secret, Name: data.Name, IsAdmin: data.IsAdmin, @@ -51,7 +58,7 @@ func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w, MemberDataPayload{ ID: member.ID(), Name: member.Name(), - IsAdmin: member.Admin(), + IsAdmin: member.IsAdmin(), }) } @@ -66,7 +73,7 @@ func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w, MemberDataPayload{ ID: member.ID(), Name: member.Name(), - IsAdmin: member.Admin(), + IsAdmin: member.IsAdmin(), }) } From 82d37b15e4605da2f4dc37dd08b5865bd4128402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 17:12:00 +0100 Subject: [PATCH 176/876] HasConnectedMembers and Members returns not connected. --- internal/session/manager.go | 17 +++++------------ internal/types/session.go | 1 - 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 9b50de84..011b55fa 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -131,20 +131,17 @@ func (manager *SessionManagerCtx) ClearHost() { // --- // members list // --- -func (manager *SessionManagerCtx) Admins() []types.Session { +func (manager *SessionManagerCtx) HasConnectedMembers() bool { manager.membersMu.Lock() defer manager.membersMu.Unlock() - var sessions []types.Session for _, session := range manager.members { - if !session.IsConnected() || !session.IsAdmin() { - continue + if session.IsConnected() { + return true } - - sessions = append(sessions, session) } - return sessions + return false } func (manager *SessionManagerCtx) Members() []types.Session { @@ -153,10 +150,6 @@ func (manager *SessionManagerCtx) Members() []types.Session { var sessions []types.Session for _, session := range manager.members { - if !session.IsConnected() { - continue - } - sessions = append(sessions, session) } @@ -234,7 +227,7 @@ func (manager *SessionManagerCtx) OnConnected(listener func(session types.Sessio func (manager *SessionManagerCtx) OnDisconnected(listener func(session types.Session)) { manager.emmiter.On("disconnected", func(payload ...interface{}) { // Stop streaming, if everyone left - if manager.capture.Streaming() && len(manager.Members()) == 0 { + if manager.capture.Streaming() && !manager.HasConnectedMembers() { manager.capture.StopStream() } diff --git a/internal/types/session.go b/internal/types/session.go index 0415b23e..52e1cc81 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -39,7 +39,6 @@ type SessionManager interface { GetHost() Session ClearHost() - Admins() []Session Members() []Session Broadcast(v interface{}, exclude interface{}) AdminBroadcast(v interface{}, exclude interface{}) From 220e162f4232b19b825e09a789de4f09500f1fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 17:23:35 +0100 Subject: [PATCH 177/876] beautify. --- internal/session/manager.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/internal/session/manager.go b/internal/session/manager.go index 011b55fa..96edc152 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -97,6 +97,7 @@ func (manager *SessionManagerCtx) Delete(id string) error { // --- // host // --- + func (manager *SessionManagerCtx) HasHost() bool { manager.hostMu.Lock() defer manager.hostMu.Unlock() @@ -131,6 +132,7 @@ func (manager *SessionManagerCtx) ClearHost() { // --- // members list // --- + func (manager *SessionManagerCtx) HasConnectedMembers() bool { manager.membersMu.Lock() defer manager.membersMu.Unlock() @@ -201,6 +203,7 @@ func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interfac // --- // events // --- + func (manager *SessionManagerCtx) OnHost(listener func(session types.Session)) { manager.emmiter.On("host", func(payload ...interface{}) { listener(payload[0].(*SessionCtx)) @@ -235,6 +238,10 @@ func (manager *SessionManagerCtx) OnDisconnected(listener func(session types.Ses }) } +// --- +// config +// --- + func (manager *SessionManagerCtx) ImplicitHosting() bool { return manager.config.ImplicitHosting } From 0d2f3405bb3838d1441ed145a51479bc56000af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 17:29:38 +0100 Subject: [PATCH 178/876] new MemberProfile & session refactor. --- internal/api/members/crud.go | 17 ++--- internal/session/manager.go | 12 ++++ internal/session/session.go | 119 ++++++++++++++++++++++------------- internal/types/session.go | 36 +++++++---- 4 files changed, 122 insertions(+), 62 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index 357c27e1..a306b6bf 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -12,14 +12,15 @@ type MemberCreatePayload struct { } type MemberDataPayload struct { - ID string `json:"id"` - Secret string `json:"secret,omitempty"` - Name string `json:"name"` - IsAdmin bool `json:"is_admin"` - //Enabled bool `json:"enabled"` - //CanControl bool `json:"can_control"` - //CanWatch bool `json:"can_watch"` - //ClipboardAccess bool `json:"clipboard_access"` + ID string `json:"id"` + Secret string `json:"secret,omitempty"` + Name string `json:"name"` + IsAdmin bool `json:"is_admin"` + CanLogin bool `json:"can_login"` + CanConnect bool `json:"can_connect"` + CanWatch bool `json:"can_watch"` + CanHost bool `json:"can_host"` + CanAccessClipboard bool `json:"can_access_clipboard"` } func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { diff --git a/internal/session/manager.go b/internal/session/manager.go index 96edc152..6b35e01e 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -238,6 +238,18 @@ func (manager *SessionManagerCtx) OnDisconnected(listener func(session types.Ses }) } +func (manager *SessionManagerCtx) OnReceivingStarted(listener func(session types.Session)) { + manager.emmiter.On("receiving_started", func(payload ...interface{}) { + listener(payload[0].(*SessionCtx)) + }) +} + +func (manager *SessionManagerCtx) OnReceivingStopped(listener func(session types.Session)) { + manager.emmiter.On("receiving_stopped", func(payload ...interface{}) { + listener(payload[0].(*SessionCtx)) + }) +} + // --- // config // --- diff --git a/internal/session/session.go b/internal/session/session.go index 8da9c08b..0e280aa2 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -23,6 +23,14 @@ func (session *SessionCtx) ID() string { return session.id } +// --- +// profile +// --- + +func (session *SessionCtx) VerifySecret(secret string) bool { + return session.profile.Secret == secret +} + func (session *SessionCtx) Name() string { return session.profile.Name } @@ -31,55 +39,44 @@ func (session *SessionCtx) IsAdmin() bool { return session.profile.IsAdmin } +func (session *SessionCtx) CanLogin() bool { + return session.profile.CanLogin +} + +func (session *SessionCtx) CanConnect() bool { + return session.profile.CanConnect +} + +func (session *SessionCtx) CanWatch() bool { + return session.profile.CanWatch +} + +func (session *SessionCtx) CanHost() bool { + return session.profile.CanHost +} + +func (session *SessionCtx) CanAccessClipboard() bool { + return session.profile.CanAccessClipboard +} + +func (session *SessionCtx) SetProfile(profile types.MemberProfile) { + session.profile = profile +} + +// --- +// runtime +// --- + func (session *SessionCtx) IsHost() bool { return session.manager.host != nil && session.manager.host.ID() == session.ID() } -func (session *SessionCtx) VerifySecret(secret string) bool { - return session.profile.Secret == secret -} - func (session *SessionCtx) IsConnected() bool { - // TODO: Refactor. - return session.websocket_connected// && session.webrtc_connected + return session.websocket_connected } -func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { - session.websocket_peer = websocket_peer -} - -func (session *SessionCtx) SetWebSocketConnected(connected bool) { - if connected { - session.websocket_connected = true - - // TODO: Refactor. - //session.manager.emmiter.Emit("websocket_connected", session) - session.manager.emmiter.Emit("connected", session) - } else { - session.websocket_connected = false - - // TODO: Refactor. - //session.manager.emmiter.Emit("websocket_disconnected", session) - session.manager.emmiter.Emit("disconnected", session) - - session.websocket_peer = nil - } -} - -func (session *SessionCtx) SetWebRTCPeer(webrtc_peer types.WebRTCPeer) { - session.webrtc_peer = webrtc_peer -} - -func (session *SessionCtx) SetWebRTCConnected(connected bool) { - if connected { - session.webrtc_connected = true - session.manager.emmiter.Emit("webrtc_connected", session) - } else { - session.webrtc_connected = false - session.manager.emmiter.Emit("webrtc_disconnected", session) - - session.webrtc_peer = nil - } +func (session *SessionCtx) IsReceiving() bool { + return session.webrtc_connected } func (session *SessionCtx) Disconnect(reason string) error { @@ -106,6 +103,25 @@ func (session *SessionCtx) Disconnect(reason string) error { return nil } +// --- +// webscoket +// --- + +func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { + session.websocket_peer = websocket_peer +} + +func (session *SessionCtx) SetWebSocketConnected(connected bool) { + if connected { + session.websocket_connected = true + session.manager.emmiter.Emit("connected", session) + } else { + session.websocket_connected = false + session.manager.emmiter.Emit("disconnected", session) + session.websocket_peer = nil + } +} + func (session *SessionCtx) Send(v interface{}) error { if session.websocket_peer == nil { return nil @@ -114,6 +130,25 @@ func (session *SessionCtx) Send(v interface{}) error { return session.websocket_peer.Send(v) } +// --- +// webrtc +// --- + +func (session *SessionCtx) SetWebRTCPeer(webrtc_peer types.WebRTCPeer) { + session.webrtc_peer = webrtc_peer +} + +func (session *SessionCtx) SetWebRTCConnected(connected bool) { + if connected { + session.webrtc_connected = true + session.manager.emmiter.Emit("receiving_started", session) + } else { + session.webrtc_connected = false + session.manager.emmiter.Emit("receiving_stopped", session) + session.webrtc_peer = nil + } +} + func (session *SessionCtx) SignalAnswer(sdp string) error { if session.webrtc_peer == nil { return nil diff --git a/internal/types/session.go b/internal/types/session.go index 52e1cc81..fc9342d2 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -3,29 +3,41 @@ package types import "net/http" type MemberProfile struct { - ID string - Secret string - Name string - IsAdmin bool - //Enabled bool - //CanControl bool - //CanWatch bool - //ClipboardAccess bool + Secret string + Name string + + IsAdmin bool + CanLogin bool + CanConnect bool + CanWatch bool + CanHost bool + CanAccessClipboard bool } type Session interface { ID() string + + VerifySecret(secret string) bool Name() string IsAdmin() bool + CanLogin() bool + CanConnect() bool + CanWatch() bool + CanHost() bool + CanAccessClipboard() bool + SetProfile(profile MemberProfile) + IsHost() bool IsConnected() bool - VerifySecret(secret string) bool + IsReceiving() bool + Disconnect(reason string) error + SetWebSocketPeer(websocket_peer WebSocketPeer) SetWebSocketConnected(connected bool) + Send(v interface{}) error + SetWebRTCPeer(webrtc_peer WebRTCPeer) SetWebRTCConnected(connected bool) - Disconnect(reason string) error - Send(v interface{}) error SignalAnswer(sdp string) error } @@ -47,8 +59,8 @@ type SessionManager interface { OnHostCleared(listener func(session Session)) OnConnected(listener func(session Session)) OnDisconnected(listener func(session Session)) + ImplicitHosting() bool - // auth Authenticate(r *http.Request) (Session, error) } From 81b3fbd6734882db8c2e9906bfd500e4790d92a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 17:36:06 +0100 Subject: [PATCH 179/876] moved capture StopStream to websockets events. --- internal/session/manager.go | 14 +------------- internal/types/session.go | 1 + internal/websocket/handler/session.go | 10 ++++++++++ neko.go | 1 - 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 6b35e01e..d215ce9c 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -13,12 +13,11 @@ import ( "demodesk/neko/internal/utils" ) -func New(capture types.CaptureManager, config *config.Session) *SessionManagerCtx { +func New(config *config.Session) *SessionManagerCtx { manager := &SessionManagerCtx{ logger: log.With().Str("module", "session").Logger(), host: nil, hostMu: sync.Mutex{}, - capture: capture, config: config, members: make(map[string]*SessionCtx), membersMu: sync.Mutex{}, @@ -46,7 +45,6 @@ type SessionManagerCtx struct { logger zerolog.Logger host types.Session hostMu sync.Mutex - capture types.CaptureManager config *config.Session members map[string]*SessionCtx membersMu sync.Mutex @@ -218,22 +216,12 @@ func (manager *SessionManagerCtx) OnHostCleared(listener func(session types.Sess func (manager *SessionManagerCtx) OnConnected(listener func(session types.Session)) { manager.emmiter.On("connected", func(payload ...interface{}) { - // Start streaming, when first joins - if !manager.capture.Streaming() { - manager.capture.StartStream() - } - listener(payload[0].(*SessionCtx)) }) } func (manager *SessionManagerCtx) OnDisconnected(listener func(session types.Session)) { manager.emmiter.On("disconnected", func(payload ...interface{}) { - // Stop streaming, if everyone left - if manager.capture.Streaming() && !manager.HasConnectedMembers() { - manager.capture.StopStream() - } - listener(payload[0].(*SessionCtx)) }) } diff --git a/internal/types/session.go b/internal/types/session.go index fc9342d2..c3e3ed06 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -51,6 +51,7 @@ type SessionManager interface { GetHost() Session ClearHost() + HasConnectedMembers() bool Members() []Session Broadcast(v interface{}, exclude interface{}) AdminBroadcast(v interface{}, exclude interface{}) diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 83ee1679..bcd5aec4 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -7,6 +7,11 @@ import ( ) func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { + // start streaming, when first member connects + if !h.capture.Streaming() { + h.capture.StartStream() + } + if err := h.systemInit(session); err != nil { return err } @@ -30,6 +35,11 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { } func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { + // Stop streaming, if last member disonnects + if h.capture.Streaming() && !h.sessions.HasConnectedMembers() { + h.capture.StopStream() + } + // clear host if exists if session.IsHost() { h.desktop.ResetKeys() diff --git a/neko.go b/neko.go index 0cf4db37..66237282 100644 --- a/neko.go +++ b/neko.go @@ -148,7 +148,6 @@ func (neko *Neko) Start() { neko.webRTCManager.Start() neko.sessionManager = session.New( - neko.captureManager, neko.Configs.Session, ) From cf47b7e2fa80f5f07f9575f4721648fcb754aea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 17:43:34 +0100 Subject: [PATCH 180/876] crud update new member profile. --- internal/api/members/crud.go | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index a306b6bf..66033c50 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -42,10 +42,16 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { } } + // TODO: Join structs? session := h.sessions.Create(data.ID, types.MemberProfile{ Secret: data.Secret, Name: data.Name, IsAdmin: data.IsAdmin, + CanLogin: data.CanLogin, + CanConnect: data.CanConnect, + CanWatch: data.CanWatch, + CanHost: data.CanHost, + CanAccessClipboard: data.CanAccessClipboard, }) utils.HttpSuccess(w, MemberCreatePayload{ @@ -56,10 +62,15 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { member := GetMember(r) + // TODO: Join structs? utils.HttpSuccess(w, MemberDataPayload{ - ID: member.ID(), Name: member.Name(), IsAdmin: member.IsAdmin(), + CanLogin: member.CanLogin(), + CanConnect: member.CanConnect(), + CanWatch: member.CanWatch(), + CanHost: member.CanHost(), + CanAccessClipboard: member.CanAccessClipboard(), }) } @@ -71,11 +82,20 @@ func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - utils.HttpSuccess(w, MemberDataPayload{ - ID: member.ID(), - Name: member.Name(), - IsAdmin: member.IsAdmin(), + // TODO: Join structs? + // TODO: Update independent props. + member.SetProfile(types.MemberProfile{ + Secret: data.Secret, + Name: data.Name, + IsAdmin: data.IsAdmin, + CanLogin: data.CanLogin, + CanConnect: data.CanConnect, + CanWatch: data.CanWatch, + CanHost: data.CanHost, + CanAccessClipboard: data.CanAccessClipboard, }) + + utils.HttpSuccess(w) } func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) { From 1f5c0a35473eefa28cf0ea8b0938a5112b6bd9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 18:59:32 +0100 Subject: [PATCH 181/876] updated session events. --- internal/session/manager.go | 20 ++++++++++++++++++++ internal/session/session.go | 1 + internal/types/session.go | 5 +++++ 3 files changed, 26 insertions(+) diff --git a/internal/session/manager.go b/internal/session/manager.go index d215ce9c..094f1699 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -63,6 +63,7 @@ func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) } manager.members[id] = session + manager.emmiter.Emit("created", session) return session } @@ -83,6 +84,7 @@ func (manager *SessionManagerCtx) Delete(id string) error { return fmt.Errorf("Member not found.") } + manager.emmiter.Emit("deleted", session) delete(manager.members, id) if session.IsConnected() { @@ -214,6 +216,18 @@ func (manager *SessionManagerCtx) OnHostCleared(listener func(session types.Sess }) } +func (manager *SessionManagerCtx) OnCreated(listener func(session types.Session)) { + manager.emmiter.On("created", func(payload ...interface{}) { + listener(payload[0].(*SessionCtx)) + }) +} + +func (manager *SessionManagerCtx) OnDeleted(listener func(session types.Session)) { + manager.emmiter.On("deleted", func(payload ...interface{}) { + listener(payload[0].(*SessionCtx)) + }) +} + func (manager *SessionManagerCtx) OnConnected(listener func(session types.Session)) { manager.emmiter.On("connected", func(payload ...interface{}) { listener(payload[0].(*SessionCtx)) @@ -238,6 +252,12 @@ func (manager *SessionManagerCtx) OnReceivingStopped(listener func(session types }) } +func (manager *SessionManagerCtx) OnProfileUpdated(listener func(session types.Session)) { + manager.emmiter.On("profile_updated", func(payload ...interface{}) { + listener(payload[0].(*SessionCtx)) + }) +} + // --- // config // --- diff --git a/internal/session/session.go b/internal/session/session.go index 0e280aa2..eb97f994 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -61,6 +61,7 @@ func (session *SessionCtx) CanAccessClipboard() bool { func (session *SessionCtx) SetProfile(profile types.MemberProfile) { session.profile = profile + session.manager.emmiter.Emit("profile_updated", session) } // --- diff --git a/internal/types/session.go b/internal/types/session.go index c3e3ed06..70106950 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -58,8 +58,13 @@ type SessionManager interface { OnHost(listener func(session Session)) OnHostCleared(listener func(session Session)) + OnCreated(listener func(session Session)) + OnDeleted(listener func(session Session)) OnConnected(listener func(session Session)) OnDisconnected(listener func(session Session)) + OnReceivingStarted(listener func(session Session)) + OnReceivingStopped(listener func(session Session)) + OnProfileUpdated(listener func(session Session)) ImplicitHosting() bool From f361d0c68121142f122173a64c36cfe1af7066f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 18:59:54 +0100 Subject: [PATCH 182/876] WS added session events. --- internal/types/event/events.go | 10 +++- internal/types/message/messages.go | 20 +++++-- internal/websocket/handler/session.go | 81 ++++++++++++++++++++++++--- internal/websocket/handler/system.go | 16 +++++- internal/websocket/manager.go | 40 +++++++++++++ 5 files changed, 149 insertions(+), 18 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 57e180d1..f9df9eca 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -13,9 +13,13 @@ const ( ) const ( - MEMBER_CONNECTED = "member/connected" - MEMBER_UPDATED = "member/updated" // TODO: New. - MEMBER_DISCONNECTED = "member/disconnected" + MEMBER_CREATED = "member/created" + MEMBER_DELETED = "member/deleted" + MEMBER_CONNECTED = "member/connected" + MEMBER_DISCONNECTED = "member/disconnected" + MEMBER_RECEIVING_STARTED = "member/receiving/started" + MEMBER_RECEIVING_STOPPED = "member/receiving/stopped" + MEMBER_PROFILE_UPDATED = "member/profile/updated" ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 7fddbb3c..47348377 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -54,11 +54,23 @@ type MemberID struct { ID string `json:"id"` } +type MemberProfile struct { + Event string `json:"event,omitempty"` + Name string `json:"name"` + IsAdmin bool `json:"is_admin"` + CanLogin bool `json:"can_login"` + CanConnect bool `json:"can_connect"` + CanWatch bool `json:"can_watch"` + CanHost bool `json:"can_host"` + CanAccessClipboard bool `json:"can_access_clipboard"` +} + type MemberData struct { - Event string `json:"event,omitempty"` - ID string `json:"id"` - Name string `json:"name"` - IsAdmin bool `json:"is_admin"` + Event string `json:"event,omitempty"` + ID string `json:"id"` + Profile MemberProfile `json:"profile"` + IsConnected bool `json:"is_connected"` + IsReceiving bool `json:"is_receiving"` } ///////////////////////////// diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index bcd5aec4..a4bb2792 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -6,6 +6,38 @@ import ( "demodesk/neko/internal/types/message" ) +func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { + // TODO: Join structs? + h.sessions.Broadcast( + message.MemberData{ + Event: event.MEMBER_CREATED, + ID: session.ID(), + Profile: message.MemberProfile{ + Name: session.Name(), + IsAdmin: session.IsAdmin(), + CanLogin: session.CanLogin(), + CanConnect: session.CanConnect(), + CanWatch: session.CanWatch(), + CanHost: session.CanHost(), + CanAccessClipboard: session.CanAccessClipboard(), + }, + IsConnected: session.IsConnected(), + IsReceiving: session.IsReceiving(), + }, nil) + + return nil +} + +func (h *MessageHandlerCtx) SessionDeleted(session types.Session) error { + h.sessions.Broadcast( + message.MemberID{ + Event: event.MEMBER_DELETED, + ID: session.ID(), + }, nil); + + return nil +} + func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { // start streaming, when first member connects if !h.capture.Streaming() { @@ -22,14 +54,11 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { } } - // let everyone know there is a new session h.sessions.Broadcast( - message.MemberData{ - Event: event.MEMBER_CONNECTED, - ID: session.ID(), - Name: session.Name(), - IsAdmin: session.IsAdmin(), - }, nil) + message.MemberID{ + Event: event.MEMBER_CONNECTED, + ID: session.ID(), + }, nil); return nil } @@ -52,7 +81,6 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { }, nil) } - // let everyone know session disconnected h.sessions.Broadcast( message.MemberID{ Event: event.MEMBER_DISCONNECTED, @@ -61,3 +89,40 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { return nil } + +func (h *MessageHandlerCtx) SessionReceivingStarted(session types.Session) error { + h.sessions.Broadcast( + message.MemberID{ + Event: event.MEMBER_RECEIVING_STARTED, + ID: session.ID(), + }, nil); + + return nil +} + +func (h *MessageHandlerCtx) SessionReceivingStopped(session types.Session) error { + h.sessions.Broadcast( + message.MemberID{ + Event: event.MEMBER_RECEIVING_STOPPED, + ID: session.ID(), + }, nil); + + return nil +} + +func (h *MessageHandlerCtx) SessionProfileUpdated(session types.Session) error { + // TODO: Join structs? + h.sessions.Broadcast( + message.MemberProfile{ + Event: event.MEMBER_PROFILE_UPDATED, + Name: session.Name(), + IsAdmin: session.IsAdmin(), + CanLogin: session.CanLogin(), + CanConnect: session.CanConnect(), + CanWatch: session.CanWatch(), + CanHost: session.CanHost(), + CanAccessClipboard: session.CanAccessClipboard(), + }, nil) + + return nil +} diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index fe373a5e..4df5ebde 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -25,10 +25,20 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { members := map[string]message.MemberData{} for _, session := range h.sessions.Members() { + // TODO: Join structs? members[session.ID()] = message.MemberData{ - ID: session.ID(), - Name: session.Name(), - IsAdmin: session.IsAdmin(), + ID: session.ID(), + Profile: message.MemberProfile{ + Name: session.Name(), + IsAdmin: session.IsAdmin(), + CanLogin: session.CanLogin(), + CanConnect: session.CanConnect(), + CanWatch: session.CanWatch(), + CanHost: session.CanHost(), + CanAccessClipboard: session.CanAccessClipboard(), + }, + IsConnected: session.IsConnected(), + IsReceiving: session.IsReceiving(), } } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 0e81a5a4..8ea29f85 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -49,6 +49,22 @@ type WebSocketManagerCtx struct { } func (ws *WebSocketManagerCtx) Start() { + ws.sessions.OnCreated(func(session types.Session) { + if err := ws.handler.SessionCreated(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with an error") + } else { + ws.logger.Debug().Str("id", session.ID()).Msg("session created") + } + }) + + ws.sessions.OnDeleted(func(session types.Session) { + if err := ws.handler.SessionDeleted(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session deleted with an error") + } else { + ws.logger.Debug().Str("id", session.ID()).Msg("session deleted") + } + }) + ws.sessions.OnConnected(func(session types.Session) { if err := ws.handler.SessionConnected(session); err != nil { ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with an error") @@ -65,6 +81,30 @@ func (ws *WebSocketManagerCtx) Start() { } }) + ws.sessions.OnReceivingStarted(func(session types.Session) { + if err := ws.handler.SessionReceivingStarted(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session receiving started with an error") + } else { + ws.logger.Debug().Str("id", session.ID()).Msg("session receiving started") + } + }) + + ws.sessions.OnReceivingStopped(func(session types.Session) { + if err := ws.handler.SessionReceivingStopped(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session receiving stopped with an error") + } else { + ws.logger.Debug().Str("id", session.ID()).Msg("session receiving stopped") + } + }) + + ws.sessions.OnProfileUpdated(func(session types.Session) { + if err := ws.handler.SessionProfileUpdated(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session profile updated with an error") + } else { + ws.logger.Debug().Str("id", session.ID()).Msg("session profile updated") + } + }) + go func() { ws.logger.Info().Msg("clipboard loop started") From 5f3b9f72cfe7b1a7155736f2a6c986d5a702896d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 2 Dec 2020 19:22:26 +0100 Subject: [PATCH 183/876] ID in MemberProfile. --- internal/types/message/messages.go | 1 + internal/websocket/handler/session.go | 1 + 2 files changed, 2 insertions(+) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 47348377..7a0633de 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -56,6 +56,7 @@ type MemberID struct { type MemberProfile struct { Event string `json:"event,omitempty"` + ID string `json:"id,omitempty"` Name string `json:"name"` IsAdmin bool `json:"is_admin"` CanLogin bool `json:"can_login"` diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index a4bb2792..b4e35e36 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -115,6 +115,7 @@ func (h *MessageHandlerCtx) SessionProfileUpdated(session types.Session) error { h.sessions.Broadcast( message.MemberProfile{ Event: event.MEMBER_PROFILE_UPDATED, + ID: session.ID(), Name: session.Name(), IsAdmin: session.IsAdmin(), CanLogin: session.CanLogin(), From d7b5bd68426392986179cf18f9c9c145ccf7de33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 3 Dec 2020 16:10:52 +0100 Subject: [PATCH 184/876] extract member state to custom struct. --- internal/session/manager.go | 14 +++----- internal/session/session.go | 12 +++---- internal/types/event/events.go | 13 ++++--- internal/types/message/messages.go | 10 ++++-- internal/types/session.go | 5 ++- internal/webrtc/manager.go | 4 ++- internal/websocket/handler/session.go | 49 ++++++++++++--------------- internal/websocket/handler/system.go | 10 +++--- internal/websocket/manager.go | 24 +++++-------- 9 files changed, 64 insertions(+), 77 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 094f1699..06f320ca 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -240,20 +240,14 @@ func (manager *SessionManagerCtx) OnDisconnected(listener func(session types.Ses }) } -func (manager *SessionManagerCtx) OnReceivingStarted(listener func(session types.Session)) { - manager.emmiter.On("receiving_started", func(payload ...interface{}) { +func (manager *SessionManagerCtx) OnProfileChanged(listener func(session types.Session)) { + manager.emmiter.On("profile_changed", func(payload ...interface{}) { listener(payload[0].(*SessionCtx)) }) } -func (manager *SessionManagerCtx) OnReceivingStopped(listener func(session types.Session)) { - manager.emmiter.On("receiving_stopped", func(payload ...interface{}) { - listener(payload[0].(*SessionCtx)) - }) -} - -func (manager *SessionManagerCtx) OnProfileUpdated(listener func(session types.Session)) { - manager.emmiter.On("profile_updated", func(payload ...interface{}) { +func (manager *SessionManagerCtx) OnStateChanged(listener func(session types.Session)) { + manager.emmiter.On("state_changed", func(payload ...interface{}) { listener(payload[0].(*SessionCtx)) }) } diff --git a/internal/session/session.go b/internal/session/session.go index eb97f994..615f5a3a 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -61,7 +61,7 @@ func (session *SessionCtx) CanAccessClipboard() bool { func (session *SessionCtx) SetProfile(profile types.MemberProfile) { session.profile = profile - session.manager.emmiter.Emit("profile_updated", session) + session.manager.emmiter.Emit("profile_changed", session) } // --- @@ -140,12 +140,10 @@ func (session *SessionCtx) SetWebRTCPeer(webrtc_peer types.WebRTCPeer) { } func (session *SessionCtx) SetWebRTCConnected(connected bool) { - if connected { - session.webrtc_connected = true - session.manager.emmiter.Emit("receiving_started", session) - } else { - session.webrtc_connected = false - session.manager.emmiter.Emit("receiving_stopped", session) + session.webrtc_connected = connected + session.manager.emmiter.Emit("state_changed", session) + + if !connected { session.webrtc_peer = nil } } diff --git a/internal/types/event/events.go b/internal/types/event/events.go index f9df9eca..58e27168 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -13,13 +13,12 @@ const ( ) const ( - MEMBER_CREATED = "member/created" - MEMBER_DELETED = "member/deleted" - MEMBER_CONNECTED = "member/connected" - MEMBER_DISCONNECTED = "member/disconnected" - MEMBER_RECEIVING_STARTED = "member/receiving/started" - MEMBER_RECEIVING_STOPPED = "member/receiving/stopped" - MEMBER_PROFILE_UPDATED = "member/profile/updated" + MEMBER_CREATED = "member/created" + MEMBER_DELETED = "member/deleted" + MEMBER_CONNECTED = "member/connected" + MEMBER_DISCONNECTED = "member/disconnected" + MEMBER_PROFILE = "member/profile" + MEMBER_STATE = "member/state" ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 7a0633de..353ad52d 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -66,12 +66,18 @@ type MemberProfile struct { CanAccessClipboard bool `json:"can_access_clipboard"` } +type MemberState struct { + Event string `json:"event,omitempty"` + ID string `json:"id,omitempty"` + IsConnected bool `json:"is_connected"` + IsReceiving bool `json:"is_receiving"` +} + type MemberData struct { Event string `json:"event,omitempty"` ID string `json:"id"` Profile MemberProfile `json:"profile"` - IsConnected bool `json:"is_connected"` - IsReceiving bool `json:"is_receiving"` + State MemberState `json:"state"` } ///////////////////////////// diff --git a/internal/types/session.go b/internal/types/session.go index 70106950..635e755d 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -62,9 +62,8 @@ type SessionManager interface { OnDeleted(listener func(session Session)) OnConnected(listener func(session Session)) OnDisconnected(listener func(session Session)) - OnReceivingStarted(listener func(session Session)) - OnReceivingStopped(listener func(session Session)) - OnProfileUpdated(listener func(session Session)) + OnProfileChanged(listener func(session Session)) + OnStateChanged(listener func(session Session)) ImplicitHosting() bool diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 1af845aa..6641904b 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -154,8 +154,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateDisconnected: + manager.logger.Info().Str("id", session.ID()).Msg("peer disconnected successfully") + session.SetWebRTCConnected(false) case webrtc.PeerConnectionStateFailed: - manager.logger.Info().Str("id", session.ID()).Msg("peer disconnected") + manager.logger.Warn().Str("id", session.ID()).Msg("peer disconnected with error") session.SetWebRTCConnected(false) case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", session.ID()).Msg("peer connected") diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index b4e35e36..39070b80 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -10,9 +10,9 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { // TODO: Join structs? h.sessions.Broadcast( message.MemberData{ - Event: event.MEMBER_CREATED, - ID: session.ID(), - Profile: message.MemberProfile{ + Event: event.MEMBER_CREATED, + ID: session.ID(), + Profile: message.MemberProfile{ Name: session.Name(), IsAdmin: session.IsAdmin(), CanLogin: session.CanLogin(), @@ -21,8 +21,10 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { CanHost: session.CanHost(), CanAccessClipboard: session.CanAccessClipboard(), }, - IsConnected: session.IsConnected(), - IsReceiving: session.IsReceiving(), + State: message.MemberState{ + IsConnected: session.IsConnected(), + IsReceiving: session.IsReceiving(), + }, }, nil) return nil @@ -90,31 +92,11 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { return nil } -func (h *MessageHandlerCtx) SessionReceivingStarted(session types.Session) error { - h.sessions.Broadcast( - message.MemberID{ - Event: event.MEMBER_RECEIVING_STARTED, - ID: session.ID(), - }, nil); - - return nil -} - -func (h *MessageHandlerCtx) SessionReceivingStopped(session types.Session) error { - h.sessions.Broadcast( - message.MemberID{ - Event: event.MEMBER_RECEIVING_STOPPED, - ID: session.ID(), - }, nil); - - return nil -} - -func (h *MessageHandlerCtx) SessionProfileUpdated(session types.Session) error { +func (h *MessageHandlerCtx) SessionProfileChanged(session types.Session) error { // TODO: Join structs? h.sessions.Broadcast( message.MemberProfile{ - Event: event.MEMBER_PROFILE_UPDATED, + Event: event.MEMBER_PROFILE, ID: session.ID(), Name: session.Name(), IsAdmin: session.IsAdmin(), @@ -127,3 +109,16 @@ func (h *MessageHandlerCtx) SessionProfileUpdated(session types.Session) error { return nil } + +func (h *MessageHandlerCtx) SessionStateChanged(session types.Session) error { + // TODO: Join structs? + h.sessions.Broadcast( + message.MemberState{ + Event: event.MEMBER_STATE, + ID: session.ID(), + IsConnected: session.IsConnected(), + IsReceiving: session.IsReceiving(), + }, nil) + + return nil +} diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 4df5ebde..5572b96a 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -27,8 +27,8 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { for _, session := range h.sessions.Members() { // TODO: Join structs? members[session.ID()] = message.MemberData{ - ID: session.ID(), - Profile: message.MemberProfile{ + ID: session.ID(), + Profile: message.MemberProfile{ Name: session.Name(), IsAdmin: session.IsAdmin(), CanLogin: session.CanLogin(), @@ -37,8 +37,10 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { CanHost: session.CanHost(), CanAccessClipboard: session.CanAccessClipboard(), }, - IsConnected: session.IsConnected(), - IsReceiving: session.IsReceiving(), + State: message.MemberState{ + IsConnected: session.IsConnected(), + IsReceiving: session.IsReceiving(), + }, } } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 8ea29f85..e7c522b7 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -81,27 +81,19 @@ func (ws *WebSocketManagerCtx) Start() { } }) - ws.sessions.OnReceivingStarted(func(session types.Session) { - if err := ws.handler.SessionReceivingStarted(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session receiving started with an error") + ws.sessions.OnProfileChanged(func(session types.Session) { + if err := ws.handler.SessionProfileChanged(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session profile changed with an error") } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session receiving started") + ws.logger.Debug().Str("id", session.ID()).Msg("session profile changed") } }) - ws.sessions.OnReceivingStopped(func(session types.Session) { - if err := ws.handler.SessionReceivingStopped(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session receiving stopped with an error") + ws.sessions.OnStateChanged(func(session types.Session) { + if err := ws.handler.SessionStateChanged(session); err != nil { + ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session state changed with an error") } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session receiving stopped") - } - }) - - ws.sessions.OnProfileUpdated(func(session types.Session) { - if err := ws.handler.SessionProfileUpdated(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session profile updated with an error") - } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session profile updated") + ws.logger.Debug().Str("id", session.ID()).Msg("session state changed") } }) From 7eee6debc772d5be69526ff6f2296979dcda6fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 3 Dec 2020 16:42:27 +0100 Subject: [PATCH 185/876] WS remove connected & disconnected event. --- internal/types/event/events.go | 2 -- internal/websocket/handler/session.go | 16 ++-------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 58e27168..94574dce 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -15,8 +15,6 @@ const ( const ( MEMBER_CREATED = "member/created" MEMBER_DELETED = "member/deleted" - MEMBER_CONNECTED = "member/connected" - MEMBER_DISCONNECTED = "member/disconnected" MEMBER_PROFILE = "member/profile" MEMBER_STATE = "member/state" ) diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 39070b80..9dd36775 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -56,13 +56,7 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { } } - h.sessions.Broadcast( - message.MemberID{ - Event: event.MEMBER_CONNECTED, - ID: session.ID(), - }, nil); - - return nil + return h.SessionStateChanged(session) } func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { @@ -83,13 +77,7 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { }, nil) } - h.sessions.Broadcast( - message.MemberID{ - Event: event.MEMBER_DISCONNECTED, - ID: session.ID(), - }, nil); - - return nil + return h.SessionStateChanged(session) } func (h *MessageHandlerCtx) SessionProfileChanged(session types.Session) error { From 4670b5187c9688da140e5353845c4898dac28caa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 3 Dec 2020 16:45:41 +0100 Subject: [PATCH 186/876] Disconnect WebRTC on socket disconnect. --- internal/session/session.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 615f5a3a..78b01da5 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -113,13 +113,19 @@ func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) } func (session *SessionCtx) SetWebSocketConnected(connected bool) { + session.websocket_connected = connected + if connected { - session.websocket_connected = true session.manager.emmiter.Emit("connected", session) - } else { - session.websocket_connected = false - session.manager.emmiter.Emit("disconnected", session) - session.websocket_peer = nil + return + } + + session.manager.emmiter.Emit("disconnected", session) + session.websocket_peer = nil + + // TODO: Refactor. Only if is WebRTC active. + if err := session.webrtc_peer.Destroy(); err != nil { + session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") } } From c61f5f2835a1cb1f88b3c93fd48dc18e4569003f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 3 Dec 2020 17:03:15 +0100 Subject: [PATCH 187/876] WebRTC + peer closed. --- internal/webrtc/manager.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 6641904b..e0346383 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -153,15 +153,18 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { - case webrtc.PeerConnectionStateDisconnected: - manager.logger.Info().Str("id", session.ID()).Msg("peer disconnected successfully") - session.SetWebRTCConnected(false) - case webrtc.PeerConnectionStateFailed: - manager.logger.Warn().Str("id", session.ID()).Msg("peer disconnected with error") - session.SetWebRTCConnected(false) case webrtc.PeerConnectionStateConnected: manager.logger.Info().Str("id", session.ID()).Msg("peer connected") session.SetWebRTCConnected(true) + case webrtc.PeerConnectionStateDisconnected: + manager.logger.Info().Str("id", session.ID()).Msg("peer disconnected") + session.SetWebRTCConnected(false) + case webrtc.PeerConnectionStateFailed: + manager.logger.Warn().Str("id", session.ID()).Msg("peer failed") + session.SetWebRTCConnected(false) + case webrtc.PeerConnectionStateClosed: + manager.logger.Warn().Str("id", session.ID()).Msg("peer closed") + session.SetWebRTCConnected(false) } }) From feb07b97ab14cae15896ecb6c0d6939a9ec97b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 3 Dec 2020 20:05:44 +0100 Subject: [PATCH 188/876] resolve deadlock problem with mutexes. --- internal/session/manager.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 06f320ca..21a1bcad 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -52,9 +52,6 @@ type SessionManagerCtx struct { } func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) types.Session { - manager.membersMu.Lock() - defer manager.membersMu.Unlock() - session := &SessionCtx{ id: id, manager: manager, @@ -62,36 +59,40 @@ func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) profile: profile, } + manager.membersMu.Lock() manager.members[id] = session + manager.membersMu.Unlock() + manager.emmiter.Emit("created", session) return session } func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { manager.membersMu.Lock() - defer manager.membersMu.Unlock() - session, ok := manager.members[id] + manager.membersMu.Unlock() + return session, ok } func (manager *SessionManagerCtx) Delete(id string) error { manager.membersMu.Lock() - defer manager.membersMu.Unlock() - session, ok := manager.members[id] if !ok { + manager.membersMu.Unlock() return fmt.Errorf("Member not found.") } - manager.emmiter.Emit("deleted", session) delete(manager.members, id) + manager.membersMu.Unlock() + var err error if session.IsConnected() { - return session.Disconnect("member deleted") + err = session.Disconnect("member deleted") } - return nil + manager.emmiter.Emit("deleted", session) + return err } // --- From 22407825fe3e4d345c934c44cc15e4cb644d7d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 5 Dec 2020 21:05:09 +0100 Subject: [PATCH 189/876] destroy only if is WebRTC active. --- internal/session/session.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 78b01da5..9d6107f6 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -123,9 +123,10 @@ func (session *SessionCtx) SetWebSocketConnected(connected bool) { session.manager.emmiter.Emit("disconnected", session) session.websocket_peer = nil - // TODO: Refactor. Only if is WebRTC active. - if err := session.webrtc_peer.Destroy(); err != nil { - session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") + if session.webrtc_peer != nil { + if err := session.webrtc_peer.Destroy(); err != nil { + session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") + } } } From a6fbafc0792ee6187020edfc1e4ef0e191185a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 5 Dec 2020 22:18:45 +0100 Subject: [PATCH 190/876] SetProfile changed as Update. --- internal/api/members/crud.go | 7 +++++-- internal/session/manager.go | 15 +++++++++++++++ internal/session/session.go | 5 ----- internal/types/session.go | 2 +- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index 66033c50..4be4cb89 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -84,7 +84,7 @@ func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { // TODO: Join structs? // TODO: Update independent props. - member.SetProfile(types.MemberProfile{ + if err := h.sessions.Update(member.ID(), types.MemberProfile{ Secret: data.Secret, Name: data.Name, IsAdmin: data.IsAdmin, @@ -93,7 +93,10 @@ func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { CanWatch: data.CanWatch, CanHost: data.CanHost, CanAccessClipboard: data.CanAccessClipboard, - }) + }); err != nil { + utils.HttpInternalServerError(w, err) + return + } utils.HttpSuccess(w) } diff --git a/internal/session/manager.go b/internal/session/manager.go index 21a1bcad..eafbb472 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -67,6 +67,21 @@ func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) return session } +func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) error { + manager.membersMu.Lock() + session, ok := manager.members[id] + if !ok { + manager.membersMu.Unlock() + return fmt.Errorf("Member not found.") + } + + session.profile = profile + manager.membersMu.Unlock() + + manager.emmiter.Emit("profile_changed", session) + return nil +} + func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { manager.membersMu.Lock() session, ok := manager.members[id] diff --git a/internal/session/session.go b/internal/session/session.go index 9d6107f6..1542fb3b 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -59,11 +59,6 @@ func (session *SessionCtx) CanAccessClipboard() bool { return session.profile.CanAccessClipboard } -func (session *SessionCtx) SetProfile(profile types.MemberProfile) { - session.profile = profile - session.manager.emmiter.Emit("profile_changed", session) -} - // --- // runtime // --- diff --git a/internal/types/session.go b/internal/types/session.go index 635e755d..28085d82 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -25,7 +25,6 @@ type Session interface { CanWatch() bool CanHost() bool CanAccessClipboard() bool - SetProfile(profile MemberProfile) IsHost() bool IsConnected() bool @@ -43,6 +42,7 @@ type Session interface { type SessionManager interface { Create(id string, profile MemberProfile) Session + Update(id string, profile MemberProfile) error Get(id string) (Session, bool) Delete(id string) error From 9f452aeb01eab4e48bee57e2907a3369b16596a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 5 Dec 2020 23:05:46 +0100 Subject: [PATCH 191/876] add database to Sessions. --- internal/api/members/crud.go | 7 ++- internal/session/database/manager.go | 67 ++++++++++++++++++++++++++++ internal/session/manager.go | 64 +++++++++++++++++++------- internal/types/session.go | 2 +- 4 files changed, 121 insertions(+), 19 deletions(-) create mode 100644 internal/session/database/manager.go diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index 4be4cb89..a338ef1d 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -43,7 +43,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { } // TODO: Join structs? - session := h.sessions.Create(data.ID, types.MemberProfile{ + session, err := h.sessions.Create(data.ID, types.MemberProfile{ Secret: data.Secret, Name: data.Name, IsAdmin: data.IsAdmin, @@ -54,6 +54,11 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { CanAccessClipboard: data.CanAccessClipboard, }) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + utils.HttpSuccess(w, MemberCreatePayload{ ID: session.ID(), }) diff --git a/internal/session/database/manager.go b/internal/session/database/manager.go new file mode 100644 index 00000000..f26701b1 --- /dev/null +++ b/internal/session/database/manager.go @@ -0,0 +1,67 @@ +package database + +import ( + "fmt" + "sync" + + "demodesk/neko/internal/types" +) + +func New() *MembersDatabaseCtx { + return &MembersDatabaseCtx{ + profiles: make(map[string]types.MemberProfile), + mu: sync.Mutex{}, + } +} + +type MembersDatabaseCtx struct { + profiles map[string]types.MemberProfile + mu sync.Mutex +} + +func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + _, ok := manager.profiles[id] + if ok { + return fmt.Errorf("Member ID already exists.") + } + + manager.profiles[id] = profile + return nil +} + +func (manager *MembersDatabaseCtx) Update(id string, profile types.MemberProfile) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + _, ok := manager.profiles[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + manager.profiles[id] = profile + return nil +} + +func (manager *MembersDatabaseCtx) Delete(id string) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + _, ok := manager.profiles[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + delete(manager.profiles, id) + return nil +} + +func (manager *MembersDatabaseCtx) Select(id string) (types.MemberProfile, bool) { + manager.mu.Lock() + defer manager.mu.Unlock() + + profile, ok := manager.profiles[id] + return profile, ok +} diff --git a/internal/session/manager.go b/internal/session/manager.go index eafbb472..ea6efbda 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -8,6 +8,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "demodesk/neko/internal/session/database" "demodesk/neko/internal/types" "demodesk/neko/internal/config" "demodesk/neko/internal/utils" @@ -19,20 +20,23 @@ func New(config *config.Session) *SessionManagerCtx { host: nil, hostMu: sync.Mutex{}, config: config, + database: database.New(), members: make(map[string]*SessionCtx), membersMu: sync.Mutex{}, emmiter: events.New(), } + // TODO: Import from Database at startup. + // create default admin account at startup - _ = manager.Create("admin", types.MemberProfile{ + _, _ = manager.Create("admin", types.MemberProfile{ Secret: config.AdminPassword, Name: "Administrator", IsAdmin: true, }) // create default user account at startup - _ = manager.Create("user", types.MemberProfile{ + _, _ = manager.Create("user", types.MemberProfile{ Secret: config.Password, Name: "User", IsAdmin: false, @@ -46,35 +50,56 @@ type SessionManagerCtx struct { host types.Session hostMu sync.Mutex config *config.Session + database *database.MembersDatabaseCtx members map[string]*SessionCtx membersMu sync.Mutex emmiter events.EventEmmiter } -func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) types.Session { +func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, error) { session := &SessionCtx{ - id: id, - manager: manager, - logger: manager.logger.With().Str("id", id).Logger(), - profile: profile, + id: id, + manager: manager, + logger: manager.logger.With().Str("id", id).Logger(), + profile: profile, } manager.membersMu.Lock() + + _, ok := manager.members[id] + if ok { + manager.membersMu.Unlock() + return nil, fmt.Errorf("Member ID already exists.") + } + + err := manager.database.Insert(id, profile) + if err != nil { + manager.membersMu.Unlock() + return nil, err + } + manager.members[id] = session manager.membersMu.Unlock() manager.emmiter.Emit("created", session) - return session + return session, nil } func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) error { manager.membersMu.Lock() + session, ok := manager.members[id] if !ok { manager.membersMu.Unlock() return fmt.Errorf("Member not found.") } + err := manager.database.Update(id, profile) + if err != nil { + manager.membersMu.Unlock() + return err + } + session.profile = profile manager.membersMu.Unlock() @@ -82,14 +107,6 @@ func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) return nil } -func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { - manager.membersMu.Lock() - session, ok := manager.members[id] - manager.membersMu.Unlock() - - return session, ok -} - func (manager *SessionManagerCtx) Delete(id string) error { manager.membersMu.Lock() session, ok := manager.members[id] @@ -98,10 +115,15 @@ func (manager *SessionManagerCtx) Delete(id string) error { return fmt.Errorf("Member not found.") } + err := manager.database.Delete(id) + if err != nil { + manager.membersMu.Unlock() + return err + } + delete(manager.members, id) manager.membersMu.Unlock() - var err error if session.IsConnected() { err = session.Disconnect("member deleted") } @@ -110,6 +132,14 @@ func (manager *SessionManagerCtx) Delete(id string) error { return err } +func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { + manager.membersMu.Lock() + defer manager.membersMu.Unlock() + + session, ok := manager.members[id] + return session, ok +} + // --- // host // --- diff --git a/internal/types/session.go b/internal/types/session.go index 28085d82..79e01a73 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -41,7 +41,7 @@ type Session interface { } type SessionManager interface { - Create(id string, profile MemberProfile) Session + Create(id string, profile MemberProfile) (Session, error) Update(id string, profile MemberProfile) error Get(id string) (Session, bool) Delete(id string) error From b24c217509a9e2eec596811549d38e1b823534de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 5 Dec 2020 23:31:41 +0100 Subject: [PATCH 192/876] members database import. --- internal/session/database/manager.go | 5 ++--- internal/session/manager.go | 23 ++++++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/internal/session/database/manager.go b/internal/session/database/manager.go index f26701b1..e066ace6 100644 --- a/internal/session/database/manager.go +++ b/internal/session/database/manager.go @@ -58,10 +58,9 @@ func (manager *MembersDatabaseCtx) Delete(id string) error { return nil } -func (manager *MembersDatabaseCtx) Select(id string) (types.MemberProfile, bool) { +func (manager *MembersDatabaseCtx) Select() map[string]types.MemberProfile { manager.mu.Lock() defer manager.mu.Unlock() - profile, ok := manager.profiles[id] - return profile, ok + return manager.profiles } diff --git a/internal/session/manager.go b/internal/session/manager.go index ea6efbda..a0c99053 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -26,17 +26,20 @@ func New(config *config.Session) *SessionManagerCtx { emmiter: events.New(), } - // TODO: Import from Database at startup. + // import database users + for id, profile := range manager.database.Select() { + _ = manager.add(id, profile) + } // create default admin account at startup - _, _ = manager.Create("admin", types.MemberProfile{ + _ = manager.add("admin", types.MemberProfile{ Secret: config.AdminPassword, Name: "Administrator", IsAdmin: true, }) // create default user account at startup - _, _ = manager.Create("user", types.MemberProfile{ + _ = manager.add("user", types.MemberProfile{ Secret: config.Password, Name: "User", IsAdmin: false, @@ -56,7 +59,8 @@ type SessionManagerCtx struct { emmiter events.EventEmmiter } -func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, error) { +// TODO: Extract members map + primitives. +func (manager *SessionManagerCtx) add(id string, profile types.MemberProfile) types.Session { session := &SessionCtx{ id: id, manager: manager, @@ -64,6 +68,15 @@ func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) profile: profile, } + manager.members[id] = session + return session +} + +// --- +// members +// --- + +func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, error) { manager.membersMu.Lock() _, ok := manager.members[id] @@ -78,7 +91,7 @@ func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) return nil, err } - manager.members[id] = session + session := manager.add(id, profile) manager.membersMu.Unlock() manager.emmiter.Emit("created", session) From edb9fef0977f576bdadd8e1e315f27bf95a652ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 5 Dec 2020 23:42:40 +0100 Subject: [PATCH 193/876] remove unused HasHost. --- internal/session/manager.go | 7 ------- internal/types/session.go | 1 - 2 files changed, 8 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index a0c99053..a064e297 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -157,13 +157,6 @@ func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { // host // --- -func (manager *SessionManagerCtx) HasHost() bool { - manager.hostMu.Lock() - defer manager.hostMu.Unlock() - - return manager.host != nil -} - func (manager *SessionManagerCtx) SetHost(host types.Session) { manager.hostMu.Lock() defer manager.hostMu.Unlock() diff --git a/internal/types/session.go b/internal/types/session.go index 79e01a73..d5b2688d 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -46,7 +46,6 @@ type SessionManager interface { Get(id string) (Session, bool) Delete(id string) error - HasHost() bool SetHost(host Session) GetHost() Session ClearHost() From 100544198b0e50bcca48b68f87be8d0ad01ffe2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 00:21:09 +0100 Subject: [PATCH 194/876] add members database adapters interface. --- internal/session/database/dummy/adapter.go | 27 ++++++++ internal/session/database/manager.go | 68 ++++----------------- internal/session/database/object/adapter.go | 66 ++++++++++++++++++++ internal/session/manager.go | 6 +- internal/types/session.go | 7 +++ 5 files changed, 116 insertions(+), 58 deletions(-) create mode 100644 internal/session/database/dummy/adapter.go create mode 100644 internal/session/database/object/adapter.go diff --git a/internal/session/database/dummy/adapter.go b/internal/session/database/dummy/adapter.go new file mode 100644 index 00000000..5ad86231 --- /dev/null +++ b/internal/session/database/dummy/adapter.go @@ -0,0 +1,27 @@ +package dummy + +import ( + "demodesk/neko/internal/types" +) + +func New() types.MembersDatabase { + return &MembersDatabaseCtx{} +} + +type MembersDatabaseCtx struct {} + +func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { + return nil +} + +func (manager *MembersDatabaseCtx) Update(id string, profile types.MemberProfile) error { + return nil +} + +func (manager *MembersDatabaseCtx) Delete(id string) error { + return nil +} + +func (manager *MembersDatabaseCtx) Select() map[string]types.MemberProfile { + return map[string]types.MemberProfile{} +} diff --git a/internal/session/database/manager.go b/internal/session/database/manager.go index e066ace6..29797a87 100644 --- a/internal/session/database/manager.go +++ b/internal/session/database/manager.go @@ -1,66 +1,22 @@ package database import ( - "fmt" - "sync" - + "demodesk/neko/internal/session/database/dummy" + "demodesk/neko/internal/session/database/object" "demodesk/neko/internal/types" + "demodesk/neko/internal/config" ) -func New() *MembersDatabaseCtx { - return &MembersDatabaseCtx{ - profiles: make(map[string]types.MemberProfile), - mu: sync.Mutex{}, - } -} +func New(config *config.Session) types.MembersDatabase { + // TODO: Load from config. + adapter := "object" -type MembersDatabaseCtx struct { - profiles map[string]types.MemberProfile - mu sync.Mutex -} - -func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { - manager.mu.Lock() - defer manager.mu.Unlock() - - _, ok := manager.profiles[id] - if ok { - return fmt.Errorf("Member ID already exists.") + switch adapter { + case "object": + return object.New() + case "dummy": + return dummy.New() } - manager.profiles[id] = profile - return nil -} - -func (manager *MembersDatabaseCtx) Update(id string, profile types.MemberProfile) error { - manager.mu.Lock() - defer manager.mu.Unlock() - - _, ok := manager.profiles[id] - if !ok { - return fmt.Errorf("Member ID does not exist.") - } - - manager.profiles[id] = profile - return nil -} - -func (manager *MembersDatabaseCtx) Delete(id string) error { - manager.mu.Lock() - defer manager.mu.Unlock() - - _, ok := manager.profiles[id] - if !ok { - return fmt.Errorf("Member ID does not exist.") - } - - delete(manager.profiles, id) - return nil -} - -func (manager *MembersDatabaseCtx) Select() map[string]types.MemberProfile { - manager.mu.Lock() - defer manager.mu.Unlock() - - return manager.profiles + return dummy.New() } diff --git a/internal/session/database/object/adapter.go b/internal/session/database/object/adapter.go new file mode 100644 index 00000000..c69cc143 --- /dev/null +++ b/internal/session/database/object/adapter.go @@ -0,0 +1,66 @@ +package object + +import ( + "fmt" + "sync" + + "demodesk/neko/internal/types" +) + +func New() types.MembersDatabase { + return &MembersDatabaseCtx{ + profiles: make(map[string]types.MemberProfile), + mu: sync.Mutex{}, + } +} + +type MembersDatabaseCtx struct { + profiles map[string]types.MemberProfile + mu sync.Mutex +} + +func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + _, ok := manager.profiles[id] + if ok { + return fmt.Errorf("Member ID already exists.") + } + + manager.profiles[id] = profile + return nil +} + +func (manager *MembersDatabaseCtx) Update(id string, profile types.MemberProfile) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + _, ok := manager.profiles[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + manager.profiles[id] = profile + return nil +} + +func (manager *MembersDatabaseCtx) Delete(id string) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + _, ok := manager.profiles[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + delete(manager.profiles, id) + return nil +} + +func (manager *MembersDatabaseCtx) Select() map[string]types.MemberProfile { + manager.mu.Lock() + defer manager.mu.Unlock() + + return manager.profiles +} diff --git a/internal/session/manager.go b/internal/session/manager.go index a064e297..7eed56d1 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -20,7 +20,7 @@ func New(config *config.Session) *SessionManagerCtx { host: nil, hostMu: sync.Mutex{}, config: config, - database: database.New(), + database: database.New(config), members: make(map[string]*SessionCtx), membersMu: sync.Mutex{}, emmiter: events.New(), @@ -31,6 +31,8 @@ func New(config *config.Session) *SessionManagerCtx { _ = manager.add(id, profile) } + // TODO: Move to Database, or make `admin` as reserved user. + // create default admin account at startup _ = manager.add("admin", types.MemberProfile{ Secret: config.AdminPassword, @@ -53,7 +55,7 @@ type SessionManagerCtx struct { host types.Session hostMu sync.Mutex config *config.Session - database *database.MembersDatabaseCtx + database types.MembersDatabase members map[string]*SessionCtx membersMu sync.Mutex emmiter events.EventEmmiter diff --git a/internal/types/session.go b/internal/types/session.go index d5b2688d..76275a85 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -14,6 +14,13 @@ type MemberProfile struct { CanAccessClipboard bool } +type MembersDatabase interface { + Insert(id string, profile MemberProfile) error + Update(id string, profile MemberProfile) error + Delete(id string) error + Select() map[string]MemberProfile +} + type Session interface { ID() string From 6ca1e27f01fabb432929f25af565f3caa2e01059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 17:28:15 +0100 Subject: [PATCH 195/876] add file adapter. --- internal/config/session.go | 14 +++ internal/session/database/file/adapter.go | 127 ++++++++++++++++++++++ internal/session/database/manager.go | 8 +- 3 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 internal/session/database/file/adapter.go diff --git a/internal/config/session.go b/internal/config/session.go index 33ebc50e..e7472478 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -9,6 +9,8 @@ type Session struct { Password string AdminPassword string ImplicitHosting bool + DatabaseAdapter string + FilePath string } func (Session) Init(cmd *cobra.Command) error { @@ -27,6 +29,16 @@ func (Session) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().String("database_adapter", "file", "choose database adapter for members") + if err := viper.BindPFlag("database_adapter", cmd.PersistentFlags().Lookup("database_adapter")); err != nil { + return err + } + + cmd.PersistentFlags().String("file_path", "/home/neko/members.json", "file adapter: specify file path") + if err := viper.BindPFlag("file_path", cmd.PersistentFlags().Lookup("file_path")); err != nil { + return err + } + return nil } @@ -34,4 +46,6 @@ func (s *Session) Set() { s.Password = viper.GetString("password") s.AdminPassword = viper.GetString("password_admin") s.ImplicitHosting = viper.GetBool("implicit_hosting") + s.DatabaseAdapter = viper.GetString("database_adapter") + s.FilePath = viper.GetString("file_path") } diff --git a/internal/session/database/file/adapter.go b/internal/session/database/file/adapter.go new file mode 100644 index 00000000..7577aa00 --- /dev/null +++ b/internal/session/database/file/adapter.go @@ -0,0 +1,127 @@ +package file + +import ( + "encoding/json" + "io/ioutil" + "os" + "fmt" + "sync" + + "github.com/rs/zerolog/log" + + "demodesk/neko/internal/types" +) + +func New(file string) types.MembersDatabase { + return &MembersDatabaseCtx{ + file: file, + mu: sync.Mutex{}, + } +} + +type MembersDatabaseCtx struct { + file string + mu sync.Mutex +} + +func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + profiles, err := manager.deserialize() + if err != nil { + return err + } + + _, ok := profiles[id] + if ok { + return fmt.Errorf("Member ID already exists.") + } + + profiles[id] = profile + + return manager.serialize(profiles) +} + +func (manager *MembersDatabaseCtx) Update(id string, profile types.MemberProfile) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + profiles, err := manager.deserialize() + if err != nil { + return err + } + + _, ok := profiles[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + profiles[id] = profile + + return manager.serialize(profiles) +} + +func (manager *MembersDatabaseCtx) Delete(id string) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + profiles, err := manager.deserialize() + if err != nil { + return err + } + + _, ok := profiles[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + delete(profiles, id) + + return manager.serialize(profiles) +} + +func (manager *MembersDatabaseCtx) Select() map[string]types.MemberProfile { + manager.mu.Lock() + defer manager.mu.Unlock() + + profiles, err := manager.deserialize() + if err != nil { + // TODO: Refactor. + log.Panic().Err(err).Msg("could not read members file") + } + + return profiles +} + +func (manager *MembersDatabaseCtx) deserialize() (map[string]types.MemberProfile, error) { + file, err := os.OpenFile(manager.file, os.O_RDONLY|os.O_CREATE, os.ModePerm) + if err != nil { + return nil, err + } + + raw, err := ioutil.ReadAll(file) + if err != nil { + return nil, err + } + + if len(raw) == 0 { + return map[string]types.MemberProfile{}, nil + } + + var profiles map[string]types.MemberProfile + if err := json.Unmarshal([]byte(raw), &profiles); err != nil { + return nil, err + } + + return profiles, nil +} + +func (manager *MembersDatabaseCtx) serialize(data map[string]types.MemberProfile) error { + raw, err := json.Marshal(data) + if err != nil { + return err + } + + return ioutil.WriteFile(manager.file, raw, os.ModePerm) +} diff --git a/internal/session/database/manager.go b/internal/session/database/manager.go index 29797a87..5a470afe 100644 --- a/internal/session/database/manager.go +++ b/internal/session/database/manager.go @@ -2,16 +2,16 @@ package database import ( "demodesk/neko/internal/session/database/dummy" + "demodesk/neko/internal/session/database/file" "demodesk/neko/internal/session/database/object" "demodesk/neko/internal/types" "demodesk/neko/internal/config" ) func New(config *config.Session) types.MembersDatabase { - // TODO: Load from config. - adapter := "object" - - switch adapter { + switch config.DatabaseAdapter { + case "file": + return file.New(config.FilePath) case "object": return object.New() case "dummy": From 35cd0f527071b656f91dff7299d4ac7799696702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 18:11:11 +0100 Subject: [PATCH 196/876] add connect / disconnect to adapters. --- internal/session/database/dummy/adapter.go | 12 +++- internal/session/database/file/adapter.go | 19 ++++--- internal/session/database/object/adapter.go | 12 +++- internal/session/manager.go | 61 +++++++++++++-------- internal/types/session.go | 8 ++- neko.go | 17 ++++-- 6 files changed, 87 insertions(+), 42 deletions(-) diff --git a/internal/session/database/dummy/adapter.go b/internal/session/database/dummy/adapter.go index 5ad86231..7197f06e 100644 --- a/internal/session/database/dummy/adapter.go +++ b/internal/session/database/dummy/adapter.go @@ -10,6 +10,14 @@ func New() types.MembersDatabase { type MembersDatabaseCtx struct {} +func (manager *MembersDatabaseCtx) Connect() error { + return nil +} + +func (manager *MembersDatabaseCtx) Disconnect() error { + return nil +} + func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { return nil } @@ -22,6 +30,6 @@ func (manager *MembersDatabaseCtx) Delete(id string) error { return nil } -func (manager *MembersDatabaseCtx) Select() map[string]types.MemberProfile { - return map[string]types.MemberProfile{} +func (manager *MembersDatabaseCtx) Select() (map[string]types.MemberProfile, error) { + return map[string]types.MemberProfile{}, nil } diff --git a/internal/session/database/file/adapter.go b/internal/session/database/file/adapter.go index 7577aa00..69954103 100644 --- a/internal/session/database/file/adapter.go +++ b/internal/session/database/file/adapter.go @@ -7,8 +7,6 @@ import ( "fmt" "sync" - "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" ) @@ -24,6 +22,14 @@ type MembersDatabaseCtx struct { mu sync.Mutex } +func (manager *MembersDatabaseCtx) Connect() error { + return nil +} + +func (manager *MembersDatabaseCtx) Disconnect() error { + return nil +} + func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -81,17 +87,12 @@ func (manager *MembersDatabaseCtx) Delete(id string) error { return manager.serialize(profiles) } -func (manager *MembersDatabaseCtx) Select() map[string]types.MemberProfile { +func (manager *MembersDatabaseCtx) Select() (map[string]types.MemberProfile, error) { manager.mu.Lock() defer manager.mu.Unlock() profiles, err := manager.deserialize() - if err != nil { - // TODO: Refactor. - log.Panic().Err(err).Msg("could not read members file") - } - - return profiles + return profiles, err } func (manager *MembersDatabaseCtx) deserialize() (map[string]types.MemberProfile, error) { diff --git a/internal/session/database/object/adapter.go b/internal/session/database/object/adapter.go index c69cc143..18c05c32 100644 --- a/internal/session/database/object/adapter.go +++ b/internal/session/database/object/adapter.go @@ -19,6 +19,14 @@ type MembersDatabaseCtx struct { mu sync.Mutex } +func (manager *MembersDatabaseCtx) Connect() error { + return nil +} + +func (manager *MembersDatabaseCtx) Disconnect() error { + return nil +} + func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -58,9 +66,9 @@ func (manager *MembersDatabaseCtx) Delete(id string) error { return nil } -func (manager *MembersDatabaseCtx) Select() map[string]types.MemberProfile { +func (manager *MembersDatabaseCtx) Select() (map[string]types.MemberProfile, error) { manager.mu.Lock() defer manager.mu.Unlock() - return manager.profiles + return manager.profiles, nil } diff --git a/internal/session/manager.go b/internal/session/manager.go index 7eed56d1..382f5cc2 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -15,7 +15,7 @@ import ( ) func New(config *config.Session) *SessionManagerCtx { - manager := &SessionManagerCtx{ + return &SessionManagerCtx{ logger: log.With().Str("module", "session").Logger(), host: nil, hostMu: sync.Mutex{}, @@ -25,29 +25,6 @@ func New(config *config.Session) *SessionManagerCtx { membersMu: sync.Mutex{}, emmiter: events.New(), } - - // import database users - for id, profile := range manager.database.Select() { - _ = manager.add(id, profile) - } - - // TODO: Move to Database, or make `admin` as reserved user. - - // create default admin account at startup - _ = manager.add("admin", types.MemberProfile{ - Secret: config.AdminPassword, - Name: "Administrator", - IsAdmin: true, - }) - - // create default user account at startup - _ = manager.add("user", types.MemberProfile{ - Secret: config.Password, - Name: "User", - IsAdmin: false, - }) - - return manager } type SessionManagerCtx struct { @@ -77,6 +54,42 @@ func (manager *SessionManagerCtx) add(id string, profile types.MemberProfile) ty // --- // members // --- +func (manager *SessionManagerCtx) Connect() error { + if err := manager.database.Connect(); err != nil { + return err + } + + profiles, err := manager.database.Select() + if err != nil { + return err + } + + for id, profile := range profiles { + _ = manager.add(id, profile) + } + + // TODO: Move to Database, or make `admin` as reserved user. + + // create default admin account at startup + _ = manager.add("admin", types.MemberProfile{ + Secret: manager.config.AdminPassword, + Name: "Administrator", + IsAdmin: true, + }) + + // create default user account at startup + _ = manager.add("user", types.MemberProfile{ + Secret: manager.config.Password, + Name: "User", + IsAdmin: false, + }) + + return nil +} + +func (manager *SessionManagerCtx) Disconnect() error { + return manager.database.Disconnect() +} func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, error) { manager.membersMu.Lock() diff --git a/internal/types/session.go b/internal/types/session.go index 76275a85..347a36c1 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -15,10 +15,13 @@ type MemberProfile struct { } type MembersDatabase interface { + Connect() error + Disconnect() error + Insert(id string, profile MemberProfile) error Update(id string, profile MemberProfile) error Delete(id string) error - Select() map[string]MemberProfile + Select() (map[string]MemberProfile, error) } type Session interface { @@ -48,6 +51,9 @@ type Session interface { } type SessionManager interface { + Connect() error + Disconnect() error + Create(id string, profile MemberProfile) (Session, error) Update(id string, profile MemberProfile) error Get(id string) (Session, bool) diff --git a/neko.go b/neko.go index 66237282..c77537a8 100644 --- a/neko.go +++ b/neko.go @@ -128,6 +128,13 @@ func (neko *Neko) Preflight() { } func (neko *Neko) Start() { + neko.sessionManager = session.New( + neko.Configs.Session, + ) + if err := neko.sessionManager.Connect(); err != nil { + neko.logger.Panic().Err(err).Msg("unable to connect to session manager") + } + neko.desktopManager = desktop.New( neko.Configs.Capture.Display, neko.Configs.Desktop, @@ -147,10 +154,6 @@ func (neko *Neko) Start() { ) neko.webRTCManager.Start() - neko.sessionManager = session.New( - neko.Configs.Session, - ) - neko.webSocketManager = websocket.New( neko.sessionManager, neko.desktopManager, @@ -175,6 +178,12 @@ func (neko *Neko) Start() { } func (neko *Neko) Shutdown() { + if err := neko.sessionManager.Disconnect(); err != nil { + neko.logger.Err(err).Msg("session manager disconnect with an error") + } else { + neko.logger.Debug().Msg("session manager disconnect") + } + if err := neko.desktopManager.Shutdown(); err != nil { neko.logger.Err(err).Msg("desktop manager shutdown with an error") } else { From 0a201d50c8d2c0caa9ad948e3e80d96335820486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 18:48:50 +0100 Subject: [PATCH 197/876] + CanLogin. --- internal/session/auth.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/session/auth.go b/internal/session/auth.go index 49c5fd68..2554b178 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -22,6 +22,10 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, return nil, fmt.Errorf("invalid password provided") } + if !session.CanLogin() { + return nil, fmt.Errorf("login disabled") + } + return session, nil } From d2ffac3d4bf1f5bc033ccbe6c0ff50f31c95bbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 18:49:08 +0100 Subject: [PATCH 198/876] + CanConnect. --- internal/websocket/manager.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index e7c522b7..b0463359 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -155,11 +155,24 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e if err != nil { ws.logger.Warn().Err(err).Msg("authentication failed") - // TODO: Refactor + // TODO: Refactor, return error code. if err = connection.WriteJSON( message.SystemDisconnect{ Event: event.SYSTEM_DISCONNECT, - Message: "authentication failed", + Message: err.Error(), + }); err != nil { + ws.logger.Error().Err(err).Msg("failed to send disconnect") + } + + return connection.Close() + } + + if !session.CanConnect() { + // TODO: Refactor, return error code. + if err = connection.WriteJSON( + message.SystemDisconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: "connection disabled", }); err != nil { ws.logger.Error().Err(err).Msg("failed to send disconnect") } @@ -168,7 +181,7 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e } if session.IsConnected() { - // TODO: Refactor + // TODO: Refactor, return error code. if err = connection.WriteJSON( message.SystemDisconnect{ Event: event.SYSTEM_DISCONNECT, From 4fe74fd112bdd9be208da3f7d4a4636a89c07ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 18:49:20 +0100 Subject: [PATCH 199/876] + CanWatch. --- internal/websocket/handler/signal.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index c6cd9cbd..612281a1 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -7,6 +7,10 @@ import ( ) func (h *MessageHandlerCtx) signalRequest(session types.Session) error { + if !session.CanWatch() { + return nil + } + sdp, lite, ice, err := h.webrtc.CreatePeer(session) if err != nil { return err From 92aa717a8d3ceb7cd6915ab53d5aecc05990d40a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 18:50:04 +0100 Subject: [PATCH 200/876] user - member. --- internal/websocket/handler/screen.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 1927ed42..5aa5da14 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -8,7 +8,7 @@ import ( func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { if !session.IsAdmin() { - h.logger.Debug().Msg("user not admin") + h.logger.Debug().Msg("member not admin") return nil } From 5edd9dc97aa992eb3083809635ef18a2d079f0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 18:50:41 +0100 Subject: [PATCH 201/876] + CanHost. --- internal/api/room/control.go | 23 +++++++++++++++++++++-- internal/session/manager.go | 2 +- internal/websocket/handler/control.go | 10 ++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 659b87ba..cf474ee8 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -41,6 +41,11 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { } session := auth.GetSession(r) + if !session.CanHost() { + utils.HttpBadRequest(w, "Member is not allowed to host.") + return + } + h.sessions.SetHost(session) h.sessions.Broadcast( @@ -56,7 +61,12 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if !session.IsHost() { - utils.HttpUnprocessableEntity(w, "User is not the host.") + utils.HttpUnprocessableEntity(w, "Member is not the host.") + return + } + + if !session.CanHost() { + utils.HttpBadRequest(w, "Member is not allowed to host.") return } @@ -74,6 +84,10 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) + if !session.CanHost() { + utils.HttpBadRequest(w, "Member is not allowed to host.") + return + } h.sessions.SetHost(session) @@ -95,7 +109,12 @@ func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { target, ok := h.sessions.Get(data.ID) if !ok { - utils.HttpBadRequest(w, "Target user was not found.") + utils.HttpBadRequest(w, "Target member was not found.") + return + } + + if !target.CanHost() { + utils.HttpBadRequest(w, "Target member is not allowed to host.") return } diff --git a/internal/session/manager.go b/internal/session/manager.go index 382f5cc2..67d90a0d 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -68,7 +68,7 @@ func (manager *SessionManagerCtx) Connect() error { _ = manager.add(id, profile) } - // TODO: Move to Database, or make `admin` as reserved user. + // TODO: Move to Database, or make `admin` as reserved ID. // create default admin account at startup _ = manager.add("admin", types.MemberProfile{ diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 6428311e..69697c02 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -7,6 +7,11 @@ import ( ) func (h *MessageHandlerCtx) controlRelease(session types.Session) error { + if !session.CanHost() { + h.logger.Debug().Str("id", session.ID()).Msg("is not allowed to host") + return nil + } + if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil @@ -25,6 +30,11 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { } func (h *MessageHandlerCtx) controlRequest(session types.Session) error { + if !session.CanHost() { + h.logger.Debug().Str("id", session.ID()).Msg("is not allowed to host") + return nil + } + if session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is already the host") return nil From e17e2cb606900d1ede7551dba142b831a7f748c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 18:55:24 +0100 Subject: [PATCH 202/876] + CanAccessClipboard. --- internal/websocket/handler/clipboard.go | 5 +++++ internal/websocket/manager.go | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index ee0e0f25..d30cca2d 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -6,6 +6,11 @@ import ( ) func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { + if !session.CanAccessClipboard() { + h.logger.Debug().Str("id", session.ID()).Msg("cannot access clipboard") + return nil + } + if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index b0463359..92aef70b 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -121,6 +121,11 @@ func (ws *WebSocketManagerCtx) Start() { break } + current = text + if !session.CanAccessClipboard() { + break + } + if err := session.Send( message.ClipboardData{ Event: event.CLIPBOARD_UPDATED, @@ -128,8 +133,6 @@ func (ws *WebSocketManagerCtx) Start() { }); err != nil { ws.logger.Warn().Err(err).Msg("could not sync clipboard") } - - current = text } time.Sleep(100 * time.Millisecond) From c714d17d870b1274a1b95abb7b15de40aec7a887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 19:02:33 +0100 Subject: [PATCH 203/876] is_receiving - is_watching. --- internal/session/session.go | 2 +- internal/types/message/messages.go | 2 +- internal/types/session.go | 2 +- internal/websocket/handler/session.go | 4 ++-- internal/websocket/handler/system.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 1542fb3b..4d74c691 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -71,7 +71,7 @@ func (session *SessionCtx) IsConnected() bool { return session.websocket_connected } -func (session *SessionCtx) IsReceiving() bool { +func (session *SessionCtx) IsWatching() bool { return session.webrtc_connected } diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 353ad52d..3d5ca749 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -70,7 +70,7 @@ type MemberState struct { Event string `json:"event,omitempty"` ID string `json:"id,omitempty"` IsConnected bool `json:"is_connected"` - IsReceiving bool `json:"is_receiving"` + IsWatching bool `json:"is_watching"` } type MemberData struct { diff --git a/internal/types/session.go b/internal/types/session.go index 347a36c1..0d753e24 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -38,7 +38,7 @@ type Session interface { IsHost() bool IsConnected() bool - IsReceiving() bool + IsWatching() bool Disconnect(reason string) error SetWebSocketPeer(websocket_peer WebSocketPeer) diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 9dd36775..d17f9c04 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -23,7 +23,7 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { }, State: message.MemberState{ IsConnected: session.IsConnected(), - IsReceiving: session.IsReceiving(), + IsWatching: session.IsWatching(), }, }, nil) @@ -105,7 +105,7 @@ func (h *MessageHandlerCtx) SessionStateChanged(session types.Session) error { Event: event.MEMBER_STATE, ID: session.ID(), IsConnected: session.IsConnected(), - IsReceiving: session.IsReceiving(), + IsWatching: session.IsWatching(), }, nil) return nil diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 5572b96a..cacd28ec 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -39,7 +39,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { }, State: message.MemberState{ IsConnected: session.IsConnected(), - IsReceiving: session.IsReceiving(), + IsWatching: session.IsWatching(), }, } } From a2da60d6177976a90375b475f6a61aa7b6b0ca6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 19:19:57 +0100 Subject: [PATCH 204/876] add default access control on users. --- internal/session/manager.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/internal/session/manager.go b/internal/session/manager.go index 67d90a0d..e11e00fb 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -75,6 +75,11 @@ func (manager *SessionManagerCtx) Connect() error { Secret: manager.config.AdminPassword, Name: "Administrator", IsAdmin: true, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, }) // create default user account at startup @@ -82,6 +87,11 @@ func (manager *SessionManagerCtx) Connect() error { Secret: manager.config.Password, Name: "User", IsAdmin: false, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, }) return nil From 2467c94c59e66b5cf868c9d614cbfd84aa2d59e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 19:29:39 +0100 Subject: [PATCH 205/876] add profileChanged. --- internal/session/manager.go | 1 + internal/session/session.go | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/internal/session/manager.go b/internal/session/manager.go index e11e00fb..d3fb9e32 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -142,6 +142,7 @@ func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) manager.membersMu.Unlock() manager.emmiter.Emit("profile_changed", session) + session.profileChanged() return nil } diff --git a/internal/session/session.go b/internal/session/session.go index 4d74c691..c2ccdd57 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -59,6 +59,24 @@ func (session *SessionCtx) CanAccessClipboard() bool { return session.profile.CanAccessClipboard } +func (session *SessionCtx) profileChanged() { + if !session.CanHost() && session.IsHost() { + session.manager.ClearHost() + } + + if !session.CanWatch() && session.IsWatching() { + if err := session.webrtc_peer.Destroy(); err != nil { + session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") + } + } + + if !session.CanConnect() && session.IsConnected() { + if err := session.Disconnect("profile changed"); err != nil { + session.logger.Warn().Err(err).Msgf("websocket destroy has failed") + } + } +} + // --- // runtime // --- From 9ca4e04e0b8b669ba09308ba8a33d8dee8f93ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 21:10:45 +0100 Subject: [PATCH 206/876] pointer struct to members crud. --- internal/api/members/crud.go | 110 ++++++++++++++++++++++------------- internal/session/manager.go | 5 ++ 2 files changed, 75 insertions(+), 40 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index a338ef1d..b684414f 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -12,15 +12,15 @@ type MemberCreatePayload struct { } type MemberDataPayload struct { - ID string `json:"id"` - Secret string `json:"secret,omitempty"` - Name string `json:"name"` - IsAdmin bool `json:"is_admin"` - CanLogin bool `json:"can_login"` - CanConnect bool `json:"can_connect"` - CanWatch bool `json:"can_watch"` - CanHost bool `json:"can_host"` - CanAccessClipboard bool `json:"can_access_clipboard"` + ID *string `json:"id"` + Secret *string `json:"secret,omitempty"` + Name *string `json:"name"` + IsAdmin *bool `json:"is_admin"` + CanLogin *bool `json:"can_login"` + CanConnect *bool `json:"can_connect"` + CanWatch *bool `json:"can_watch"` + CanHost *bool `json:"can_host"` + CanAccessClipboard *bool `json:"can_access_clipboard"` } func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { @@ -29,29 +29,40 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { return } - if data.ID == "" { + if data.Secret == nil || *data.Secret == "" { + utils.HttpBadRequest(w, "Secret cannot be empty.") + return + } + + if data.Name == nil || *data.Name == "" { + utils.HttpBadRequest(w, "Name cannot be empty.") + return + } + + var ID string + if data.ID == nil || *data.ID == "" { var err error - if data.ID, err = utils.NewUID(32); err != nil { + if ID, err = utils.NewUID(32); err != nil { utils.HttpInternalServerError(w, err) return } } else { - if _, ok := h.sessions.Get(data.ID); ok { + ID = *data.ID + if _, ok := h.sessions.Get(ID); ok { utils.HttpBadRequest(w, "Member ID already exists.") return } } - // TODO: Join structs? - session, err := h.sessions.Create(data.ID, types.MemberProfile{ - Secret: data.Secret, - Name: data.Name, - IsAdmin: data.IsAdmin, - CanLogin: data.CanLogin, - CanConnect: data.CanConnect, - CanWatch: data.CanWatch, - CanHost: data.CanHost, - CanAccessClipboard: data.CanAccessClipboard, + session, err := h.sessions.Create(ID, types.MemberProfile{ + Secret: *data.Secret, + Name: *data.Name, + IsAdmin: defaultBool(data.IsAdmin, false), + CanLogin: defaultBool(data.CanLogin, true), + CanConnect: defaultBool(data.CanConnect, true), + CanWatch: defaultBool(data.CanWatch, true), + CanHost: defaultBool(data.CanHost, true), + CanAccessClipboard: defaultBool(data.CanAccessClipboard, true), }) if err != nil { @@ -68,14 +79,15 @@ func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { member := GetMember(r) // TODO: Join structs? + // TODO: Ugly. utils.HttpSuccess(w, MemberDataPayload{ - Name: member.Name(), - IsAdmin: member.IsAdmin(), - CanLogin: member.CanLogin(), - CanConnect: member.CanConnect(), - CanWatch: member.CanWatch(), - CanHost: member.CanHost(), - CanAccessClipboard: member.CanAccessClipboard(), + Name: func(v string) *string { return &v }(member.Name()), + IsAdmin: func(v bool) *bool { return &v }(member.IsAdmin()), + CanLogin: func(v bool) *bool { return &v }(member.CanLogin()), + CanConnect: func(v bool) *bool { return &v }(member.CanConnect()), + CanWatch: func(v bool) *bool { return &v }(member.CanWatch()), + CanHost: func(v bool) *bool { return &v }(member.CanHost()), + CanAccessClipboard: func(v bool) *bool { return &v }(member.CanAccessClipboard()), }) } @@ -87,18 +99,29 @@ func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { member := GetMember(r) + secret := "" + if data.Secret != nil && *data.Secret != "" { + secret = *data.Secret + } + + name := member.Name() + if data.Name != nil && *data.Name != "" { + name = *data.Name + } + // TODO: Join structs? - // TODO: Update independent props. - if err := h.sessions.Update(member.ID(), types.MemberProfile{ - Secret: data.Secret, - Name: data.Name, - IsAdmin: data.IsAdmin, - CanLogin: data.CanLogin, - CanConnect: data.CanConnect, - CanWatch: data.CanWatch, - CanHost: data.CanHost, - CanAccessClipboard: data.CanAccessClipboard, - }); err != nil { + err := h.sessions.Update(member.ID(), types.MemberProfile{ + Secret: secret, + Name: name, + IsAdmin: defaultBool(data.IsAdmin, member.IsAdmin()), + CanLogin: defaultBool(data.CanLogin, member.CanLogin()), + CanConnect: defaultBool(data.CanConnect, member.CanConnect()), + CanWatch: defaultBool(data.CanWatch, member.CanWatch()), + CanHost: defaultBool(data.CanHost, member.CanHost()), + CanAccessClipboard: defaultBool(data.CanAccessClipboard, member.CanAccessClipboard()), + }) + + if err != nil { utils.HttpInternalServerError(w, err) return } @@ -116,3 +139,10 @@ func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } + +func defaultBool(val *bool, def bool) bool { + if val != nil { + return *val + } + return def +} diff --git a/internal/session/manager.go b/internal/session/manager.go index d3fb9e32..a8702d26 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -132,6 +132,11 @@ func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) return fmt.Errorf("Member not found.") } + // preserve secret if not updated + if profile.Secret == "" { + profile.Secret = session.profile.Secret + } + err := manager.database.Update(id, profile) if err != nil { manager.membersMu.Unlock() From 303c22bba583beede6375256d7a32feda81da76a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 6 Dec 2020 21:34:23 +0100 Subject: [PATCH 207/876] profileChanged tested, minor bugs fixed. --- internal/session/session.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/session/session.go b/internal/session/session.go index c2ccdd57..14952d1f 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -62,6 +62,12 @@ func (session *SessionCtx) CanAccessClipboard() bool { func (session *SessionCtx) profileChanged() { if !session.CanHost() && session.IsHost() { session.manager.ClearHost() + + session.manager.Broadcast( + message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: false, + }, nil) } if !session.CanWatch() && session.IsWatching() { @@ -70,7 +76,7 @@ func (session *SessionCtx) profileChanged() { } } - if !session.CanConnect() && session.IsConnected() { + if (!session.CanConnect() || !session.CanLogin()) && session.IsConnected() { if err := session.Disconnect("profile changed"); err != nil { session.logger.Warn().Err(err).Msgf("websocket destroy has failed") } From 4b4ddcfe1539ee260712ddcc8dc901a102931a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 8 Dec 2020 14:13:12 +0100 Subject: [PATCH 208/876] use json marshal default values. --- internal/api/members/crud.go | 122 +++++++++++++++++------------------ 1 file changed, 60 insertions(+), 62 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index b684414f..f5122a0c 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -12,57 +12,64 @@ type MemberCreatePayload struct { } type MemberDataPayload struct { - ID *string `json:"id"` - Secret *string `json:"secret,omitempty"` - Name *string `json:"name"` - IsAdmin *bool `json:"is_admin"` - CanLogin *bool `json:"can_login"` - CanConnect *bool `json:"can_connect"` - CanWatch *bool `json:"can_watch"` - CanHost *bool `json:"can_host"` - CanAccessClipboard *bool `json:"can_access_clipboard"` + ID string `json:"id"` + Secret string `json:"secret,omitempty"` + Name string `json:"name"` + IsAdmin bool `json:"is_admin"` + CanLogin bool `json:"can_login"` + CanConnect bool `json:"can_connect"` + CanWatch bool `json:"can_watch"` + CanHost bool `json:"can_host"` + CanAccessClipboard bool `json:"can_access_clipboard"` } func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { - data := &MemberDataPayload{} + data := &MemberDataPayload{ + IsAdmin: false, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + } + if !utils.HttpJsonRequest(w, r, data) { return } - if data.Secret == nil || *data.Secret == "" { + if data.Secret == "" { utils.HttpBadRequest(w, "Secret cannot be empty.") return } - if data.Name == nil || *data.Name == "" { + if data.Name == "" { utils.HttpBadRequest(w, "Name cannot be empty.") return } - var ID string - if data.ID == nil || *data.ID == "" { + if data.ID == "" { var err error - if ID, err = utils.NewUID(32); err != nil { + if data.ID, err = utils.NewUID(32); err != nil { utils.HttpInternalServerError(w, err) return } } else { - ID = *data.ID - if _, ok := h.sessions.Get(ID); ok { + if _, ok := h.sessions.Get(data.ID); ok { utils.HttpBadRequest(w, "Member ID already exists.") return } } - session, err := h.sessions.Create(ID, types.MemberProfile{ - Secret: *data.Secret, - Name: *data.Name, - IsAdmin: defaultBool(data.IsAdmin, false), - CanLogin: defaultBool(data.CanLogin, true), - CanConnect: defaultBool(data.CanConnect, true), - CanWatch: defaultBool(data.CanWatch, true), - CanHost: defaultBool(data.CanHost, true), - CanAccessClipboard: defaultBool(data.CanAccessClipboard, true), + // TODO: Join structs? + session, err := h.sessions.Create(data.ID, types.MemberProfile{ + Secret: data.Secret, + Name: data.Name, + IsAdmin: data.IsAdmin, + CanLogin: data.CanLogin, + CanConnect: data.CanConnect, + CanWatch: data.CanWatch, + CanHost: data.CanHost, + CanAccessClipboard: data.CanAccessClipboard, }) if err != nil { @@ -79,46 +86,44 @@ func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { member := GetMember(r) // TODO: Join structs? - // TODO: Ugly. utils.HttpSuccess(w, MemberDataPayload{ - Name: func(v string) *string { return &v }(member.Name()), - IsAdmin: func(v bool) *bool { return &v }(member.IsAdmin()), - CanLogin: func(v bool) *bool { return &v }(member.CanLogin()), - CanConnect: func(v bool) *bool { return &v }(member.CanConnect()), - CanWatch: func(v bool) *bool { return &v }(member.CanWatch()), - CanHost: func(v bool) *bool { return &v }(member.CanHost()), - CanAccessClipboard: func(v bool) *bool { return &v }(member.CanAccessClipboard()), + Name: member.Name(), + IsAdmin: member.IsAdmin(), + CanLogin: member.CanLogin(), + CanConnect: member.CanConnect(), + CanWatch: member.CanWatch(), + CanHost: member.CanHost(), + CanAccessClipboard: member.CanAccessClipboard(), }) } func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { - data := &MemberDataPayload{} + member := GetMember(r) + + data := &MemberDataPayload{ + Name: member.Name(), + IsAdmin: member.IsAdmin(), + CanLogin: member.CanLogin(), + CanConnect: member.CanConnect(), + CanWatch: member.CanWatch(), + CanHost: member.CanHost(), + CanAccessClipboard: member.CanAccessClipboard(), + } + if !utils.HttpJsonRequest(w, r, data) { return } - member := GetMember(r) - - secret := "" - if data.Secret != nil && *data.Secret != "" { - secret = *data.Secret - } - - name := member.Name() - if data.Name != nil && *data.Name != "" { - name = *data.Name - } - // TODO: Join structs? err := h.sessions.Update(member.ID(), types.MemberProfile{ - Secret: secret, - Name: name, - IsAdmin: defaultBool(data.IsAdmin, member.IsAdmin()), - CanLogin: defaultBool(data.CanLogin, member.CanLogin()), - CanConnect: defaultBool(data.CanConnect, member.CanConnect()), - CanWatch: defaultBool(data.CanWatch, member.CanWatch()), - CanHost: defaultBool(data.CanHost, member.CanHost()), - CanAccessClipboard: defaultBool(data.CanAccessClipboard, member.CanAccessClipboard()), + Secret: data.Secret, + Name: data.Name, + IsAdmin: data.IsAdmin, + CanLogin: data.CanLogin, + CanConnect: data.CanConnect, + CanWatch: data.CanWatch, + CanHost: data.CanHost, + CanAccessClipboard: data.CanAccessClipboard, }) if err != nil { @@ -139,10 +144,3 @@ func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } - -func defaultBool(val *bool, def bool) bool { - if val != nil { - return *val - } - return def -} From 58c8104ce67ad5f7ded7c165f80828bfcb19e6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 8 Dec 2020 14:31:15 +0100 Subject: [PATCH 209/876] remove unused logger from room api handler. --- internal/api/room/handler.go | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index a073f7a0..67868a18 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -2,18 +2,15 @@ package room import ( "github.com/go-chi/chi" - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" "demodesk/neko/internal/types" "demodesk/neko/internal/http/auth" ) type RoomHandler struct { - logger zerolog.Logger - sessions types.SessionManager - desktop types.DesktopManager - capture types.CaptureManager + sessions types.SessionManager + desktop types.DesktopManager + capture types.CaptureManager } func New( @@ -21,16 +18,12 @@ func New( desktop types.DesktopManager, capture types.CaptureManager, ) *RoomHandler { - logger := log.With(). - Str("module", "api"). - Str("submodule", "room"). - Logger() + // Init return &RoomHandler{ - logger: logger, - sessions: sessions, - desktop: desktop, - capture: capture, + sessions: sessions, + desktop: desktop, + capture: capture, } } From 209971cb8a197a08cf5909e43a53c94750726232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 8 Dec 2020 15:14:20 +0100 Subject: [PATCH 210/876] member profile & state to types. --- internal/api/members/crud.go | 65 +++++++-------------------- internal/types/message/messages.go | 31 ++++++------- internal/types/session.go | 20 +++++---- internal/websocket/handler/session.go | 37 ++++++++------- internal/websocket/handler/system.go | 7 +-- 5 files changed, 68 insertions(+), 92 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index f5122a0c..3dba1791 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -9,28 +9,19 @@ import ( type MemberCreatePayload struct { ID string `json:"id"` -} - -type MemberDataPayload struct { - ID string `json:"id"` - Secret string `json:"secret,omitempty"` - Name string `json:"name"` - IsAdmin bool `json:"is_admin"` - CanLogin bool `json:"can_login"` - CanConnect bool `json:"can_connect"` - CanWatch bool `json:"can_watch"` - CanHost bool `json:"can_host"` - CanAccessClipboard bool `json:"can_access_clipboard"` + *types.MemberProfile } func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { - data := &MemberDataPayload{ - IsAdmin: false, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanAccessClipboard: true, + data := &MemberCreatePayload{ + MemberProfile: &types.MemberProfile{ + IsAdmin: false, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + }, } if !utils.HttpJsonRequest(w, r, data) { @@ -60,18 +51,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { } } - // TODO: Join structs? - session, err := h.sessions.Create(data.ID, types.MemberProfile{ - Secret: data.Secret, - Name: data.Name, - IsAdmin: data.IsAdmin, - CanLogin: data.CanLogin, - CanConnect: data.CanConnect, - CanWatch: data.CanWatch, - CanHost: data.CanHost, - CanAccessClipboard: data.CanAccessClipboard, - }) - + session, err := h.sessions.Create(data.ID, *data.MemberProfile) if err != nil { utils.HttpInternalServerError(w, err) return @@ -85,8 +65,8 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - // TODO: Join structs? - utils.HttpSuccess(w, MemberDataPayload{ + // TODO: Get whole profile from session. + utils.HttpSuccess(w, types.MemberProfile{ Name: member.Name(), IsAdmin: member.IsAdmin(), CanLogin: member.CanLogin(), @@ -100,7 +80,8 @@ func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - data := &MemberDataPayload{ + // TODO: Get whole profile from session. + profile := types.MemberProfile{ Name: member.Name(), IsAdmin: member.IsAdmin(), CanLogin: member.CanLogin(), @@ -110,23 +91,11 @@ func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { CanAccessClipboard: member.CanAccessClipboard(), } - if !utils.HttpJsonRequest(w, r, data) { + if !utils.HttpJsonRequest(w, r, &profile) { return } - // TODO: Join structs? - err := h.sessions.Update(member.ID(), types.MemberProfile{ - Secret: data.Secret, - Name: data.Name, - IsAdmin: data.IsAdmin, - CanLogin: data.CanLogin, - CanConnect: data.CanConnect, - CanWatch: data.CanWatch, - CanHost: data.CanHost, - CanAccessClipboard: data.CanAccessClipboard, - }) - - if err != nil { + if err := h.sessions.Update(member.ID(), profile); err != nil { utils.HttpInternalServerError(w, err) return } diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 3d5ca749..5766331f 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -1,5 +1,9 @@ package message +import ( + "demodesk/neko/internal/types" +) + type Message struct { Event string `json:"event"` Payload interface{} `json:"payload"` // TODO: New. @@ -55,29 +59,22 @@ type MemberID struct { } type MemberProfile struct { - Event string `json:"event,omitempty"` - ID string `json:"id,omitempty"` - Name string `json:"name"` - IsAdmin bool `json:"is_admin"` - CanLogin bool `json:"can_login"` - CanConnect bool `json:"can_connect"` - CanWatch bool `json:"can_watch"` - CanHost bool `json:"can_host"` - CanAccessClipboard bool `json:"can_access_clipboard"` + Event string `json:"event,omitempty"` + ID string `json:"id"` + *types.MemberProfile } type MemberState struct { - Event string `json:"event,omitempty"` - ID string `json:"id,omitempty"` - IsConnected bool `json:"is_connected"` - IsWatching bool `json:"is_watching"` + Event string `json:"event,omitempty"` + ID string `json:"id"` + *types.MemberState } type MemberData struct { - Event string `json:"event,omitempty"` - ID string `json:"id"` - Profile MemberProfile `json:"profile"` - State MemberState `json:"state"` + Event string `json:"event,omitempty"` + ID string `json:"id"` + Profile types.MemberProfile `json:"profile"` + State types.MemberState `json:"state"` } ///////////////////////////// diff --git a/internal/types/session.go b/internal/types/session.go index 0d753e24..9611cb5f 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -3,15 +3,19 @@ package types import "net/http" type MemberProfile struct { - Secret string - Name string + Secret string `json:"secret,omitempty"` + Name string `json:"name"` + IsAdmin bool `json:"is_admin"` + CanLogin bool `json:"can_login"` + CanConnect bool `json:"can_connect"` + CanWatch bool `json:"can_watch"` + CanHost bool `json:"can_host"` + CanAccessClipboard bool `json:"can_access_clipboard"` +} - IsAdmin bool - CanLogin bool - CanConnect bool - CanWatch bool - CanHost bool - CanAccessClipboard bool +type MemberState struct { + IsConnected bool `json:"is_connected"` + IsWatching bool `json:"is_watching"` } type MembersDatabase interface { diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index d17f9c04..36bde424 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -7,12 +7,12 @@ import ( ) func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { - // TODO: Join structs? h.sessions.Broadcast( message.MemberData{ Event: event.MEMBER_CREATED, ID: session.ID(), - Profile: message.MemberProfile{ + // TODO: Get whole profile from session. + Profile: types.MemberProfile{ Name: session.Name(), IsAdmin: session.IsAdmin(), CanLogin: session.CanLogin(), @@ -21,7 +21,8 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { CanHost: session.CanHost(), CanAccessClipboard: session.CanAccessClipboard(), }, - State: message.MemberState{ + // TODO: Get whole state from session. + State: types.MemberState{ IsConnected: session.IsConnected(), IsWatching: session.IsWatching(), }, @@ -81,31 +82,35 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { } func (h *MessageHandlerCtx) SessionProfileChanged(session types.Session) error { - // TODO: Join structs? h.sessions.Broadcast( message.MemberProfile{ - Event: event.MEMBER_PROFILE, - ID: session.ID(), - Name: session.Name(), - IsAdmin: session.IsAdmin(), - CanLogin: session.CanLogin(), - CanConnect: session.CanConnect(), - CanWatch: session.CanWatch(), - CanHost: session.CanHost(), - CanAccessClipboard: session.CanAccessClipboard(), + Event: event.MEMBER_PROFILE, + ID: session.ID(), + // TODO: Get whole profile from session. + MemberProfile: &types.MemberProfile{ + Name: session.Name(), + IsAdmin: session.IsAdmin(), + CanLogin: session.CanLogin(), + CanConnect: session.CanConnect(), + CanWatch: session.CanWatch(), + CanHost: session.CanHost(), + CanAccessClipboard: session.CanAccessClipboard(), + }, }, nil) return nil } func (h *MessageHandlerCtx) SessionStateChanged(session types.Session) error { - // TODO: Join structs? h.sessions.Broadcast( message.MemberState{ Event: event.MEMBER_STATE, ID: session.ID(), - IsConnected: session.IsConnected(), - IsWatching: session.IsWatching(), + // TODO: Get whole state from session. + MemberState: &types.MemberState{ + IsConnected: session.IsConnected(), + IsWatching: session.IsWatching(), + }, }, nil) return nil diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index cacd28ec..47084c15 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -25,10 +25,10 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { members := map[string]message.MemberData{} for _, session := range h.sessions.Members() { - // TODO: Join structs? members[session.ID()] = message.MemberData{ ID: session.ID(), - Profile: message.MemberProfile{ + // TODO: Get whole profile from session. + Profile: types.MemberProfile{ Name: session.Name(), IsAdmin: session.IsAdmin(), CanLogin: session.CanLogin(), @@ -37,7 +37,8 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { CanHost: session.CanHost(), CanAccessClipboard: session.CanAccessClipboard(), }, - State: message.MemberState{ + // TODO: Get whole state from session. + State: types.MemberState{ IsConnected: session.IsConnected(), IsWatching: session.IsWatching(), }, From 7fb40c03846b9b9b01f54a941b29e0960a3b3aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 8 Dec 2020 15:37:48 +0100 Subject: [PATCH 211/876] + GetProfile & GetState members. --- internal/api/members/crud.go | 25 ++---------- internal/session/session.go | 58 +++++++++++++++++---------- internal/types/session.go | 8 +++- internal/websocket/handler/session.go | 38 ++++-------------- internal/websocket/handler/system.go | 17 +------- 5 files changed, 57 insertions(+), 89 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index 3dba1791..02383d81 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -14,6 +14,7 @@ type MemberCreatePayload struct { func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { data := &MemberCreatePayload{ + // default values MemberProfile: &types.MemberProfile{ IsAdmin: false, CanLogin: true, @@ -64,32 +65,14 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { member := GetMember(r) + profile := member.GetProfile() - // TODO: Get whole profile from session. - utils.HttpSuccess(w, types.MemberProfile{ - Name: member.Name(), - IsAdmin: member.IsAdmin(), - CanLogin: member.CanLogin(), - CanConnect: member.CanConnect(), - CanWatch: member.CanWatch(), - CanHost: member.CanHost(), - CanAccessClipboard: member.CanAccessClipboard(), - }) + utils.HttpSuccess(w, profile) } func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - - // TODO: Get whole profile from session. - profile := types.MemberProfile{ - Name: member.Name(), - IsAdmin: member.IsAdmin(), - CanLogin: member.CanLogin(), - CanConnect: member.CanConnect(), - CanWatch: member.CanWatch(), - CanHost: member.CanHost(), - CanAccessClipboard: member.CanAccessClipboard(), - } + profile := member.GetProfile() if !utils.HttpJsonRequest(w, r, &profile) { return diff --git a/internal/session/session.go b/internal/session/session.go index 14952d1f..60642a0c 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -59,6 +59,12 @@ func (session *SessionCtx) CanAccessClipboard() bool { return session.profile.CanAccessClipboard } +func (session *SessionCtx) GetProfile() types.MemberProfile { + profile := session.profile + profile.Secret = "" + return profile +} + func (session *SessionCtx) profileChanged() { if !session.CanHost() && session.IsHost() { session.manager.ClearHost() @@ -84,7 +90,7 @@ func (session *SessionCtx) profileChanged() { } // --- -// runtime +// state // --- func (session *SessionCtx) IsHost() bool { @@ -99,28 +105,12 @@ func (session *SessionCtx) IsWatching() bool { return session.webrtc_connected } -func (session *SessionCtx) Disconnect(reason string) error { - if err := session.Send( - message.SystemDisconnect{ - Event: event.SYSTEM_DISCONNECT, - Message: reason, - }); err != nil { - return err +func (session *SessionCtx) GetState() types.MemberState { + // TODO: Save state in member struct. + return types.MemberState{ + IsConnected: session.IsConnected(), + IsWatching: session.IsWatching(), } - - if session.websocket_peer != nil { - if err := session.websocket_peer.Destroy(); err != nil { - return err - } - } - - if session.webrtc_peer != nil { - if err := session.webrtc_peer.Destroy(); err != nil { - return err - } - } - - return nil } // --- @@ -157,6 +147,30 @@ func (session *SessionCtx) Send(v interface{}) error { return session.websocket_peer.Send(v) } +func (session *SessionCtx) Disconnect(reason string) error { + if err := session.Send( + message.SystemDisconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: reason, + }); err != nil { + return err + } + + if session.websocket_peer != nil { + if err := session.websocket_peer.Destroy(); err != nil { + return err + } + } + + if session.webrtc_peer != nil { + if err := session.webrtc_peer.Destroy(); err != nil { + return err + } + } + + return nil +} + // --- // webrtc // --- diff --git a/internal/types/session.go b/internal/types/session.go index 9611cb5f..341f31cc 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -31,6 +31,7 @@ type MembersDatabase interface { type Session interface { ID() string + // profile VerifySecret(secret string) bool Name() string IsAdmin() bool @@ -39,16 +40,21 @@ type Session interface { CanWatch() bool CanHost() bool CanAccessClipboard() bool + GetProfile() MemberProfile + // state IsHost() bool IsConnected() bool IsWatching() bool - Disconnect(reason string) error + GetState() MemberState + // websocket SetWebSocketPeer(websocket_peer WebSocketPeer) SetWebSocketConnected(connected bool) Send(v interface{}) error + Disconnect(reason string) error + // webrtc SetWebRTCPeer(webrtc_peer WebRTCPeer) SetWebRTCConnected(connected bool) SignalAnswer(sdp string) error diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 36bde424..664a7986 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -11,21 +11,8 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { message.MemberData{ Event: event.MEMBER_CREATED, ID: session.ID(), - // TODO: Get whole profile from session. - Profile: types.MemberProfile{ - Name: session.Name(), - IsAdmin: session.IsAdmin(), - CanLogin: session.CanLogin(), - CanConnect: session.CanConnect(), - CanWatch: session.CanWatch(), - CanHost: session.CanHost(), - CanAccessClipboard: session.CanAccessClipboard(), - }, - // TODO: Get whole state from session. - State: types.MemberState{ - IsConnected: session.IsConnected(), - IsWatching: session.IsWatching(), - }, + Profile: session.GetProfile(), + State: session.GetState(), }, nil) return nil @@ -82,35 +69,26 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { } func (h *MessageHandlerCtx) SessionProfileChanged(session types.Session) error { + profile := session.GetProfile() + h.sessions.Broadcast( message.MemberProfile{ Event: event.MEMBER_PROFILE, ID: session.ID(), - // TODO: Get whole profile from session. - MemberProfile: &types.MemberProfile{ - Name: session.Name(), - IsAdmin: session.IsAdmin(), - CanLogin: session.CanLogin(), - CanConnect: session.CanConnect(), - CanWatch: session.CanWatch(), - CanHost: session.CanHost(), - CanAccessClipboard: session.CanAccessClipboard(), - }, + MemberProfile: &profile, }, nil) return nil } func (h *MessageHandlerCtx) SessionStateChanged(session types.Session) error { + state := session.GetState() + h.sessions.Broadcast( message.MemberState{ Event: event.MEMBER_STATE, ID: session.ID(), - // TODO: Get whole state from session. - MemberState: &types.MemberState{ - IsConnected: session.IsConnected(), - IsWatching: session.IsWatching(), - }, + MemberState: &state, }, nil) return nil diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 47084c15..08802081 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -27,21 +27,8 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { for _, session := range h.sessions.Members() { members[session.ID()] = message.MemberData{ ID: session.ID(), - // TODO: Get whole profile from session. - Profile: types.MemberProfile{ - Name: session.Name(), - IsAdmin: session.IsAdmin(), - CanLogin: session.CanLogin(), - CanConnect: session.CanConnect(), - CanWatch: session.CanWatch(), - CanHost: session.CanHost(), - CanAccessClipboard: session.CanAccessClipboard(), - }, - // TODO: Get whole state from session. - State: types.MemberState{ - IsConnected: session.IsConnected(), - IsWatching: session.IsWatching(), - }, + Profile: session.GetProfile(), + State: session.GetState(), } } From f1f26b5f2537ecf2af3c9d3d7f31d5f3703b90a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 8 Dec 2020 16:04:54 +0100 Subject: [PATCH 212/876] MemberDataPayload & membersList implemented. --- internal/api/members/crud.go | 6 +++--- internal/api/members/list.go | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go index 02383d81..40e735c1 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/crud.go @@ -7,13 +7,13 @@ import ( "demodesk/neko/internal/types" ) -type MemberCreatePayload struct { +type MemberDataPayload struct { ID string `json:"id"` *types.MemberProfile } func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { - data := &MemberCreatePayload{ + data := &MemberDataPayload{ // default values MemberProfile: &types.MemberProfile{ IsAdmin: false, @@ -58,7 +58,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { return } - utils.HttpSuccess(w, MemberCreatePayload{ + utils.HttpSuccess(w, MemberDataPayload{ ID: session.ID(), }) } diff --git a/internal/api/members/list.go b/internal/api/members/list.go index ec8a9540..48862440 100644 --- a/internal/api/members/list.go +++ b/internal/api/members/list.go @@ -7,6 +7,14 @@ import ( ) func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { + members := []MemberDataPayload{} + for _, session := range h.sessions.Members() { + profile := session.GetProfile() + members = append(members, MemberDataPayload{ + ID: session.ID(), + MemberProfile: &profile, + }) + } - utils.HttpSuccess(w) + utils.HttpSuccess(w, members) } From 9786c8d537d7722af8edf67c7adc93b966611a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 8 Dec 2020 16:05:54 +0100 Subject: [PATCH 213/876] join members endpoints to one file. --- .../api/members/{crud.go => controler.go} | 13 ++++++++++++ internal/api/members/list.go | 20 ------------------- 2 files changed, 13 insertions(+), 20 deletions(-) rename internal/api/members/{crud.go => controler.go} (84%) delete mode 100644 internal/api/members/list.go diff --git a/internal/api/members/crud.go b/internal/api/members/controler.go similarity index 84% rename from internal/api/members/crud.go rename to internal/api/members/controler.go index 40e735c1..e35d326e 100644 --- a/internal/api/members/crud.go +++ b/internal/api/members/controler.go @@ -12,6 +12,19 @@ type MemberDataPayload struct { *types.MemberProfile } +func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { + members := []MemberDataPayload{} + for _, session := range h.sessions.Members() { + profile := session.GetProfile() + members = append(members, MemberDataPayload{ + ID: session.ID(), + MemberProfile: &profile, + }) + } + + utils.HttpSuccess(w, members) +} + func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { data := &MemberDataPayload{ // default values diff --git a/internal/api/members/list.go b/internal/api/members/list.go deleted file mode 100644 index 48862440..00000000 --- a/internal/api/members/list.go +++ /dev/null @@ -1,20 +0,0 @@ -package members - -import ( - "net/http" - - "demodesk/neko/internal/utils" -) - -func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { - members := []MemberDataPayload{} - for _, session := range h.sessions.Members() { - profile := session.GetProfile() - members = append(members, MemberDataPayload{ - ID: session.ID(), - MemberProfile: &profile, - }) - } - - utils.HttpSuccess(w, members) -} From af463b10153caccfda970f9a3c90ce9c09e9efc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 12 Dec 2020 17:07:45 +0100 Subject: [PATCH 214/876] AddRouter in API. --- internal/api/router.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/internal/api/router.go b/internal/api/router.go index 7573d916..04c3993a 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -14,9 +14,10 @@ import ( ) type ApiManagerCtx struct { - sessions types.SessionManager - desktop types.DesktopManager - capture types.CaptureManager + sessions types.SessionManager + desktop types.DesktopManager + capture types.CaptureManager + routers map[string]func(chi.Router) } func New( @@ -27,9 +28,10 @@ func New( ) *ApiManagerCtx { return &ApiManagerCtx{ - sessions: sessions, - desktop: desktop, - capture: capture, + sessions: sessions, + desktop: desktop, + capture: capture, + routers: make(map[string]func(chi.Router)), } } @@ -46,6 +48,10 @@ func (api *ApiManagerCtx) Route(r chi.Router) { session := auth.GetSession(r) utils.HttpBadRequest(w, "Hi `" + session.ID() + "`, you are authenticated.") }) + + for path, router := range api.routers { + r.Route(path, router) + } } func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { @@ -58,3 +64,7 @@ func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { } }) } + +func (api *ApiManagerCtx) AddRouter(path string, router func(chi.Router)) { + api.routers[path] = router +} From 5b69413e01b83b1f59b3c764152748ff35520d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 12 Dec 2020 17:40:10 +0100 Subject: [PATCH 215/876] AddHandler in WebSockets. --- internal/websocket/handler/handler.go | 14 +++++++++----- internal/websocket/manager.go | 23 ++++++++++++++++++++--- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index e6b01a49..6f8c438d 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -3,7 +3,6 @@ package handler import ( "encoding/json" - "github.com/pkg/errors" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -38,10 +37,11 @@ type MessageHandlerCtx struct { capture types.CaptureManager } -func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { +func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { header := message.Message{} if err := json.Unmarshal(raw, &header); err != nil { - return err + h.logger.Error().Err(err).Msg("message parsing has failed") + return false } var err error @@ -87,8 +87,12 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error { return h.keyboardModifiers(session, payload) }) default: - return errors.Errorf("unknown message event %s", header.Event) + return false } - return errors.Wrapf(err, "%s failed", header.Event) + if err != nil { + h.logger.Error().Err(err).Msg("message handler has failed") + } + + return true } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 92aef70b..8aa3faa8 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -15,6 +15,8 @@ import ( "demodesk/neko/internal/types" ) +type HandlerFunction func(types.Session, []byte) bool + func New( sessions types.SessionManager, desktop types.DesktopManager, @@ -32,7 +34,8 @@ func New( return true }, }, - handler: handler.New(sessions, desktop, capture, webrtc), + handler: handler.New(sessions, desktop, capture, webrtc), + handlers: []HandlerFunction{}, } } @@ -45,6 +48,7 @@ type WebSocketManagerCtx struct { sessions types.SessionManager desktop types.DesktopManager handler *handler.MessageHandlerCtx + handlers []HandlerFunction shutdown chan bool } @@ -145,6 +149,10 @@ func (ws *WebSocketManagerCtx) Shutdown() error { return nil } +func (ws *WebSocketManagerCtx) AddHandler(handler HandlerFunction) { + ws.handlers = append(ws.handlers, handler) +} + func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) error { ws.logger.Debug().Msg("attempting to upgrade connection") @@ -260,8 +268,17 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types. Str("raw", string(raw)). Msg("received message from client") - if err := ws.handler.Message(session, raw); err != nil { - ws.logger.Error().Err(err).Msg("message handler has failed") + handled := ws.handler.Message(session, raw) + for _, handler := range ws.handlers { + if handled { + break + } + + handled = handler(session, raw) + } + + if !handled { + ws.logger.Warn().Msg("unhandled message") } case <-cancel: return From b197bb303e135d3bb5294b4dc053a76ee1d2b97f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 12 Dec 2020 18:37:19 +0100 Subject: [PATCH 216/876] add support for modules. --- cmd/serve.go | 5 +++-- internal/types/api.go | 1 + internal/types/websocket.go | 3 +++ internal/websocket/manager.go | 8 +++----- neko.go | 13 +++++++++++++ 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/cmd/serve.go b/cmd/serve.go index 09352739..225d9c77 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -5,6 +5,7 @@ import ( "github.com/spf13/cobra" "demodesk/neko" + "demodesk/neko/modules" "demodesk/neko/internal/config" ) @@ -16,13 +17,13 @@ func init() { Run: neko.Service.ServeCommand, } - configs := []config.Config{ + configs := append([]config.Config{ neko.Service.Configs.Desktop, neko.Service.Configs.Capture, neko.Service.Configs.WebRTC, neko.Service.Configs.Session, neko.Service.Configs.Server, - } + }, modules.ConfigsList()...) cobra.OnInitialize(func() { for _, cfg := range configs { diff --git a/internal/types/api.go b/internal/types/api.go index cd821453..16571b91 100644 --- a/internal/types/api.go +++ b/internal/types/api.go @@ -6,4 +6,5 @@ import ( type ApiManager interface { Route(r chi.Router) + AddRouter(path string, router func(chi.Router)) } diff --git a/internal/types/websocket.go b/internal/types/websocket.go index a55a9ee5..836e3d31 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -2,6 +2,8 @@ package types import "net/http" +type HandlerFunction func(Session, []byte) bool + type WebSocketPeer interface { Send(v interface{}) error Destroy() error @@ -10,5 +12,6 @@ type WebSocketPeer interface { type WebSocketManager interface { Start() Shutdown() error + AddHandler(handler HandlerFunction) Upgrade(w http.ResponseWriter, r *http.Request) error } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 8aa3faa8..b4133538 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -15,8 +15,6 @@ import ( "demodesk/neko/internal/types" ) -type HandlerFunction func(types.Session, []byte) bool - func New( sessions types.SessionManager, desktop types.DesktopManager, @@ -35,7 +33,7 @@ func New( }, }, handler: handler.New(sessions, desktop, capture, webrtc), - handlers: []HandlerFunction{}, + handlers: []types.HandlerFunction{}, } } @@ -48,7 +46,7 @@ type WebSocketManagerCtx struct { sessions types.SessionManager desktop types.DesktopManager handler *handler.MessageHandlerCtx - handlers []HandlerFunction + handlers []types.HandlerFunction shutdown chan bool } @@ -149,7 +147,7 @@ func (ws *WebSocketManagerCtx) Shutdown() error { return nil } -func (ws *WebSocketManagerCtx) AddHandler(handler HandlerFunction) { +func (ws *WebSocketManagerCtx) AddHandler(handler types.HandlerFunction) { ws.handlers = append(ws.handlers, handler) } diff --git a/neko.go b/neko.go index c77537a8..12815f47 100644 --- a/neko.go +++ b/neko.go @@ -14,6 +14,7 @@ import ( "demodesk/neko/internal/websocket" "demodesk/neko/internal/api" "demodesk/neko/internal/http" + "demodesk/neko/modules" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -169,6 +170,12 @@ func (neko *Neko) Start() { neko.Configs.Server, ) + modules.Start( + neko.sessionManager, + neko.webSocketManager, + neko.apiManager, + ) + neko.httpManager = http.New( neko.webSocketManager, neko.apiManager, @@ -208,6 +215,12 @@ func (neko *Neko) Shutdown() { neko.logger.Debug().Msg("websocket manager shutdown") } + if err := modules.Shutdown(); err != nil { + neko.logger.Err(err).Msg("modules shutdown with an error") + } else { + neko.logger.Debug().Msg("modules shutdown") + } + if err := neko.httpManager.Shutdown(); err != nil { neko.logger.Err(err).Msg("http manager shutdown with an error") } else { From 15d867308832dd6f382a0c99669eb44dfc6265ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 13 Dec 2020 23:26:00 +0100 Subject: [PATCH 217/876] add experimental chromedp lib. --- go.mod | 5 ++++- go.sum | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ce55586f..4c475ab0 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,13 @@ module demodesk/neko go 1.13 require ( + github.com/chromedp/cdproto v0.0.0-20201204063249-be40c824ad18 // indirect + github.com/chromedp/chromedp v0.5.4 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-chi/chi v4.1.0+incompatible github.com/go-chi/render v1.0.1 + github.com/gobwas/httphead v0.1.0 // indirect github.com/golang/protobuf v1.3.5 // indirect github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 @@ -27,7 +30,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.6.2 golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 // indirect - golang.org/x/sys v0.0.0-20200331124033-c3d80250170d // indirect + golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f // indirect golang.org/x/text v0.3.2 // indirect gopkg.in/ini.v1 v1.55.0 // indirect ) diff --git a/go.sum b/go.sum index 640d76dc..3e637d33 100644 --- a/go.sum +++ b/go.sum @@ -24,6 +24,15 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/chromedp/cdproto v0.0.0-20201009231348-1c6a710e77de h1:cuPPanKjAp5XBwrD1RkeN4ILGRSffUhS69LKkFqKtIA= +github.com/chromedp/cdproto v0.0.0-20201009231348-1c6a710e77de/go.mod h1:zx0YH7hi8sqkYXAa0LZZxpQLDsU8/a2jzbYbK79dQO8= +github.com/chromedp/cdproto v0.0.0-20201204063249-be40c824ad18 h1:Ci3nU2yz9gRTkITWowWFTtAKYXGwbFBM6cQNoNZxH8o= +github.com/chromedp/cdproto v0.0.0-20201204063249-be40c824ad18/go.mod h1:55pim6Ht4LJKdVLlyFJV/g++HsEA1hQxPbB5JyNdZC0= +github.com/chromedp/chromedp v0.5.4 h1:hQC6Wj+0mBu2B+HDF4eoAyTkDo0BnL16sz3gAAmZ8fc= +github.com/chromedp/chromedp v0.5.4/go.mod h1:Jl2gvx3U9zl4lS/dMjDVGXX0jZ4qo/vsGreqYME/lqc= +github.com/chromedp/sysutil v0.0.0-20201009230539-dc95e7e83e8a/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= +github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic= +github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -57,6 +66,14 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58 h1:YyrUZvJaU8Q0QsoVo+xLFBgWDTam29PKea6GYmwvSiQ= +github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= +github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= +github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= +github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs= +github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -99,6 +116,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= @@ -125,6 +144,9 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= +github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI= github.com/marten-seemann/qtls v0.2.3 h1:0yWJ43C62LsZt08vuQJDK1uC1czUc3FJeCLPoNAI4vA= github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= @@ -363,6 +385,10 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201202213521-69691e467435 h1:25AvDqqB9PrNqj1FLf2/70I4W0L19qqoaFq3gjNwbKk= +golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f h1:QdHQnPce6K4XQewki9WNbG5KOROuDzqO3NaYjI1cXJ0= +golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 1faabe639743274a1535c9fa601664a20fdf18c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 14 Dec 2020 23:36:01 +0100 Subject: [PATCH 218/876] go mod tidy. --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4c475ab0..c32726e8 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module demodesk/neko go 1.13 require ( - github.com/chromedp/cdproto v0.0.0-20201204063249-be40c824ad18 // indirect + github.com/chromedp/cdproto v0.0.0-20201204063249-be40c824ad18 github.com/chromedp/chromedp v0.5.4 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/fsnotify/fsnotify v1.4.9 // indirect From 7c8f0e66cbae4b69b5ad96f5753b816d98f2e752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 18 Dec 2020 16:38:33 +0100 Subject: [PATCH 219/876] remove chromedp. --- go.mod | 6 ------ go.sum | 28 ---------------------------- 2 files changed, 34 deletions(-) diff --git a/go.mod b/go.mod index c32726e8..cd56a4d7 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,8 @@ module demodesk/neko go 1.13 require ( - github.com/chromedp/cdproto v0.0.0-20201204063249-be40c824ad18 - github.com/chromedp/chromedp v0.5.4 - github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-chi/chi v4.1.0+incompatible - github.com/go-chi/render v1.0.1 - github.com/gobwas/httphead v0.1.0 // indirect github.com/golang/protobuf v1.3.5 // indirect github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 @@ -21,7 +16,6 @@ require ( github.com/pion/rtp v1.4.0 // indirect github.com/pion/sdp/v2 v2.3.5 // indirect github.com/pion/webrtc/v2 v2.2.4 - github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.18.0 github.com/spf13/afero v1.2.2 // indirect github.com/spf13/cast v1.3.1 // indirect diff --git a/go.sum b/go.sum index 3e637d33..08536a1d 100644 --- a/go.sum +++ b/go.sum @@ -24,15 +24,6 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= -github.com/chromedp/cdproto v0.0.0-20201009231348-1c6a710e77de h1:cuPPanKjAp5XBwrD1RkeN4ILGRSffUhS69LKkFqKtIA= -github.com/chromedp/cdproto v0.0.0-20201009231348-1c6a710e77de/go.mod h1:zx0YH7hi8sqkYXAa0LZZxpQLDsU8/a2jzbYbK79dQO8= -github.com/chromedp/cdproto v0.0.0-20201204063249-be40c824ad18 h1:Ci3nU2yz9gRTkITWowWFTtAKYXGwbFBM6cQNoNZxH8o= -github.com/chromedp/cdproto v0.0.0-20201204063249-be40c824ad18/go.mod h1:55pim6Ht4LJKdVLlyFJV/g++HsEA1hQxPbB5JyNdZC0= -github.com/chromedp/chromedp v0.5.4 h1:hQC6Wj+0mBu2B+HDF4eoAyTkDo0BnL16sz3gAAmZ8fc= -github.com/chromedp/chromedp v0.5.4/go.mod h1:Jl2gvx3U9zl4lS/dMjDVGXX0jZ4qo/vsGreqYME/lqc= -github.com/chromedp/sysutil v0.0.0-20201009230539-dc95e7e83e8a/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= -github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic= -github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -59,21 +50,11 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-chi/chi v4.1.0+incompatible h1:ETj3cggsVIY2Xao5ExCu6YhEh5MD6JTfcBzS37R260w= github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= -github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= -github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58 h1:YyrUZvJaU8Q0QsoVo+xLFBgWDTam29PKea6GYmwvSiQ= -github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= -github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= -github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= -github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs= -github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -116,8 +97,6 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= @@ -144,9 +123,6 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI= github.com/marten-seemann/qtls v0.2.3 h1:0yWJ43C62LsZt08vuQJDK1uC1czUc3FJeCLPoNAI4vA= github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= @@ -383,10 +359,6 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201202213521-69691e467435 h1:25AvDqqB9PrNqj1FLf2/70I4W0L19qqoaFq3gjNwbKk= -golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f h1:QdHQnPce6K4XQewki9WNbG5KOROuDzqO3NaYjI1cXJ0= golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From a6dccc753bc02180a984487debd8dc8485a55095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 26 Dec 2020 23:53:04 +0100 Subject: [PATCH 220/876] API update: control give memberId. --- internal/api/room/control.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index cf474ee8..efeb4e0b 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -3,6 +3,8 @@ package room import ( "net/http" + "github.com/go-chi/chi" + "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" "demodesk/neko/internal/utils" @@ -102,12 +104,9 @@ func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { } func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { - data := &ControlTargetPayload{} - if !utils.HttpJsonRequest(w, r, data) { - return - } + memberId := chi.URLParam(r, "memberId") - target, ok := h.sessions.Get(data.ID) + target, ok := h.sessions.Get(memberId) if !ok { utils.HttpBadRequest(w, "Target member was not found.") return From da71c9261d9b945e9e4a91fc1c7922fc896872a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 27 Dec 2020 17:07:09 +0100 Subject: [PATCH 221/876] API: Target member was not found, return 404. --- internal/api/room/control.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index efeb4e0b..de7648c4 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -108,7 +108,7 @@ func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { target, ok := h.sessions.Get(memberId) if !ok { - utils.HttpBadRequest(w, "Target member was not found.") + utils.HttpNotFound(w, "Target member was not found.") return } From 655d64105efe4aa27a449e3da7f27841a29b6389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 27 Dec 2020 21:07:09 +0100 Subject: [PATCH 222/876] HttpJsonRequest user friendly message. --- internal/utils/http.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/utils/http.go b/internal/utils/http.go index 4bf3e611..003f9e7c 100644 --- a/internal/utils/http.go +++ b/internal/utils/http.go @@ -1,6 +1,7 @@ package utils import ( + "io" "fmt" "net/http" "encoding/json" @@ -14,7 +15,12 @@ type ErrResponse struct { func HttpJsonRequest(w http.ResponseWriter, r *http.Request, res interface{}) bool { if err := json.NewDecoder(r.Body).Decode(res); err != nil { - HttpBadRequest(w, err) + if err == io.EOF { + HttpBadRequest(w, "No data provided.") + } else { + HttpBadRequest(w, err) + } + return false } From 245c3d9635242a5d9a5085e0b43a42c3de091722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 29 Dec 2020 22:00:28 +0100 Subject: [PATCH 223/876] add CanHostOnly. --- internal/http/auth/auth.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index e1cbd356..de1ebcfc 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -55,3 +55,14 @@ func HostsOrAdminsOnly(next http.Handler) http.Handler { } }) } + +func CanHostOnly(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + session := GetSession(r) + if !session.CanHost() { + utils.HttpForbidden(w, "Only for members, that can host.") + } else { + next.ServeHTTP(w, r) + } + }) +} From 4aa7da45e1a2e1bb87559aee1082c734948660dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jan 2021 19:39:21 +0100 Subject: [PATCH 224/876] screen change mutex, fixes "HTTP requests are not buffered - screen changing is failing". --- internal/desktop/xorg.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index c0f20d65..e4564624 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -1,10 +1,14 @@ package desktop import ( + "sync" + "demodesk/neko/internal/types" "demodesk/neko/internal/desktop/xorg" ) +var mu = sync.Mutex{} + func (manager *DesktopManagerCtx) Move(x, y int) { xorg.Move(x, y) } @@ -42,10 +46,15 @@ func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize { } func (manager *DesktopManagerCtx) ChangeScreenSize(width int, height int, rate int) error { + mu.Lock() manager.emmiter.Emit("before_screen_size_change") - err := xorg.ChangeScreenSize(width, height, rate) - manager.emmiter.Emit("after_screen_size_change") - return err + + defer func() { + manager.emmiter.Emit("after_screen_size_change") + mu.Unlock() + }() + + return xorg.ChangeScreenSize(width, height, rate) } func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string) { From a92ead019ec1529b0527fad90c6e0856e48dbb47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 6 Jan 2021 18:27:21 +0100 Subject: [PATCH 225/876] add drop bindings. --- Dockerfile | 2 +- internal/desktop/drop/drop.c | 100 ++++++++++++++++++++++++++++++++++ internal/desktop/drop/drop.go | 30 ++++++++++ internal/desktop/drop/drop.h | 29 ++++++++++ 4 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 internal/desktop/drop/drop.c create mode 100644 internal/desktop/drop/drop.go create mode 100644 internal/desktop/drop/drop.h diff --git a/Dockerfile b/Dockerfile index 7dbec88f..639a6263 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /src # install dependencies ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends git cmake make libx11-dev libxrandr-dev libxtst-dev \ + apt-get install -y --no-install-recommends git cmake make libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly; \ # # install libclipboard diff --git a/internal/desktop/drop/drop.c b/internal/desktop/drop/drop.c new file mode 100644 index 00000000..0307c40b --- /dev/null +++ b/internal/desktop/drop/drop.c @@ -0,0 +1,100 @@ +#include "drop.h" + +static void drag_data_get( + GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *data, + guint target_type, + guint time, + gpointer user_data +) { + gchar **uris = (gchar **) user_data; + + if (target_type == TARGET_TYPE_URI) { + gtk_selection_data_set_uris(data, uris); + return; + } + + if (target_type == TARGET_TYPE_TEXT) { + gtk_selection_data_set_text(data, uris[0], -1); + return; + } +} + +static void drag_end( + GtkWidget *widget, + GdkDragContext *context, + gpointer user_data +) { + gboolean succeeded = gdk_drag_drop_succeeded(context); + GdkDragAction action = gdk_drag_context_get_selected_action(context); + + char* action_str; + switch (action) { + case GDK_ACTION_COPY: + action_str = "COPY"; break; + case GDK_ACTION_MOVE: + action_str = "MOVE"; break; + case GDK_ACTION_LINK: + action_str = "LINK"; break; + case GDK_ACTION_ASK: + action_str = "ASK"; break; + default: + action_str = malloc(sizeof(char) * 20); + snprintf(action_str, 20, "invalid (%d)", action); + break; + } + + fprintf(stderr, "Selected drop action: %s; Succeeded: %d\n", action_str, succeeded); + if (action_str[0] == 'i') { + free(action_str); + } + + gtk_widget_destroy(widget); +} + +void drag_window(char **uris) { + gtk_init(NULL, NULL); + + GtkWidget *widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); + GtkWindow *window = GTK_WINDOW(widget); + + gtk_window_move(window, 0, 0); + gtk_window_set_title(window, "neko-drop"); + gtk_window_set_decorated(window, FALSE); + gtk_window_set_keep_above(window, TRUE); + gtk_window_set_default_size(window, 100, 100); + gtk_widget_set_opacity(widget, 0); + + GtkTargetList* target_list = gtk_target_list_new(NULL, 0); + gtk_target_list_add_uri_targets(target_list, TARGET_TYPE_URI); + gtk_target_list_add_text_targets(target_list, TARGET_TYPE_TEXT); + + gtk_drag_source_set(widget, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_ASK); + gtk_drag_source_set_target_list(widget, target_list); + + g_signal_connect(widget, "drag-data-get", G_CALLBACK(drag_data_get), uris); + g_signal_connect(widget, "drag-end", G_CALLBACK(drag_end), NULL); + g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); + + gtk_widget_show_all(widget); + gtk_main(); +} + +char **uris_make(int size) { + return calloc(size + 1, sizeof(char *)); +} + +void uris_set(char **uris, char *filename, int n) { + GFile *file = g_file_new_for_path(filename); + uris[n] = g_file_get_uri(file); +} + +void uris_free(char **uris, int size) { + int i; + for (i = 0; i < size; i++) { + free(uris[i]); + } + + free(uris); +} diff --git a/internal/desktop/drop/drop.go b/internal/desktop/drop/drop.go new file mode 100644 index 00000000..6f7d326b --- /dev/null +++ b/internal/desktop/drop/drop.go @@ -0,0 +1,30 @@ +package drop + +/* +#cgo linux CFLAGS: -I/usr/src -I/usr/local/include/ +#cgo pkg-config: gdk-3.0 gtk+-3.0 + +#include "drop.h" +*/ +import "C" + +import ( + "sync" +) + +var mu = sync.Mutex{} + +func FileDrop(x int, y int, uris []string) { + mu.Lock() + defer mu.Unlock() + + size := C.int(len(uris)) + urisUnsafe := C.uris_make(size); + defer C.uris_free(urisUnsafe, size) + + for i, uri := range uris { + C.uris_set(urisUnsafe, C.CString(uri), C.int(i)) + } + + C.drag_window(urisUnsafe) +} diff --git a/internal/desktop/drop/drop.h b/internal/desktop/drop/drop.h new file mode 100644 index 00000000..df0222dd --- /dev/null +++ b/internal/desktop/drop/drop.h @@ -0,0 +1,29 @@ +#pragma once + +#include + +enum { + TARGET_TYPE_TEXT, + TARGET_TYPE_URI +}; + +static void drag_data_get( + GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *data, + guint target_type, + guint time, + gpointer user_data +); + +static void drag_end( + GtkWidget *widget, + GdkDragContext *context, + gpointer user_data +); + +void drag_window(char **uris); + +char **uris_make(int size); +void uris_set(char **uris, char *filename, int n); +void uris_free(char **uris, int size); From 64187964d4ef31ae778329ae75ebdbffaf662374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 6 Jan 2021 18:54:55 +0100 Subject: [PATCH 226/876] uris -> files. --- internal/desktop/drop/drop.c | 6 +++--- internal/desktop/drop/drop.go | 8 ++++---- internal/desktop/drop/drop.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/desktop/drop/drop.c b/internal/desktop/drop/drop.c index 0307c40b..457808ac 100644 --- a/internal/desktop/drop/drop.c +++ b/internal/desktop/drop/drop.c @@ -85,9 +85,9 @@ char **uris_make(int size) { return calloc(size + 1, sizeof(char *)); } -void uris_set(char **uris, char *filename, int n) { - GFile *file = g_file_new_for_path(filename); - uris[n] = g_file_get_uri(file); +void uris_set_file(char **uris, char *file, int n) { + GFile *gfile = g_file_new_for_path(file); + uris[n] = g_file_get_uri(gfile); } void uris_free(char **uris, int size) { diff --git a/internal/desktop/drop/drop.go b/internal/desktop/drop/drop.go index 6f7d326b..3bc8b9b3 100644 --- a/internal/desktop/drop/drop.go +++ b/internal/desktop/drop/drop.go @@ -14,16 +14,16 @@ import ( var mu = sync.Mutex{} -func FileDrop(x int, y int, uris []string) { +func DragWindow(files []string) { mu.Lock() defer mu.Unlock() - size := C.int(len(uris)) + size := C.int(len(files)) urisUnsafe := C.uris_make(size); defer C.uris_free(urisUnsafe, size) - for i, uri := range uris { - C.uris_set(urisUnsafe, C.CString(uri), C.int(i)) + for i, file := range files { + C.uris_set_file(urisUnsafe, C.CString(file), C.int(i)) } C.drag_window(urisUnsafe) diff --git a/internal/desktop/drop/drop.h b/internal/desktop/drop/drop.h index df0222dd..6b128f1c 100644 --- a/internal/desktop/drop/drop.h +++ b/internal/desktop/drop/drop.h @@ -25,5 +25,5 @@ static void drag_end( void drag_window(char **uris); char **uris_make(int size); -void uris_set(char **uris, char *filename, int n); +void uris_set_file(char **uris, char *file, int n); void uris_free(char **uris, int size); From 62ba53dc46e8c5f34e35e293c76002786433b4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 6 Jan 2021 18:57:50 +0100 Subject: [PATCH 227/876] implement file drop API. --- internal/api/room/drop.go | 23 +++++++++++++++++++++++ internal/api/room/handler.go | 4 ++++ internal/desktop/drop.go | 24 ++++++++++++++++++++++++ internal/types/desktop.go | 3 +++ 4 files changed, 54 insertions(+) create mode 100644 internal/api/room/drop.go create mode 100644 internal/desktop/drop.go diff --git a/internal/api/room/drop.go b/internal/api/room/drop.go new file mode 100644 index 00000000..3a3b9191 --- /dev/null +++ b/internal/api/room/drop.go @@ -0,0 +1,23 @@ +package room + +import ( + "net/http" + + "demodesk/neko/internal/utils" +) + +type DropPayload struct { + X int `json:"x"` + Y int `json:"y"` + Files []string `json:"files"` +} + +func (h *RoomHandler) dropFiles(w http.ResponseWriter, r *http.Request) { + data := &DropPayload{} + if !utils.HttpJsonRequest(w, r, data) { + return + } + + h.desktop.DropFiles(data.X, data.Y, data.Files) + utils.HttpSuccess(w) +} diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 67868a18..374df970 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -60,4 +60,8 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Post("/", h.screenConfigurationChange) r.With(auth.AdminsOnly).Get("/configurations", h.screenConfigurationsList) }) + + r.Route("/drop", func(r chi.Router) { + r.With(auth.AdminsOnly).Post("/", h.dropFiles) + }) } diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go new file mode 100644 index 00000000..da8b6f77 --- /dev/null +++ b/internal/desktop/drop.go @@ -0,0 +1,24 @@ +package desktop + +import ( + "time" + "demodesk/neko/internal/desktop/drop" +) + +const ( + DELAY = 100 * time.Millisecond +) + +func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) { + go drop.DragWindow(files) + + // TODO: Find a bettter way. + time.Sleep(DELAY) + manager.Move(10, 10) + manager.ButtonDown(1) + manager.Move(x, y) + time.Sleep(DELAY) + manager.Move(x, y) + time.Sleep(DELAY) + manager.ButtonUp(1) +} diff --git a/internal/types/desktop.go b/internal/types/desktop.go index ae206053..1bded734 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -35,4 +35,7 @@ type DesktopManager interface { // clipboard ReadClipboard() string WriteClipboard(data string) + + // drop + DropFiles(x int, y int, files []string) } From a104fc0525e2b3cfbef38d7bc9d99b76e0b3d185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 6 Jan 2021 18:58:16 +0100 Subject: [PATCH 228/876] change formatting. --- internal/desktop/drop/drop.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/desktop/drop/drop.h b/internal/desktop/drop/drop.h index 6b128f1c..da2a06e9 100644 --- a/internal/desktop/drop/drop.h +++ b/internal/desktop/drop/drop.h @@ -8,18 +8,18 @@ enum { }; static void drag_data_get( - GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *data, - guint target_type, - guint time, - gpointer user_data + GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *data, + guint target_type, + guint time, + gpointer user_data ); static void drag_end( - GtkWidget *widget, - GdkDragContext *context, - gpointer user_data + GtkWidget *widget, + GdkDragContext *context, + gpointer user_data ); void drag_window(char **uris); From 3e52b264ba8858d50671fc9a676434750ea1b91c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 6 Jan 2021 20:03:41 +0100 Subject: [PATCH 229/876] API drop file upload. --- internal/api/room/drop.go | 70 ++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/internal/api/room/drop.go b/internal/api/room/drop.go index 3a3b9191..145c53b2 100644 --- a/internal/api/room/drop.go +++ b/internal/api/room/drop.go @@ -1,23 +1,77 @@ package room import ( + "os" + "io" + "io/ioutil" + "path" + "strconv" "net/http" "demodesk/neko/internal/utils" ) -type DropPayload struct { - X int `json:"x"` - Y int `json:"y"` - Files []string `json:"files"` -} +const ( + // Maximum upload of 32 MB files. + MAX_UPLOAD_SIZE = 32 << 20 +) func (h *RoomHandler) dropFiles(w http.ResponseWriter, r *http.Request) { - data := &DropPayload{} - if !utils.HttpJsonRequest(w, r, data) { + r.ParseMultipartForm(MAX_UPLOAD_SIZE) + + X, err := strconv.Atoi(r.FormValue("x")) + if err != nil { + utils.HttpBadRequest(w, err) return } - h.desktop.DropFiles(data.X, data.Y, data.Files) + Y, err := strconv.Atoi(r.FormValue("y")) + if err != nil { + utils.HttpBadRequest(w, err) + return + } + + req_files := r.MultipartForm.File["files"] + if len(req_files) == 0 { + utils.HttpBadRequest(w, "No file received.") + return + } + + dir, err := ioutil.TempDir("", "neko-drop-*") + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + files := []string{} + for _, req_file := range req_files { + path := path.Join(dir, req_file.Filename) + + srcFile, err := req_file.Open() + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + defer srcFile.Close() + + dstFile, err := os.OpenFile(path, os.O_APPEND | os.O_CREATE | os.O_WRONLY, 0644) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + defer dstFile.Close() + + _, err = io.Copy(dstFile, srcFile) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + files = append(files, path) + } + + h.desktop.DropFiles(X, Y, files) utils.HttpSuccess(w) } From 39208f1ea55c6a2d1cf2c2af290ac7d8742ab1bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 6 Jan 2021 20:16:21 +0100 Subject: [PATCH 230/876] drop: chrome weird behavior, multiple cursor moves. --- internal/desktop/drop.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index da8b6f77..60208c6f 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -20,5 +20,7 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) { time.Sleep(DELAY) manager.Move(x, y) time.Sleep(DELAY) + manager.Move(x, y) + time.Sleep(DELAY) manager.ButtonUp(1) } From 3f9fffe96d9bbdf48dca2ebb77f2900e15243353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 7 Jan 2021 18:27:50 +0100 Subject: [PATCH 231/876] desktop drop -> gtk. --- internal/desktop/{drop.go => gtk.go} | 4 ++-- internal/desktop/{drop/drop.c => gtk/gtk.c} | 2 +- internal/desktop/{drop/drop.go => gtk/gtk.go} | 4 ++-- internal/desktop/{drop/drop.h => gtk/gtk.h} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename internal/desktop/{drop.go => gtk.go} (85%) rename internal/desktop/{drop/drop.c => gtk/gtk.c} (99%) rename internal/desktop/{drop/drop.go => gtk/gtk.go} (93%) rename internal/desktop/{drop/drop.h => gtk/gtk.h} (100%) diff --git a/internal/desktop/drop.go b/internal/desktop/gtk.go similarity index 85% rename from internal/desktop/drop.go rename to internal/desktop/gtk.go index 60208c6f..70e1a714 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/gtk.go @@ -2,7 +2,7 @@ package desktop import ( "time" - "demodesk/neko/internal/desktop/drop" + "demodesk/neko/internal/desktop/gtk" ) const ( @@ -10,7 +10,7 @@ const ( ) func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) { - go drop.DragWindow(files) + go gtk.DragWindow(files) // TODO: Find a bettter way. time.Sleep(DELAY) diff --git a/internal/desktop/drop/drop.c b/internal/desktop/gtk/gtk.c similarity index 99% rename from internal/desktop/drop/drop.c rename to internal/desktop/gtk/gtk.c index 457808ac..1184d695 100644 --- a/internal/desktop/drop/drop.c +++ b/internal/desktop/gtk/gtk.c @@ -1,4 +1,4 @@ -#include "drop.h" +#include "gtk.h" static void drag_data_get( GtkWidget *widget, diff --git a/internal/desktop/drop/drop.go b/internal/desktop/gtk/gtk.go similarity index 93% rename from internal/desktop/drop/drop.go rename to internal/desktop/gtk/gtk.go index 3bc8b9b3..d4dc81de 100644 --- a/internal/desktop/drop/drop.go +++ b/internal/desktop/gtk/gtk.go @@ -1,10 +1,10 @@ -package drop +package gtk /* #cgo linux CFLAGS: -I/usr/src -I/usr/local/include/ #cgo pkg-config: gdk-3.0 gtk+-3.0 -#include "drop.h" +#include "gtk.h" */ import "C" diff --git a/internal/desktop/drop/drop.h b/internal/desktop/gtk/gtk.h similarity index 100% rename from internal/desktop/drop/drop.h rename to internal/desktop/gtk/gtk.h From d3340ad0850b4823e9286b86a4682366636c43fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 7 Jan 2021 18:28:23 +0100 Subject: [PATCH 232/876] upload drop change API. --- internal/api/room/handler.go | 4 ++-- internal/api/room/{drop.go => upload.go} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename internal/api/room/{drop.go => upload.go} (94%) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 374df970..c76937a7 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -61,7 +61,7 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Get("/configurations", h.screenConfigurationsList) }) - r.Route("/drop", func(r chi.Router) { - r.With(auth.AdminsOnly).Post("/", h.dropFiles) + r.With(auth.HostsOnly).Route("/upload", func(r chi.Router) { + r.Post("/drop", h.uploadDrop) }) } diff --git a/internal/api/room/drop.go b/internal/api/room/upload.go similarity index 94% rename from internal/api/room/drop.go rename to internal/api/room/upload.go index 145c53b2..03f2c3aa 100644 --- a/internal/api/room/drop.go +++ b/internal/api/room/upload.go @@ -16,7 +16,7 @@ const ( MAX_UPLOAD_SIZE = 32 << 20 ) -func (h *RoomHandler) dropFiles(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { r.ParseMultipartForm(MAX_UPLOAD_SIZE) X, err := strconv.Atoi(r.FormValue("x")) From a6afccd0797b599150cbf3b1d2907edbb1fcdec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 8 Jan 2021 22:03:50 +0100 Subject: [PATCH 233/876] desktop single mutex shared gtk. --- internal/desktop/gtk.go | 3 +++ internal/desktop/manager.go | 3 +++ internal/desktop/xorg.go | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/desktop/gtk.go b/internal/desktop/gtk.go index 70e1a714..4d009b9e 100644 --- a/internal/desktop/gtk.go +++ b/internal/desktop/gtk.go @@ -10,6 +10,9 @@ const ( ) func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) { + mu.Lock() + defer mu.Unlock() + go gtk.DragWindow(files) // TODO: Find a bettter way. diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 2a1cde0d..62e5e3df 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -3,6 +3,7 @@ package desktop import ( "fmt" "time" + "sync" "github.com/kataras/go-events" "github.com/rs/zerolog" @@ -12,6 +13,8 @@ import ( "demodesk/neko/internal/desktop/xorg" ) +var mu = sync.Mutex{} + type DesktopManagerCtx struct { logger zerolog.Logger cleanup *time.Ticker diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index e4564624..90faa4a2 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -1,14 +1,10 @@ package desktop import ( - "sync" - "demodesk/neko/internal/types" "demodesk/neko/internal/desktop/xorg" ) -var mu = sync.Mutex{} - func (manager *DesktopManagerCtx) Move(x, y int) { xorg.Move(x, y) } From fc6997d2accd8b70ade5d6cf2b42a4418d23cc4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 8 Jan 2021 22:41:37 +0100 Subject: [PATCH 234/876] lint fix. --- internal/api/members/handler.go | 2 +- internal/http/auth/auth.go | 2 +- internal/session/database/file/adapter.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index a580cc81..0320c7e6 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -14,7 +14,7 @@ import ( type key int const ( - keyMemberCtx key = iota + keyMemberCtx key = iota ) type MembersHandler struct { diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index de1ebcfc..625337b2 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -11,7 +11,7 @@ import ( type key int const ( - keySessionCtx key = iota + keySessionCtx key = iota ) func SetSession(r *http.Request, session types.Session) *http.Request { diff --git a/internal/session/database/file/adapter.go b/internal/session/database/file/adapter.go index 69954103..e24c0067 100644 --- a/internal/session/database/file/adapter.go +++ b/internal/session/database/file/adapter.go @@ -1,8 +1,8 @@ package file import ( - "encoding/json" - "io/ioutil" + "encoding/json" + "io/ioutil" "os" "fmt" "sync" @@ -101,7 +101,7 @@ func (manager *MembersDatabaseCtx) deserialize() (map[string]types.MemberProfile return nil, err } - raw, err := ioutil.ReadAll(file) + raw, err := ioutil.ReadAll(file) if err != nil { return nil, err } From d65ba62bfc6734c092c90ece1c045b073b42ea55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 8 Jan 2021 23:42:53 +0100 Subject: [PATCH 235/876] upload middleware: fix permissions issue. --- internal/api/room/handler.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index c76937a7..298d8f10 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -1,10 +1,13 @@ package room import ( + "net/http" + "github.com/go-chi/chi" "demodesk/neko/internal/types" "demodesk/neko/internal/http/auth" + "demodesk/neko/internal/utils" ) type RoomHandler struct { @@ -61,7 +64,18 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Get("/configurations", h.screenConfigurationsList) }) - r.With(auth.HostsOnly).Route("/upload", func(r chi.Router) { + r.With(h.uploadMiddleware).Route("/upload", func(r chi.Router) { r.Post("/drop", h.uploadDrop) }) } + +func (h *RoomHandler) uploadMiddleware(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + session := auth.GetSession(r) + if !session.IsHost() && !h.sessions.ImplicitHosting() { + utils.HttpForbidden(w, "Without implicit hosting, only host can upload files.") + } else { + next.ServeHTTP(w, r) + } + }) +} From fad6b649d3dd2ffed60105c9a15abc6738c98769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 9 Jan 2021 13:42:08 +0100 Subject: [PATCH 236/876] upload, implicit hosting, only members that can control. --- internal/api/room/handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 298d8f10..ce49dcca 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -72,7 +72,7 @@ func (h *RoomHandler) Route(r chi.Router) { func (h *RoomHandler) uploadMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) - if !session.IsHost() && !h.sessions.ImplicitHosting() { + if !session.IsHost() && (!session.CanHost() || !h.sessions.ImplicitHosting()) { utils.HttpForbidden(w, "Without implicit hosting, only host can upload files.") } else { next.ServeHTTP(w, r) From 9f3bc0261c6aa95a858cc847b9a524737b929876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 9 Jan 2021 16:24:05 +0100 Subject: [PATCH 237/876] update upload API error reporting & cleanup. --- internal/api/room/upload.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 03f2c3aa..acb6bc0f 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -21,19 +21,24 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { X, err := strconv.Atoi(r.FormValue("x")) if err != nil { - utils.HttpBadRequest(w, err) + utils.HttpBadRequest(w, "No X coordinate received.") return } Y, err := strconv.Atoi(r.FormValue("y")) if err != nil { - utils.HttpBadRequest(w, err) + utils.HttpBadRequest(w, "No Y coordinate received.") + return + } + + if r.MultipartForm == nil { + utils.HttpBadRequest(w, "No MultipartForm received.") return } req_files := r.MultipartForm.File["files"] if len(req_files) == 0 { - utils.HttpBadRequest(w, "No file received.") + utils.HttpBadRequest(w, "No files received.") return } @@ -73,5 +78,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { } h.desktop.DropFiles(X, Y, files) + + r.MultipartForm.RemoveAll() utils.HttpSuccess(w) } From 44c8f8f62e07250c40581f710c10a93b47af5675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 9 Jan 2021 16:33:41 +0100 Subject: [PATCH 238/876] gtk window transparent. --- internal/desktop/gtk/gtk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/desktop/gtk/gtk.c b/internal/desktop/gtk/gtk.c index 1184d695..f49772fa 100644 --- a/internal/desktop/gtk/gtk.c +++ b/internal/desktop/gtk/gtk.c @@ -64,6 +64,11 @@ void drag_window(char **uris) { gtk_window_set_decorated(window, FALSE); gtk_window_set_keep_above(window, TRUE); gtk_window_set_default_size(window, 100, 100); + + gtk_widget_set_app_paintable(widget, TRUE); + GdkScreen *screen = gtk_widget_get_screen(widget); + GdkVisual *visual = gdk_screen_get_rgba_visual(screen); + gtk_widget_set_visual(widget, visual); gtk_widget_set_opacity(widget, 0); GtkTargetList* target_list = gtk_target_list_new(NULL, 0); From ab1d18b562875be786cc3592aad5332a9a67fa81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 9 Jan 2021 16:40:24 +0100 Subject: [PATCH 239/876] zero sized gtk window. --- internal/desktop/gtk.go | 3 ++- internal/desktop/gtk/gtk.c | 8 +------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/desktop/gtk.go b/internal/desktop/gtk.go index 4d009b9e..451447cc 100644 --- a/internal/desktop/gtk.go +++ b/internal/desktop/gtk.go @@ -2,6 +2,7 @@ package desktop import ( "time" + "demodesk/neko/internal/desktop/gtk" ) @@ -17,7 +18,7 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) { // TODO: Find a bettter way. time.Sleep(DELAY) - manager.Move(10, 10) + manager.Move(0, 0) manager.ButtonDown(1) manager.Move(x, y) time.Sleep(DELAY) diff --git a/internal/desktop/gtk/gtk.c b/internal/desktop/gtk/gtk.c index f49772fa..4840d262 100644 --- a/internal/desktop/gtk/gtk.c +++ b/internal/desktop/gtk/gtk.c @@ -63,13 +63,7 @@ void drag_window(char **uris) { gtk_window_set_title(window, "neko-drop"); gtk_window_set_decorated(window, FALSE); gtk_window_set_keep_above(window, TRUE); - gtk_window_set_default_size(window, 100, 100); - - gtk_widget_set_app_paintable(widget, TRUE); - GdkScreen *screen = gtk_widget_get_screen(widget); - GdkVisual *visual = gdk_screen_get_rgba_visual(screen); - gtk_widget_set_visual(widget, visual); - gtk_widget_set_opacity(widget, 0); + gtk_window_set_default_size(window, 0, 0); GtkTargetList* target_list = gtk_target_list_new(NULL, 0); gtk_target_list_add_uri_targets(target_list, TARGET_TYPE_URI); From 93b1553b4d65928e15c90d7c9a6277fb3c18d73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 9 Jan 2021 22:58:18 +0100 Subject: [PATCH 240/876] xlib get cursor implementation. --- internal/desktop/xorg.go | 4 ++++ internal/desktop/xorg/xorg.c | 5 +++++ internal/desktop/xorg/xorg.go | 24 +++++++++++++++++++++++- internal/desktop/xorg/xorg.h | 2 ++ internal/types/desktop.go | 10 ++++++++++ 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 90faa4a2..370d02f4 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -60,3 +60,7 @@ func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string) { func (manager *DesktopManagerCtx) SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) { xorg.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) } + +func (manager *DesktopManagerCtx) GetCursorImage() *types.CursorImage { + return xorg.GetCursorImage() +} diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index f631fc5e..85b0553a 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -146,3 +146,8 @@ void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock) { XFlush(display); } + +XFixesCursorImage *XGetCursorImage(void) { + Display *display = getXDisplay(); + return XFixesGetCursorImage(display); +} diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 0b5ad44e..d05d3ee0 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -2,7 +2,7 @@ package xorg /* #cgo linux CFLAGS: -I/usr/src -I/usr/local/include/ -#cgo linux LDFLAGS: -L/usr/src -L/usr/local/lib -lX11 -lXtst -lXrandr -lxcb +#cgo linux LDFLAGS: -L/usr/src -L/usr/local/lib -lX11 -lxcb -lXrandr -lXtst -lXfixes #include "xorg.h" */ @@ -219,6 +219,28 @@ func SetKeyboardModifiers(num_lock int, caps_lock int, scroll_lock int) { C.SetKeyboardModifiers(C.int(num_lock), C.int(caps_lock), C.int(scroll_lock)) } +func GetCursorImage() *types.CursorImage { + mu.Lock() + defer mu.Unlock() + + var cur *C.XFixesCursorImage + cur = C.XGetCursorImage() + defer C.XFree(unsafe.Pointer(cur)) + + width := uint16(cur.width) + height := uint16(cur.height) + + return &types.CursorImage{ + Width: width, + Height: height, + Xhot: uint16(cur.xhot), + Yhot: uint16(cur.yhot), + Serial: uint64(cur.cursor_serial), + // Xlib stores 32-bit data in longs, even if longs are 64-bits long. + Pixels: C.GoBytes(unsafe.Pointer(cur.pixels), C.int(width * height * 8)), + } +} + //export goCreateScreenSize func goCreateScreenSize(index C.int, width C.int, height C.int, mwidth C.int, mheight C.int) { ScreenConfigurations[int(index)] = types.ScreenConfiguration{ diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index 426769a0..4b228f9e 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -30,5 +31,6 @@ short XGetScreenRate(); void SetKeyboardLayout(char *layout); void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock); +XFixesCursorImage *XGetCursorImage(void); #endif diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 1bded734..7acee29e 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -1,5 +1,14 @@ package types +type CursorImage struct { + Width uint16 + Height uint16 + Xhot uint16 + Yhot uint16 + Serial uint64 + Pixels []byte +} + type ScreenSize struct { Width int Height int @@ -31,6 +40,7 @@ type DesktopManager interface { GetScreenSize() *ScreenSize SetKeyboardLayout(layout string) SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) + GetCursorImage() *CursorImage // clipboard ReadClipboard() string From 9112d99c5478155b3700e54bb185ad6b724ab02d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 9 Jan 2021 23:01:18 +0100 Subject: [PATCH 241/876] add cursor image to uri convertor. --- internal/utils/cursor.go | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 internal/utils/cursor.go diff --git a/internal/utils/cursor.go b/internal/utils/cursor.go new file mode 100644 index 00000000..d1c148d2 --- /dev/null +++ b/internal/utils/cursor.go @@ -0,0 +1,40 @@ +package utils + +import ( + "bytes" + "image" + "image/color" + "image/png" + "encoding/base64" + + "demodesk/neko/internal/types" +) + +func GetCursorImageURI(cursor *types.CursorImage) (string, error) { + width := int(cursor.Width) + height := int(cursor.Height) + pixels := cursor.Pixels + + img := image.NewRGBA(image.Rect(0, 0, width, height)) + for row := 0; row < height; row++ { + for col := 0; col < width; col++ { + pos := ((row * height) + col) * 8 + + img.SetRGBA(col, row, color.RGBA{ + A: pixels[pos+3], + R: pixels[pos+2], + G: pixels[pos+1], + B: pixels[pos+0], + }) + } + } + + out := new(bytes.Buffer) + err := png.Encode(out, img) + if err != nil { + return "", err + } + + uri := "data:image/png;base64," + base64.StdEncoding.EncodeToString(out.Bytes()) + return uri, nil +} From 9782b8391d2a785350d35708b6b3741aa8726a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 9 Jan 2021 23:01:39 +0100 Subject: [PATCH 242/876] cursor updates to client (WIP). --- internal/websocket/manager.go | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index b4133538..5b8005b5 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -9,10 +9,10 @@ import ( "github.com/rs/zerolog/log" "demodesk/neko/internal/websocket/handler" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" - - "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" ) func New( @@ -107,12 +107,29 @@ func (ws *WebSocketManagerCtx) Start() { }() current := ws.desktop.ReadClipboard() + cursor := uint64(0) for { select { case <-ws.shutdown: return default: + cur := ws.desktop.GetCursorImage() + if cursor != cur.Serial || cur.Serial == 0 { + cursor = cur.Serial + + // TODO: Refactor. + uri, _ := utils.GetCursorImageURI(cur) + ws.sessions.Broadcast(message.Message{ + Event: "cursor/image", + Payload: struct{ + Xhot uint16 + Yhot uint16 + Uri string + }{ cur.Xhot, cur.Yhot, uri }, + }, nil) + } + session := ws.sessions.GetHost() if session == nil { break From 589628f6ca204e204f7127f6976fe9578cdb1a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 10 Jan 2021 12:37:32 +0100 Subject: [PATCH 243/876] cursor image as WS event. --- internal/types/event/events.go | 4 ++++ internal/types/message/messages.go | 13 +++++++++++++ internal/websocket/manager.go | 15 +++++++-------- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 94574dce..48a6a6f9 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -44,6 +44,10 @@ const ( KEYBOARD_LAYOUT = "keyboard/layout" ) +const ( + CURSOR_IMAGE = "cursor/image" +) + const ( BORADCAST_STATUS = "broadcast/status" ) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 5766331f..f220e8cd 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -143,6 +143,19 @@ type KeyboardLayout struct { Layout string `json:"layout"` } +///////////////////////////// +// Cursor +///////////////////////////// + +type CursorImage struct { + Event string `json:"event,omitempty"` + Uri string `json:"uri"` + Width uint16 `json:"width"` + Height uint16 `json:"height"` + X uint16 `json:"x"` + Y uint16 `json:"y"` +} + ///////////////////////////// // Broadcast ///////////////////////////// diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 5b8005b5..f9c2d0e6 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -118,15 +118,14 @@ func (ws *WebSocketManagerCtx) Start() { if cursor != cur.Serial || cur.Serial == 0 { cursor = cur.Serial - // TODO: Refactor. uri, _ := utils.GetCursorImageURI(cur) - ws.sessions.Broadcast(message.Message{ - Event: "cursor/image", - Payload: struct{ - Xhot uint16 - Yhot uint16 - Uri string - }{ cur.Xhot, cur.Yhot, uri }, + ws.sessions.Broadcast(message.CursorImage{ + Event: event.CURSOR_IMAGE, + Uri: uri, + Width: cur.Width, + Height: cur.Height, + X: cur.Xhot, + Y: cur.Yhot, }, nil) } From a7d4511037d64f30862a85d9cea3f5eed50adce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 10 Jan 2021 12:42:07 +0100 Subject: [PATCH 244/876] cursor Image on connect. --- internal/types/message/messages.go | 1 + internal/websocket/handler/system.go | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index f220e8cd..a3b9ba4b 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -20,6 +20,7 @@ type SystemInit struct { ScreenSize ScreenSize `json:"screen_size"` Members map[string]MemberData `json:"members"` ImplicitHosting bool `json:"implicit_hosting"` + CursorImage *CursorImage `json:"cursor_image"` } type SystemAdmin struct { diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 08802081..4f08831d 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -4,6 +4,7 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" + "demodesk/neko/internal/utils" ) func (h *MessageHandlerCtx) systemInit(session types.Session) error { @@ -32,6 +33,20 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { } } + var cursorImage *message.CursorImage + cur := h.desktop.GetCursorImage() + uri, err := utils.GetCursorImageURI(cur) + if err == nil { + cursorImage = &message.CursorImage{ + Event: event.CURSOR_IMAGE, + Uri: uri, + Width: cur.Width, + Height: cur.Height, + X: cur.Xhot, + Y: cur.Yhot, + } + } + return session.Send( message.SystemInit{ Event: event.SYSTEM_INIT, @@ -44,6 +59,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { }, Members: members, ImplicitHosting: h.sessions.ImplicitHosting(), + CursorImage: cursorImage, }) } From 0f19b6ed57719fd07845d57b08fa8f92b77352ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 10 Jan 2021 15:55:29 +0100 Subject: [PATCH 245/876] add xevent c bindings. --- internal/desktop/xevent/xevent.c | 45 +++++++++++++++++++++++++ internal/desktop/xevent/xevent.go | 55 +++++++++++++++++++++++++++++++ internal/desktop/xevent/xevent.h | 15 +++++++++ 3 files changed, 115 insertions(+) create mode 100644 internal/desktop/xevent/xevent.c create mode 100644 internal/desktop/xevent/xevent.go create mode 100644 internal/desktop/xevent/xevent.h diff --git a/internal/desktop/xevent/xevent.c b/internal/desktop/xevent/xevent.c new file mode 100644 index 00000000..d7dfe5f1 --- /dev/null +++ b/internal/desktop/xevent/xevent.c @@ -0,0 +1,45 @@ +#include "xevent.h" + +static int XEventError(Display *display, XErrorEvent *event) { + char message[100]; + + int error; + error = XGetErrorText(display, event->error_code, message, sizeof(message)); + if (error) { + goXEventError(event, "Could not get error message."); + } else { + goXEventError(event, message); + } + + return 1; +} + +void XEventLoop(char *name) { + Display *display = XOpenDisplay(name); + Window root = RootWindow(display, 0); + + int xfixes_event_base, xfixes_error_base; + if (!XFixesQueryExtension(display, &xfixes_event_base, &xfixes_error_base)) { + return; + } + + XFixesSelectCursorInput(display, root, XFixesDisplayCursorNotifyMask); + XSync(display, 0); + XSetErrorHandler(XEventError); + + while (goXEventActive()) { + XEvent event; + XNextEvent(display, &event); + + // XFixesDisplayCursorNotify + if (event.type == xfixes_event_base + 1) { + XFixesCursorNotifyEvent notifyEvent = *((XFixesCursorNotifyEvent *) &event); + if (notifyEvent.subtype == XFixesDisplayCursorNotify) { + goXEventCursorChanged(notifyEvent); + continue; + } + } + } + + XCloseDisplay(display); +} diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go new file mode 100644 index 00000000..6a6fb4c0 --- /dev/null +++ b/internal/desktop/xevent/xevent.go @@ -0,0 +1,55 @@ +package xevent + +/* +#cgo linux CFLAGS: -I/usr/src -I/usr/local/include/ +#cgo linux LDFLAGS: -L/usr/src -L/usr/local/lib -lX11 -lxcb -lXfixes + +#include "xevent.h" +*/ +import "C" + +import ( + "unsafe" + + "github.com/kataras/go-events" +) + +var emmiter events.EventEmmiter + +func init() { + emmiter = events.New() +} + +func EventLoop(display string) { + displayUnsafe := C.CString(display) + defer C.free(unsafe.Pointer(displayUnsafe)) + + C.XEventLoop(displayUnsafe) +} + +func OnCursorChanged(listener func(serial uint64)) { + emmiter.On("cursor-changed", func(payload ...interface{}) { + listener(payload[0].(uint64)) + }) +} + +func OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { + emmiter.On("event-error", func(payload ...interface{}) { + listener(payload[0].(uint8), payload[1].(string), payload[2].(uint8), payload[3].(uint8)) + }) +} + +//export goXEventCursorChanged +func goXEventCursorChanged(event C.XFixesCursorNotifyEvent) { + emmiter.Emit("cursor-changed", uint64(event.cursor_serial)) +} + +//export goXEventError +func goXEventError(event *C.XErrorEvent, message *C.char) { + emmiter.Emit("event-error", uint8(event.error_code), C.GoString(message), uint8(event.request_code), uint8(event.minor_code)) +} + +//export goXEventActive +func goXEventActive() C.int { + return C.int(1) +} diff --git a/internal/desktop/xevent/xevent.h b/internal/desktop/xevent/xevent.h new file mode 100644 index 00000000..24949f45 --- /dev/null +++ b/internal/desktop/xevent/xevent.h @@ -0,0 +1,15 @@ +#pragma once + +#include +#include +#include +#include +#include + +extern void goXEventCursorChanged(XFixesCursorNotifyEvent event); +extern void goXEventError(XErrorEvent *event, char *message); +extern int goXEventActive(); + +static int XEventError(Display *display, XErrorEvent *event); +void XEventLoop(char *display); + From 910f0af995a752e9596ef8a9fd537af1e54a73d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 10 Jan 2021 15:58:17 +0100 Subject: [PATCH 246/876] xevent cursor change. --- internal/desktop/manager.go | 3 +++ internal/desktop/xevent.go | 13 +++++++++++++ internal/types/desktop.go | 4 ++++ internal/websocket/manager.go | 35 +++++++++++++++++++---------------- 4 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 internal/desktop/xevent.go diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 62e5e3df..96ddac60 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -11,6 +11,7 @@ import ( "demodesk/neko/internal/config" "demodesk/neko/internal/desktop/xorg" + "demodesk/neko/internal/desktop/xevent" ) var mu = sync.Mutex{} @@ -50,6 +51,8 @@ func (manager *DesktopManagerCtx) Start() { manager.logger.Warn().Err(err).Msg("unable to set initial screen size") } + go xevent.EventLoop(manager.display) + go func() { defer func() { xorg.DisplayClose() diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go new file mode 100644 index 00000000..1bea6213 --- /dev/null +++ b/internal/desktop/xevent.go @@ -0,0 +1,13 @@ +package desktop + +import ( + "demodesk/neko/internal/desktop/xevent" +) + +func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) { + xevent.OnCursorChanged(listener) +} + +func (manager *DesktopManagerCtx) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { + xevent.OnEventError(listener) +} diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 7acee29e..bb694be4 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -42,6 +42,10 @@ type DesktopManager interface { SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) GetCursorImage() *CursorImage + // xevent + OnCursorChanged(listener func(serial uint64)) + OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) + // clipboard ReadClipboard() string WriteClipboard(data string) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index f9c2d0e6..6892a3c9 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -99,6 +99,25 @@ func (ws *WebSocketManagerCtx) Start() { } }) + // TOOD: Throttle events. + ws.desktop.OnCursorChanged(func(serial uint64) { + cur := ws.desktop.GetCursorImage() + uri, err := utils.GetCursorImageURI(cur) + if err != nil { + ws.logger.Warn().Err(err).Msg("could create cursor image") + return + } + + ws.sessions.Broadcast(message.CursorImage{ + Event: event.CURSOR_IMAGE, + Uri: uri, + Width: cur.Width, + Height: cur.Height, + X: cur.Xhot, + Y: cur.Yhot, + }, nil) + }) + go func() { ws.logger.Info().Msg("clipboard loop started") @@ -107,28 +126,12 @@ func (ws *WebSocketManagerCtx) Start() { }() current := ws.desktop.ReadClipboard() - cursor := uint64(0) for { select { case <-ws.shutdown: return default: - cur := ws.desktop.GetCursorImage() - if cursor != cur.Serial || cur.Serial == 0 { - cursor = cur.Serial - - uri, _ := utils.GetCursorImageURI(cur) - ws.sessions.Broadcast(message.CursorImage{ - Event: event.CURSOR_IMAGE, - Uri: uri, - Width: cur.Width, - Height: cur.Height, - X: cur.Xhot, - Y: cur.Yhot, - }, nil) - } - session := ws.sessions.GetHost() if session == nil { break From a2ca3727fe2ba816d1880365540bcfa3033a481b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 11 Jan 2021 15:30:53 +0100 Subject: [PATCH 247/876] xevent to update clipboard. --- internal/desktop/xevent.go | 4 +++ internal/desktop/xevent/xevent.c | 13 +++++++ internal/desktop/xevent/xevent.go | 11 ++++++ internal/desktop/xevent/xevent.h | 2 ++ internal/types/desktop.go | 1 + internal/websocket/manager.go | 57 ++++++++----------------------- 6 files changed, 46 insertions(+), 42 deletions(-) diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index 1bea6213..972c4e43 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -8,6 +8,10 @@ func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) xevent.OnCursorChanged(listener) } +func (manager *DesktopManagerCtx) OnClipboardUpdated(listener func()) { + xevent.OnClipboardUpdated(listener) +} + func (manager *DesktopManagerCtx) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { xevent.OnEventError(listener) } diff --git a/internal/desktop/xevent/xevent.c b/internal/desktop/xevent/xevent.c index d7dfe5f1..31216026 100644 --- a/internal/desktop/xevent/xevent.c +++ b/internal/desktop/xevent/xevent.c @@ -23,7 +23,11 @@ void XEventLoop(char *name) { return; } + Atom XA_CLIPBOARD; + XA_CLIPBOARD = XInternAtom(display, "CLIPBOARD", 0); + XFixesSelectSelectionInput(display, root, XA_CLIPBOARD, XFixesSetSelectionOwnerNotifyMask); XFixesSelectCursorInput(display, root, XFixesDisplayCursorNotifyMask); + XSync(display, 0); XSetErrorHandler(XEventError); @@ -39,6 +43,15 @@ void XEventLoop(char *name) { continue; } } + + // XFixesSelectionNotifyEvent + if (event.type == xfixes_event_base + XFixesSelectionNotify) { + XFixesSelectionNotifyEvent notifyEvent = *((XFixesSelectionNotifyEvent *) &event); + if (notifyEvent.subtype == XFixesSetSelectionOwnerNotify && notifyEvent.selection == XA_CLIPBOARD) { + goXEventClipboardUpdated(); + continue; + } + } } XCloseDisplay(display); diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go index 6a6fb4c0..9f8d6343 100644 --- a/internal/desktop/xevent/xevent.go +++ b/internal/desktop/xevent/xevent.go @@ -33,6 +33,12 @@ func OnCursorChanged(listener func(serial uint64)) { }) } +func OnClipboardUpdated(listener func()) { + emmiter.On("clipboard-updated", func(payload ...interface{}) { + listener() + }) +} + func OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { emmiter.On("event-error", func(payload ...interface{}) { listener(payload[0].(uint8), payload[1].(string), payload[2].(uint8), payload[3].(uint8)) @@ -44,6 +50,11 @@ func goXEventCursorChanged(event C.XFixesCursorNotifyEvent) { emmiter.Emit("cursor-changed", uint64(event.cursor_serial)) } +//export goXEventClipboardUpdated +func goXEventClipboardUpdated() { + emmiter.Emit("clipboard-updated") +} + //export goXEventError func goXEventError(event *C.XErrorEvent, message *C.char) { emmiter.Emit("event-error", uint8(event.error_code), C.GoString(message), uint8(event.request_code), uint8(event.minor_code)) diff --git a/internal/desktop/xevent/xevent.h b/internal/desktop/xevent/xevent.h index 24949f45..e735c0c4 100644 --- a/internal/desktop/xevent/xevent.h +++ b/internal/desktop/xevent/xevent.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include #include @@ -7,6 +8,7 @@ #include extern void goXEventCursorChanged(XFixesCursorNotifyEvent event); +extern void goXEventClipboardUpdated(); extern void goXEventError(XErrorEvent *event, char *message); extern int goXEventActive(); diff --git a/internal/types/desktop.go b/internal/types/desktop.go index bb694be4..60a18403 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -44,6 +44,7 @@ type DesktopManager interface { // xevent OnCursorChanged(listener func(serial uint64)) + OnClipboardUpdated(listener func()) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) // clipboard diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 6892a3c9..9f4df2dc 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -47,7 +47,6 @@ type WebSocketManagerCtx struct { desktop types.DesktopManager handler *handler.MessageHandlerCtx handlers []types.HandlerFunction - shutdown chan bool } func (ws *WebSocketManagerCtx) Start() { @@ -118,51 +117,25 @@ func (ws *WebSocketManagerCtx) Start() { }, nil) }) - go func() { - ws.logger.Info().Msg("clipboard loop started") - - defer func() { - ws.logger.Info().Msg("clipboard loop stopped") - }() - - current := ws.desktop.ReadClipboard() - - for { - select { - case <-ws.shutdown: - return - default: - session := ws.sessions.GetHost() - if session == nil { - break - } - - text := ws.desktop.ReadClipboard() - if text == current { - break - } - - current = text - if !session.CanAccessClipboard() { - break - } - - if err := session.Send( - message.ClipboardData{ - Event: event.CLIPBOARD_UPDATED, - Text: text, - }); err != nil { - ws.logger.Warn().Err(err).Msg("could not sync clipboard") - } - } - - time.Sleep(100 * time.Millisecond) + ws.desktop.OnClipboardUpdated(func() { + session := ws.sessions.GetHost() + if session == nil || !session.CanAccessClipboard() { + return } - }() + + text := ws.desktop.ReadClipboard() + err := session.Send(message.ClipboardData{ + Event: event.CLIPBOARD_UPDATED, + Text: text, + }) + + if err != nil { + ws.logger.Warn().Err(err).Msg("could not sync clipboard") + } + }) } func (ws *WebSocketManagerCtx) Shutdown() error { - ws.shutdown <- true return nil } From 94a9c7c10aaf2c6e625e947d7c602cee251e3ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 11 Jan 2021 15:57:14 +0100 Subject: [PATCH 248/876] tidy up C files. --- internal/capture/gst/gst.c | 2 -- internal/capture/gst/gst.h | 9 ++------- internal/desktop/clipboard/clipboard.go | 3 +-- internal/desktop/gtk/gtk.go | 3 +-- internal/desktop/xevent/xevent.go | 3 +-- internal/desktop/xevent/xevent.h | 2 -- internal/desktop/xorg/xorg.go | 3 +-- internal/desktop/xorg/xorg.h | 6 ------ 8 files changed, 6 insertions(+), 25 deletions(-) diff --git a/internal/capture/gst/gst.c b/internal/capture/gst/gst.c index 4e78974d..7c11c8a5 100644 --- a/internal/capture/gst/gst.c +++ b/internal/capture/gst/gst.c @@ -1,7 +1,5 @@ #include "gst.h" -#include - typedef struct SampleHandlerUserData { int pipelineId; } SampleHandlerUserData; diff --git a/internal/capture/gst/gst.h b/internal/capture/gst/gst.h index 7c6965f4..cf274e3e 100644 --- a/internal/capture/gst/gst.h +++ b/internal/capture/gst/gst.h @@ -1,10 +1,7 @@ -#ifndef GST_H -#define GST_H +#pragma once -#include #include -#include -#include +#include extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); @@ -15,5 +12,3 @@ void gstreamer_send_play_pipeline(GstElement *pipeline); void gstreamer_send_stop_pipeline(GstElement *pipeline); void gstreamer_send_start_mainloop(void); void gstreamer_init(void); - -#endif diff --git a/internal/desktop/clipboard/clipboard.go b/internal/desktop/clipboard/clipboard.go index b01c2958..a5047498 100644 --- a/internal/desktop/clipboard/clipboard.go +++ b/internal/desktop/clipboard/clipboard.go @@ -1,8 +1,7 @@ package clipboard /* -#cgo linux CFLAGS: -I/usr/src -I/usr/local/include/ -#cgo linux LDFLAGS: /usr/local/lib/libclipboard.a -L/usr/src -L/usr/local/lib -lxcb +#cgo linux LDFLAGS: /usr/local/lib/libclipboard.a -lxcb #include "clipboard.h" */ diff --git a/internal/desktop/gtk/gtk.go b/internal/desktop/gtk/gtk.go index d4dc81de..58d64dce 100644 --- a/internal/desktop/gtk/gtk.go +++ b/internal/desktop/gtk/gtk.go @@ -1,8 +1,7 @@ package gtk /* -#cgo linux CFLAGS: -I/usr/src -I/usr/local/include/ -#cgo pkg-config: gdk-3.0 gtk+-3.0 +#cgo pkg-config: gtk+-3.0 #include "gtk.h" */ diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go index 9f8d6343..3c24701b 100644 --- a/internal/desktop/xevent/xevent.go +++ b/internal/desktop/xevent/xevent.go @@ -1,8 +1,7 @@ package xevent /* -#cgo linux CFLAGS: -I/usr/src -I/usr/local/include/ -#cgo linux LDFLAGS: -L/usr/src -L/usr/local/lib -lX11 -lxcb -lXfixes +#cgo linux LDFLAGS: -lX11 -lXfixes #include "xevent.h" */ diff --git a/internal/desktop/xevent/xevent.h b/internal/desktop/xevent/xevent.h index e735c0c4..743061dd 100644 --- a/internal/desktop/xevent/xevent.h +++ b/internal/desktop/xevent/xevent.h @@ -3,9 +3,7 @@ #include #include #include -#include #include -#include extern void goXEventCursorChanged(XFixesCursorNotifyEvent event); extern void goXEventClipboardUpdated(); diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index d05d3ee0..e1add2a3 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -1,8 +1,7 @@ package xorg /* -#cgo linux CFLAGS: -I/usr/src -I/usr/local/include/ -#cgo linux LDFLAGS: -L/usr/src -L/usr/local/lib -lX11 -lxcb -lXrandr -lXtst -lXfixes +#cgo linux LDFLAGS: -lX11 -lXrandr -lXtst -lXfixes #include "xorg.h" */ diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index 4b228f9e..4a83026a 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -1,14 +1,10 @@ #pragma once -#ifndef XDISPLAY_H -#define XDISPLAY_H - #include #include #include #include #include -#include #include #include @@ -32,5 +28,3 @@ short XGetScreenRate(); void SetKeyboardLayout(char *layout); void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock); XFixesCursorImage *XGetCursorImage(void); - -#endif From 49c3b6d4fe28064bb7a0f2a0dadd56ea1f833e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 00:09:43 +0100 Subject: [PATCH 249/876] xevent: OnWindowCreated. --- internal/desktop/xevent.go | 4 ++++ internal/desktop/xevent/xevent.c | 17 +++++++++++++++++ internal/desktop/xevent/xevent.go | 11 +++++++++++ internal/desktop/xevent/xevent.h | 2 ++ internal/types/desktop.go | 1 + internal/websocket/manager.go | 9 +++++++++ 6 files changed, 44 insertions(+) diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index 972c4e43..f59f2025 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -12,6 +12,10 @@ func (manager *DesktopManagerCtx) OnClipboardUpdated(listener func()) { xevent.OnClipboardUpdated(listener) } +func (manager *DesktopManagerCtx) OnWindowCreated(listener func(window uint32, name string, role string)) { + xevent.OnWindowCreated(listener) +} + func (manager *DesktopManagerCtx) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { xevent.OnEventError(listener) } diff --git a/internal/desktop/xevent/xevent.c b/internal/desktop/xevent/xevent.c index 31216026..f7d9e870 100644 --- a/internal/desktop/xevent/xevent.c +++ b/internal/desktop/xevent/xevent.c @@ -27,6 +27,7 @@ void XEventLoop(char *name) { XA_CLIPBOARD = XInternAtom(display, "CLIPBOARD", 0); XFixesSelectSelectionInput(display, root, XA_CLIPBOARD, XFixesSetSelectionOwnerNotifyMask); XFixesSelectCursorInput(display, root, XFixesDisplayCursorNotifyMask); + XSelectInput(display, root, SubstructureNotifyMask); XSync(display, 0); XSetErrorHandler(XEventError); @@ -52,6 +53,22 @@ void XEventLoop(char *name) { continue; } } + + // XFixesSelectionNotifyEvent + if (event.type == CreateNotify) { + char *name; + XFetchName(display, event.xcreatewindow.window, &name); + + char *role; + XTextProperty text_data; + Atom atom = XInternAtom(display, "WM_WINDOW_ROLE", True); + int status = XGetTextProperty(display, event.xcreatewindow.window, &text_data, atom); + role = (char *)text_data.value; + + goXEventWindowCreated(event.xcreatewindow, name, role); + XFree(name); + continue; + } } XCloseDisplay(display); diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go index 3c24701b..467baa14 100644 --- a/internal/desktop/xevent/xevent.go +++ b/internal/desktop/xevent/xevent.go @@ -38,6 +38,12 @@ func OnClipboardUpdated(listener func()) { }) } +func OnWindowCreated(listener func(window uint32, name string, role string)) { + emmiter.On("window-created", func(payload ...interface{}) { + listener(payload[0].(uint32), payload[1].(string), payload[2].(string)) + }) +} + func OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { emmiter.On("event-error", func(payload ...interface{}) { listener(payload[0].(uint8), payload[1].(string), payload[2].(uint8), payload[3].(uint8)) @@ -54,6 +60,11 @@ func goXEventClipboardUpdated() { emmiter.Emit("clipboard-updated") } +//export goXEventWindowCreated +func goXEventWindowCreated(event C.XCreateWindowEvent, name *C.char, role *C.char) { + emmiter.Emit("window-created", uint32(event.window), C.GoString(name), C.GoString(role)) +} + //export goXEventError func goXEventError(event *C.XErrorEvent, message *C.char) { emmiter.Emit("event-error", uint8(event.error_code), C.GoString(message), uint8(event.request_code), uint8(event.minor_code)) diff --git a/internal/desktop/xevent/xevent.h b/internal/desktop/xevent/xevent.h index 743061dd..24ee7160 100644 --- a/internal/desktop/xevent/xevent.h +++ b/internal/desktop/xevent/xevent.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include #include @@ -7,6 +8,7 @@ extern void goXEventCursorChanged(XFixesCursorNotifyEvent event); extern void goXEventClipboardUpdated(); +extern void goXEventWindowCreated(XCreateWindowEvent event, char *name, char *role); extern void goXEventError(XErrorEvent *event, char *message); extern int goXEventActive(); diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 60a18403..28c81431 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -45,6 +45,7 @@ type DesktopManager interface { // xevent OnCursorChanged(listener func(serial uint64)) OnClipboardUpdated(listener func()) + OnWindowCreated(listener func(window uint32, name string, role string)) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) // clipboard diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 9f4df2dc..b7b18014 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -133,6 +133,15 @@ func (ws *WebSocketManagerCtx) Start() { ws.logger.Warn().Err(err).Msg("could not sync clipboard") } }) + + ws.desktop.OnWindowCreated(func(window uint32, name string, role string) { + // TODO: Implement. + ws.logger.Info(). + Uint32("window", window). + Str("name", name). + Str("role", role). + Msg("created new window") + }) } func (ws *WebSocketManagerCtx) Shutdown() error { From f32ebe7935d882928363ed5119982b8a52da4135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 16:12:05 +0100 Subject: [PATCH 250/876] catch gstreamer errors. --- internal/capture/gst/gst.c | 5 ----- internal/capture/gst/gst.go | 12 +++++++++++- internal/capture/gst/gst.h | 2 -- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/internal/capture/gst/gst.c b/internal/capture/gst/gst.c index 7c11c8a5..a25f0123 100644 --- a/internal/capture/gst/gst.c +++ b/internal/capture/gst/gst.c @@ -61,11 +61,6 @@ GstFlowReturn gstreamer_send_new_sample_handler(GstElement *object, gpointer use return GST_FLOW_OK; } -GstElement *gstreamer_send_create_pipeline(char *pipeline) { - GError *error = NULL; - return gst_parse_launch(pipeline, &error); -} - void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId) { SampleHandlerUserData *s = calloc(1, sizeof(SampleHandlerUserData)); s->pipelineId = pipelineId; diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index a2c884b9..b638ad03 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -197,8 +197,18 @@ func CreatePipeline(pipelineStr string, codecName string, clockRate float32) (*P pipelinesLock.Lock() defer pipelinesLock.Unlock() + var gstPipeline *C.GstElement + var gstError *C.GError + + gstPipeline = C.gst_parse_launch(pipelineStrUnsafe, &gstError) + defer C.g_error_free(gstError) + + if gstPipeline == nil || gstError != nil { + return nil, fmt.Errorf("(pipeline error) %s", C.GoString(gstError.message)) + } + p := &Pipeline{ - Pipeline: C.gstreamer_send_create_pipeline(pipelineStrUnsafe), + Pipeline: gstPipeline, Sample: make(chan types.Sample), CodecName: codecName, ClockRate: clockRate, diff --git a/internal/capture/gst/gst.h b/internal/capture/gst/gst.h index cf274e3e..55037f18 100644 --- a/internal/capture/gst/gst.h +++ b/internal/capture/gst/gst.h @@ -5,8 +5,6 @@ extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); -GstElement *gstreamer_send_create_pipeline(char *pipeline); - void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId); void gstreamer_send_play_pipeline(GstElement *pipeline); void gstreamer_send_stop_pipeline(GstElement *pipeline); From 425d9c2ace202d522f69c15778507a140af2e40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 16:12:53 +0100 Subject: [PATCH 251/876] fix broken pipeline. --- internal/capture/gst/gst.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index b638ad03..64cbbab1 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -34,7 +34,7 @@ const ( videoClockRate = 90000 audioClockRate = 48000 pcmClockRate = 8000 - videoSrc = "ximagesrc xid=%s show-pointer=true use-damage=false ! video/x-raw ! videoconvert ! queue ! " + videoSrc = "ximagesrc display-name=%s show-pointer=true use-damage=false ! video/x-raw ! videoconvert ! queue ! " audioSrc = "pulsesrc device=%s ! audio/x-raw,channels=2 ! audioconvert ! " ) From 3faca29a895460142de4832da6330e7f4e976ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 16:13:59 +0100 Subject: [PATCH 252/876] remove codec name from pipeline. --- internal/capture/gst/gst.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 64cbbab1..c50cf5cf 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -20,7 +20,6 @@ import ( type Pipeline struct { Pipeline *C.GstElement Sample chan types.Sample - CodecName string ClockRate float32 Src string id int @@ -55,7 +54,7 @@ func CreateRTMPPipeline(pipelineDevice string, pipelineDisplay string, pipelineS pipelineStr = fmt.Sprintf("flvmux name=mux ! rtmpsink location='%s live=1' %s audio/x-raw,channels=2 ! audioconvert ! voaacenc ! mux. %s x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! mux.", pipelineRTMP, audio, video) } - return CreatePipeline(pipelineStr, "", 0) + return CreatePipeline(pipelineStr, 0) } // CreateAppPipeline creates a GStreamer Pipeline @@ -186,11 +185,11 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri return nil, fmt.Errorf("unknown codec %s", codecName) } - return CreatePipeline(pipelineStr, codecName, clockRate) + return CreatePipeline(pipelineStr, clockRate) } // CreatePipeline creates a GStreamer Pipeline -func CreatePipeline(pipelineStr string, codecName string, clockRate float32) (*Pipeline, error) { +func CreatePipeline(pipelineStr string, clockRate float32) (*Pipeline, error) { pipelineStrUnsafe := C.CString(pipelineStr) defer C.free(unsafe.Pointer(pipelineStrUnsafe)) @@ -210,7 +209,6 @@ func CreatePipeline(pipelineStr string, codecName string, clockRate float32) (*P p := &Pipeline{ Pipeline: gstPipeline, Sample: make(chan types.Sample), - CodecName: codecName, ClockRate: clockRate, Src: pipelineStr, id: len(pipelines), From dbc8a7612db03400dbc5548e0ff151b16a4c2498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 16:24:54 +0100 Subject: [PATCH 253/876] gst pipeline app sink refactoring. --- internal/capture/gst/gst.go | 92 +++++++++++++------------------------ 1 file changed, 32 insertions(+), 60 deletions(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index c50cf5cf..d2b75d8f 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -35,6 +35,7 @@ const ( pcmClockRate = 8000 videoSrc = "ximagesrc display-name=%s show-pointer=true use-damage=false ! video/x-raw ! videoconvert ! queue ! " audioSrc = "pulsesrc device=%s ! audio/x-raw,channels=2 ! audioconvert ! " + appSink = " ! appsink name=appsink" ) func init() { @@ -59,9 +60,8 @@ func CreateRTMPPipeline(pipelineDevice string, pipelineDisplay string, pipelineS // CreateAppPipeline creates a GStreamer Pipeline func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc string) (*Pipeline, error) { - pipelineStr := " ! appsink name=appsink" - var clockRate float32 + var pipelineStr string switch codecName { case webrtc.VP8: @@ -73,12 +73,7 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri } clockRate = videoClockRate - - if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) - } else { - pipelineStr = fmt.Sprintf(videoSrc+"vp8enc cpu-used=8 threads=2 deadline=1 error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true"+pipelineStr, pipelineDevice) - } + pipelineStr = fmt.Sprintf(videoSrc + "vp8enc cpu-used=8 threads=2 deadline=1 error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true" + appSink, pipelineDevice) case webrtc.VP9: // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html?gi-language=c // gstreamer1.0-plugins-good @@ -88,39 +83,32 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri } clockRate = videoClockRate - - // Causes panic! not sure why... - if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) - } else { - pipelineStr = fmt.Sprintf(videoSrc+"vp9enc"+pipelineStr, pipelineDevice) - } + pipelineStr = fmt.Sprintf(videoSrc + "vp9enc" + appSink, pipelineDevice) case webrtc.H264: - // https://gstreamer.freedesktop.org/documentation/openh264/openh264enc.html?gi-language=c#openh264enc - // gstreamer1.0-plugins-bad - // openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 if err := CheckPlugins([]string{"ximagesrc"}); err != nil { return nil, err } - clockRate = videoClockRate - - if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) - } else { - pipelineStr = fmt.Sprintf(videoSrc+"openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream"+pipelineStr, pipelineDevice) - - // https://gstreamer.freedesktop.org/documentation/x264/index.html?gi-language=c - // gstreamer1.0-plugins-ugly - // video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream - if err := CheckPlugins([]string{"openh264"}); err != nil { - pipelineStr = fmt.Sprintf(videoSrc+"video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream"+pipelineStr, pipelineDevice) - - if err := CheckPlugins([]string{"x264"}); err != nil { - return nil, err - } - } + var err error + // https://gstreamer.freedesktop.org/documentation/openh264/openh264enc.html?gi-language=c#openh264enc + // gstreamer1.0-plugins-bad + // openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 + if err = CheckPlugins([]string{"openh264"}); err == nil { + clockRate = videoClockRate + pipelineStr = fmt.Sprintf(videoSrc + "openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream" + appSink, pipelineDevice) + break } + + // https://gstreamer.freedesktop.org/documentation/x264/index.html?gi-language=c + // gstreamer1.0-plugins-ugly + // video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream + if err = CheckPlugins([]string{"x264"}); err == nil { + clockRate = videoClockRate + pipelineStr = fmt.Sprintf(videoSrc + "video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream" + appSink, pipelineDevice) + break + } + + return nil, err case webrtc.Opus: // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html // gstreamer1.0-plugins-base @@ -130,12 +118,7 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri } clockRate = audioClockRate - - if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) - } else { - pipelineStr = fmt.Sprintf(audioSrc+"opusenc"+pipelineStr, pipelineDevice) - } + pipelineStr = fmt.Sprintf(audioSrc + "opusenc" + appSink, pipelineDevice) case webrtc.G722: // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html?gi-language=c // gstreamer1.0-libav @@ -145,12 +128,7 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri } clockRate = audioClockRate - - if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) - } else { - pipelineStr = fmt.Sprintf(audioSrc+"avenc_g722"+pipelineStr, pipelineDevice) - } + pipelineStr = fmt.Sprintf(audioSrc + "avenc_g722" + appSink, pipelineDevice) case webrtc.PCMU: // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html?gi-language=c // gstreamer1.0-plugins-good @@ -160,12 +138,7 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri } clockRate = pcmClockRate - - if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) - } else { - pipelineStr = fmt.Sprintf(audioSrc+"audio/x-raw, rate=8000 ! mulawenc"+pipelineStr, pipelineDevice) - } + pipelineStr = fmt.Sprintf(audioSrc + "audio/x-raw, rate=8000 ! mulawenc" + appSink, pipelineDevice) case webrtc.PCMA: // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html?gi-language=c // gstreamer1.0-plugins-good @@ -175,16 +148,15 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri } clockRate = pcmClockRate - - if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) - } else { - pipelineStr = fmt.Sprintf(audioSrc+"audio/x-raw, rate=8000 ! alawenc"+pipelineStr, pipelineDevice) - } + pipelineStr = fmt.Sprintf(audioSrc + "audio/x-raw, rate=8000 ! alawenc" + appSink, pipelineDevice) default: return nil, fmt.Errorf("unknown codec %s", codecName) } + if pipelineSrc != "" { + pipelineStr = fmt.Sprintf(pipelineSrc + appSink, pipelineDevice) + } + return CreatePipeline(pipelineStr, clockRate) } @@ -202,7 +174,7 @@ func CreatePipeline(pipelineStr string, clockRate float32) (*Pipeline, error) { gstPipeline = C.gst_parse_launch(pipelineStrUnsafe, &gstError) defer C.g_error_free(gstError) - if gstPipeline == nil || gstError != nil { + if gstError != nil { return nil, fmt.Errorf("(pipeline error) %s", C.GoString(gstError.message)) } From c75191edeb68b76aa17d4bce39f55167f1f81be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 16:25:14 +0100 Subject: [PATCH 254/876] capture: hide pointer. --- internal/capture/gst/gst.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index d2b75d8f..31b9e504 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -33,7 +33,7 @@ const ( videoClockRate = 90000 audioClockRate = 48000 pcmClockRate = 8000 - videoSrc = "ximagesrc display-name=%s show-pointer=true use-damage=false ! video/x-raw ! videoconvert ! queue ! " + videoSrc = "ximagesrc display-name=%s show-pointer=false use-damage=false ! video/x-raw ! videoconvert ! queue ! " audioSrc = "pulsesrc device=%s ! audio/x-raw,channels=2 ! audioconvert ! " appSink = " ! appsink name=appsink" ) From d89dd11b1824aacafb665f841bbee240c7cb2de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 16:37:44 +0100 Subject: [PATCH 255/876] add icon theme cursors. --- Dockerfile | 6 +++++- runtime/icon-theme/.gitkeep | 0 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 runtime/icon-theme/.gitkeep diff --git a/Dockerfile b/Dockerfile index 639a6263..98fc5b07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,12 +80,16 @@ RUN set -eux; apt-get update; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* # -# copy runtime files +# copy runtime configs COPY runtime/dbus /usr/bin/dbus COPY runtime/default.pa /etc/pulse/default.pa COPY runtime/supervisord.conf /etc/neko/supervisord.conf COPY runtime/xorg.conf /etc/neko/xorg.conf +# +# copy runtime folders +COPY runtime/icon-theme /home/neko/.icons/default + # # set default envs ENV USER=$USERNAME diff --git a/runtime/icon-theme/.gitkeep b/runtime/icon-theme/.gitkeep new file mode 100644 index 00000000..e69de29b From a0d8f1b88057e4c425894591cf2341a924b9f748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 22:54:13 +0100 Subject: [PATCH 256/876] xorg modifiers refactor. --- internal/api/room/keyboard.go | 33 ++++++-------------------- internal/desktop/xorg.go | 20 ++++++++++++++-- internal/desktop/xorg/xorg.c | 26 +++++++------------- internal/desktop/xorg/xorg.go | 23 ++++++++++++++++-- internal/desktop/xorg/xorg.h | 3 ++- internal/types/desktop.go | 8 ++++++- internal/websocket/handler/keyboard.go | 26 ++++---------------- 7 files changed, 68 insertions(+), 71 deletions(-) diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 1fd25b5c..845ffb4f 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -4,6 +4,7 @@ import ( "net/http" "demodesk/neko/internal/utils" + "demodesk/neko/internal/types" ) type KeyboardLayoutData struct { @@ -11,9 +12,8 @@ type KeyboardLayoutData struct { } type KeyboardModifiersData struct { - NumLock *bool `json:"numlock"` - CapsLock *bool `json:"capslock"` - ScrollLock *bool `json:"scrollock"` + NumLock *bool `json:"numlock"` + CapsLock *bool `json:"capslock"` } func (h *RoomHandler) keyboardLayoutSet(w http.ResponseWriter, r *http.Request) { @@ -33,28 +33,9 @@ func (h *RoomHandler) keyboardModifiersSet(w http.ResponseWriter, r *http.Reques return } - var NumLock = 0 - if data.NumLock == nil { - NumLock = -1 - } else if *data.NumLock { - NumLock = 1 - } - - var CapsLock = 0 - if data.CapsLock == nil { - CapsLock = -1 - } else if *data.CapsLock { - CapsLock = 1 - } - - var ScrollLock = 0 - if data.ScrollLock == nil { - ScrollLock = -1 - } else if *data.ScrollLock { - ScrollLock = 1 - } - - h.desktop.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) - + h.desktop.SetKeyboardModifiers(types.KeyboardModifiers{ + NumLock: data.NumLock, + CapsLock: data.CapsLock, + }) utils.HttpSuccess(w) } diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 370d02f4..52494000 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -57,8 +57,24 @@ func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string) { xorg.SetKeyboardLayout(layout) } -func (manager *DesktopManagerCtx) SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) { - xorg.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) +func (manager *DesktopManagerCtx) SetKeyboardModifiers(mod types.KeyboardModifiers) { + if mod.NumLock != nil { + xorg.SetKeyboardModifier(xorg.KBD_NUM_LOCK, *mod.NumLock) + } + + if mod.CapsLock != nil { + xorg.SetKeyboardModifier(xorg.KBD_CAPS_LOCK, *mod.CapsLock) + } +} + +func (manager *DesktopManagerCtx) GetKeyboardModifiers() types.KeyboardModifiers { + NumLock := xorg.GetKeyboardModifier(xorg.KBD_NUM_LOCK) + CapsLock := xorg.GetKeyboardModifier(xorg.KBD_CAPS_LOCK) + + return types.KeyboardModifiers{ + NumLock: &NumLock, + CapsLock: &CapsLock, + } } func (manager *DesktopManagerCtx) GetCursorImage() *types.CursorImage { diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index 85b0553a..498f455d 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -126,27 +126,19 @@ void SetKeyboardLayout(char *layout) { system(cmd); } -void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock) { +void XSetKeyboardModifier(int mod, int on) { Display *display = getXDisplay(); - - if (num_lock != -1) { - XkbLockModifiers(display, XkbUseCoreKbd, 16, num_lock * 16); - } - - if (caps_lock != -1) { - XkbLockModifiers(display, XkbUseCoreKbd, 2, caps_lock * 2); - } - - if (scroll_lock != -1) { - XKeyboardControl values; - values.led_mode = scroll_lock ? LedModeOn : LedModeOff; - values.led = 3; - XChangeKeyboardControl(display, KBLedMode, &values); - } - + XkbLockModifiers(display, XkbUseCoreKbd, mod, on ? mod : 0); XFlush(display); } +int XGetKeyboardModifier(int mod) { + XkbStateRec xkbState; + Display *display = getXDisplay(); + XkbGetState(display, XkbUseCoreKbd, &xkbState); + return xkbState.locked_mods & mod; +} + XFixesCursorImage *XGetCursorImage(void) { Display *display = getXDisplay(); return XFixesGetCursorImage(display); diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index e1add2a3..d1489f1a 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -17,6 +17,13 @@ import ( "demodesk/neko/internal/types" ) +type KbdModifiers int + +const ( + KBD_CAPS_LOCK KbdModifiers = 2 + KBD_NUM_LOCK KbdModifiers = 16 +) + var ScreenConfigurations = make(map[int]types.ScreenConfiguration) var debounce_button = make(map[int]time.Time) @@ -211,11 +218,23 @@ func SetKeyboardLayout(layout string) { C.SetKeyboardLayout(layoutUnsafe) } -func SetKeyboardModifiers(num_lock int, caps_lock int, scroll_lock int) { +func SetKeyboardModifier(mod KbdModifiers, active bool) { mu.Lock() defer mu.Unlock() - C.SetKeyboardModifiers(C.int(num_lock), C.int(caps_lock), C.int(scroll_lock)) + num := C.int(0) + if active { + num = C.int(1) + } + + C.XSetKeyboardModifier(C.int(mod), num) +} + +func GetKeyboardModifier(mod KbdModifiers) bool { + mu.Lock() + defer mu.Unlock() + + return C.XGetKeyboardModifier(C.int(mod)) == C.int(1) } func GetCursorImage() *types.CursorImage { diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index 4a83026a..6f4aeca1 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -26,5 +26,6 @@ int XGetScreenSize(); short XGetScreenRate(); void SetKeyboardLayout(char *layout); -void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock); +void XSetKeyboardModifier(int mod, int on); +int XGetKeyboardModifier(int mod); XFixesCursorImage *XGetCursorImage(void); diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 28c81431..f79b46a3 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -21,6 +21,11 @@ type ScreenConfiguration struct { Rates map[int]int16 } +type KeyboardModifiers struct { + NumLock *bool + CapsLock *bool +} + type DesktopManager interface { Start() Shutdown() error @@ -39,7 +44,8 @@ type DesktopManager interface { ScreenConfigurations() map[int]ScreenConfiguration GetScreenSize() *ScreenSize SetKeyboardLayout(layout string) - SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) + SetKeyboardModifiers(mod KeyboardModifiers) + GetKeyboardModifiers() KeyboardModifiers GetCursorImage() *CursorImage // xevent diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 4776eef6..2ff5da88 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -22,27 +22,9 @@ func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *me return nil } - var NumLock = 0 - if payload.NumLock == nil { - NumLock = -1 - } else if *payload.NumLock { - NumLock = 1 - } - - var CapsLock = 0 - if payload.CapsLock == nil { - CapsLock = -1 - } else if *payload.CapsLock { - CapsLock = 1 - } - - var ScrollLock = 0 - if payload.ScrollLock == nil { - ScrollLock = -1 - } else if *payload.ScrollLock { - ScrollLock = 1 - } - - h.desktop.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock) + h.desktop.SetKeyboardModifiers(types.KeyboardModifiers{ + NumLock: payload.NumLock, + CapsLock: payload.CapsLock, + }) return nil } From 8a9dceafec6b2fc1f9ae7804998398295543a6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 23:35:11 +0100 Subject: [PATCH 257/876] xorg modifiers fix mask. --- internal/desktop/xorg.go | 6 ++++-- internal/desktop/xorg/xorg.c | 4 ++-- internal/desktop/xorg/xorg.go | 6 +++--- internal/desktop/xorg/xorg.h | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 52494000..0172b69f 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -68,8 +68,10 @@ func (manager *DesktopManagerCtx) SetKeyboardModifiers(mod types.KeyboardModifie } func (manager *DesktopManagerCtx) GetKeyboardModifiers() types.KeyboardModifiers { - NumLock := xorg.GetKeyboardModifier(xorg.KBD_NUM_LOCK) - CapsLock := xorg.GetKeyboardModifier(xorg.KBD_CAPS_LOCK) + modifiers := xorg.GetKeyboardModifiers() + + NumLock := (modifiers & xorg.KBD_NUM_LOCK) != 0 + CapsLock := (modifiers & xorg.KBD_CAPS_LOCK) != 0 return types.KeyboardModifiers{ NumLock: &NumLock, diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index 498f455d..afbd4135 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -132,11 +132,11 @@ void XSetKeyboardModifier(int mod, int on) { XFlush(display); } -int XGetKeyboardModifier(int mod) { +char XGetKeyboardModifiers() { XkbStateRec xkbState; Display *display = getXDisplay(); XkbGetState(display, XkbUseCoreKbd, &xkbState); - return xkbState.locked_mods & mod; + return xkbState.locked_mods; } XFixesCursorImage *XGetCursorImage(void) { diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index d1489f1a..686e1afa 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -17,7 +17,7 @@ import ( "demodesk/neko/internal/types" ) -type KbdModifiers int +type KbdModifiers uint8 const ( KBD_CAPS_LOCK KbdModifiers = 2 @@ -230,11 +230,11 @@ func SetKeyboardModifier(mod KbdModifiers, active bool) { C.XSetKeyboardModifier(C.int(mod), num) } -func GetKeyboardModifier(mod KbdModifiers) bool { +func GetKeyboardModifiers() KbdModifiers { mu.Lock() defer mu.Unlock() - return C.XGetKeyboardModifier(C.int(mod)) == C.int(1) + return KbdModifiers(C.XGetKeyboardModifiers()) } func GetCursorImage() *types.CursorImage { diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index 6f4aeca1..0b1cf5c5 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -27,5 +27,5 @@ short XGetScreenRate(); void SetKeyboardLayout(char *layout); void XSetKeyboardModifier(int mod, int on); -int XGetKeyboardModifier(int mod); +char XGetKeyboardModifiers(); XFixesCursorImage *XGetCursorImage(void); From 4844225a0b5693a0f0a6780167f449a995303ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 23:35:46 +0100 Subject: [PATCH 258/876] keyboardModifiersGet. --- internal/api/room/handler.go | 8 +++++--- internal/api/room/keyboard.go | 9 +++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index ce49dcca..13d06800 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -42,9 +42,11 @@ func (h *RoomHandler) Route(r chi.Router) { r.Post("/", h.clipboardWrite) }) - r.With(auth.HostsOnly).Route("/keyboard", func(r chi.Router) { - r.Post("/layout", h.keyboardLayoutSet) - r.Post("/modifiers", h.keyboardModifiersSet) + r.Route("/keyboard", func(r chi.Router) { + r.With(auth.HostsOnly).Post("/layout", h.keyboardLayoutSet) + + r.Get("/modifiers", h.keyboardModifiersGet) + r.With(auth.HostsOnly).Post("/modifiers", h.keyboardModifiersSet) }) r.Route("/control", func(r chi.Router) { diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 845ffb4f..00e26c45 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -39,3 +39,12 @@ func (h *RoomHandler) keyboardModifiersSet(w http.ResponseWriter, r *http.Reques }) utils.HttpSuccess(w) } + +func (h *RoomHandler) keyboardModifiersGet(w http.ResponseWriter, r *http.Request) { + data := h.desktop.GetKeyboardModifiers() + + utils.HttpSuccess(w, KeyboardModifiersData{ + NumLock: data.NumLock, + CapsLock: data.CapsLock, + }) +} From 7f18c5842d163d4a49ea7c1cc16080cd9668cfea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 23:48:15 +0100 Subject: [PATCH 259/876] changing keyboard layout as go exec. --- internal/api/room/keyboard.go | 6 +++++- internal/desktop/xorg.go | 9 +++++++-- internal/desktop/xorg/xorg.c | 7 ------- internal/desktop/xorg/xorg.go | 15 --------------- internal/desktop/xorg/xorg.h | 1 - internal/types/desktop.go | 2 +- internal/websocket/handler/keyboard.go | 3 +-- 7 files changed, 14 insertions(+), 29 deletions(-) diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 00e26c45..73d0a696 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -22,7 +22,11 @@ func (h *RoomHandler) keyboardLayoutSet(w http.ResponseWriter, r *http.Request) return } - h.desktop.SetKeyboardLayout(data.Layout) + err := h.desktop.SetKeyboardLayout(data.Layout) + if err != nil{ + utils.HttpInternalServerError(w, "Unable to change keyboard layout.") + return + } utils.HttpSuccess(w) } diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 0172b69f..fed7cee8 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -1,6 +1,8 @@ package desktop import ( + "os/exec" + "demodesk/neko/internal/types" "demodesk/neko/internal/desktop/xorg" ) @@ -53,8 +55,11 @@ func (manager *DesktopManagerCtx) ChangeScreenSize(width int, height int, rate i return xorg.ChangeScreenSize(width, height, rate) } -func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string) { - xorg.SetKeyboardLayout(layout) +func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string) error { + // TOOD: Use native API. + cmd := exec.Command("setxkbmap", layout) + _, err := cmd.Output() + return err } func (manager *DesktopManagerCtx) SetKeyboardModifiers(mod types.KeyboardModifiers) { diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index afbd4135..ef8b8001 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -119,13 +119,6 @@ short XGetScreenRate() { return XRRConfigCurrentRate(conf); } -void SetKeyboardLayout(char *layout) { - // TOOD: refactor, use native API. - char cmd[13] = "setxkbmap "; - strncat(cmd, layout, 2); - system(cmd); -} - void XSetKeyboardModifier(int mod, int on) { Display *display = getXDisplay(); XkbLockModifiers(display, XkbUseCoreKbd, mod, on ? mod : 0); diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 686e1afa..6649d93e 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -12,7 +12,6 @@ import ( "sync" "time" "unsafe" - "regexp" "demodesk/neko/internal/types" ) @@ -204,20 +203,6 @@ func GetScreenSize() *types.ScreenSize { return nil } -func SetKeyboardLayout(layout string) { - mu.Lock() - defer mu.Unlock() - - if !regexp.MustCompile(`^[a-zA-Z]+$`).MatchString(layout) { - return - } - - layoutUnsafe := C.CString(layout) - defer C.free(unsafe.Pointer(layoutUnsafe)) - - C.SetKeyboardLayout(layoutUnsafe) -} - func SetKeyboardModifier(mod KbdModifiers, active bool) { mu.Lock() defer mu.Unlock() diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index 0b1cf5c5..ef9c04f9 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -25,7 +25,6 @@ void XSetScreenConfiguration(int index, short rate); int XGetScreenSize(); short XGetScreenRate(); -void SetKeyboardLayout(char *layout); void XSetKeyboardModifier(int mod, int on); char XGetKeyboardModifiers(); XFixesCursorImage *XGetCursorImage(void); diff --git a/internal/types/desktop.go b/internal/types/desktop.go index f79b46a3..20e76271 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -43,7 +43,7 @@ type DesktopManager interface { ResetKeys() ScreenConfigurations() map[int]ScreenConfiguration GetScreenSize() *ScreenSize - SetKeyboardLayout(layout string) + SetKeyboardLayout(layout string) error SetKeyboardModifiers(mod KeyboardModifiers) GetKeyboardModifiers() KeyboardModifiers GetCursorImage() *CursorImage diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 2ff5da88..1314cdf7 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -12,8 +12,7 @@ func (h *MessageHandlerCtx) keyboardLayout(session types.Session, payload *messa return nil } - h.desktop.SetKeyboardLayout(payload.Layout) - return nil + return h.desktop.SetKeyboardLayout(payload.Layout) } func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *message.KeyboardModifiers) error { From 71dbdc06f5986fbe5341b654c6bd994d14699929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 12 Jan 2021 23:52:44 +0100 Subject: [PATCH 260/876] add layout variant. --- internal/api/room/keyboard.go | 5 +++-- internal/desktop/xorg.go | 4 ++-- internal/types/desktop.go | 2 +- internal/types/message/messages.go | 5 +++-- internal/websocket/handler/keyboard.go | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 73d0a696..f2f89e2f 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -8,7 +8,8 @@ import ( ) type KeyboardLayoutData struct { - Layout string `json:"layout"` + Layout string `json:"layout"` + Variant string `json:"variant"` } type KeyboardModifiersData struct { @@ -22,7 +23,7 @@ func (h *RoomHandler) keyboardLayoutSet(w http.ResponseWriter, r *http.Request) return } - err := h.desktop.SetKeyboardLayout(data.Layout) + err := h.desktop.SetKeyboardLayout(data.Layout, data.Variant) if err != nil{ utils.HttpInternalServerError(w, "Unable to change keyboard layout.") return diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index fed7cee8..3ab84b40 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -55,9 +55,9 @@ func (manager *DesktopManagerCtx) ChangeScreenSize(width int, height int, rate i return xorg.ChangeScreenSize(width, height, rate) } -func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string) error { +func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string, variant string) error { // TOOD: Use native API. - cmd := exec.Command("setxkbmap", layout) + cmd := exec.Command("setxkbmap", "-layout", layout, "-variant", variant) _, err := cmd.Output() return err } diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 20e76271..afecec53 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -43,7 +43,7 @@ type DesktopManager interface { ResetKeys() ScreenConfigurations() map[int]ScreenConfiguration GetScreenSize() *ScreenSize - SetKeyboardLayout(layout string) error + SetKeyboardLayout(layout string, variant string) error SetKeyboardModifiers(mod KeyboardModifiers) GetKeyboardModifiers() KeyboardModifiers GetCursorImage() *CursorImage diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index a3b9ba4b..9102dd91 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -140,8 +140,9 @@ type KeyboardModifiers struct { } type KeyboardLayout struct { - Event string `json:"event,omitempty"` - Layout string `json:"layout"` + Event string `json:"event,omitempty"` + Layout string `json:"layout"` + Variant string `json:"variant"` } ///////////////////////////// diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 1314cdf7..563feb6d 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -12,7 +12,7 @@ func (h *MessageHandlerCtx) keyboardLayout(session types.Session, payload *messa return nil } - return h.desktop.SetKeyboardLayout(payload.Layout) + return h.desktop.SetKeyboardLayout(payload.Layout, payload.Variant) } func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *message.KeyboardModifiers) error { From 39d48c3db8d791c56305312b6aaf0c39b591f2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 13 Jan 2021 21:36:43 +0100 Subject: [PATCH 261/876] ignore duplicated packet log messages. --- internal/webrtc/logger.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/webrtc/logger.go b/internal/webrtc/logger.go index cf18302f..4dfc1058 100644 --- a/internal/webrtc/logger.go +++ b/internal/webrtc/logger.go @@ -41,18 +41,18 @@ func (l logger) Debugf(format string, args ...interface{}) { l.logger.Debug().Msg(strings.TrimSpace(msg)) } func (l logger) Info(msg string) { - if strings.Contains(msg, "packetio.Buffer is full") { - //l.logger.Panic().Msg(msg) + if strings.Contains(msg, "duplicated packet") { return } + l.logger.Info().Msg(strings.TrimSpace(msg)) } func (l logger) Infof(format string, args ...interface{}) { msg := fmt.Sprintf(format, args...) - if strings.Contains(msg, "packetio.Buffer is full") { - // l.logger.Panic().Msg(msg) + if strings.Contains(msg, "duplicated packet") { return } + l.logger.Info().Msg(strings.TrimSpace(msg)) } func (l logger) Warn(msg string) { From 98bf62ef5ec5f62d364bfbb2f58ebca70d185f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 13 Jan 2021 21:36:59 +0100 Subject: [PATCH 262/876] neko start default without debug. --- runtime/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf index 18fc1c42..61c505c3 100644 --- a/runtime/supervisord.conf +++ b/runtime/supervisord.conf @@ -43,7 +43,7 @@ redirect_stderr=true [program:neko] environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/neko serve -d +command=/usr/bin/neko serve autorestart=true priority=800 user=%(ENV_USER)s From 0f27b81f7641348c99505ea9ea61575a3cc0ef88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 13 Jan 2021 22:46:44 +0100 Subject: [PATCH 263/876] drag_window add logging. --- internal/desktop/gtk/gtk.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/desktop/gtk/gtk.c b/internal/desktop/gtk/gtk.c index 4840d262..ffdb0ff1 100644 --- a/internal/desktop/gtk/gtk.c +++ b/internal/desktop/gtk/gtk.c @@ -54,13 +54,16 @@ static void drag_end( } void drag_window(char **uris) { - gtk_init(NULL, NULL); + if (gtk_init_check(NULL, NULL) == FALSE) { + fprintf(stderr, "Unable to initialize GTK for drag and drop widget!\n"); + return; + } GtkWidget *widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); GtkWindow *window = GTK_WINDOW(widget); gtk_window_move(window, 0, 0); - gtk_window_set_title(window, "neko-drop"); + gtk_window_set_title(window, "Neko Drag & Drop Window"); gtk_window_set_decorated(window, FALSE); gtk_window_set_keep_above(window, TRUE); gtk_window_set_default_size(window, 0, 0); @@ -76,6 +79,7 @@ void drag_window(char **uris) { g_signal_connect(widget, "drag-end", G_CALLBACK(drag_end), NULL); g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); + fprintf(stderr, "Preparing to show drag and drop widget.\n"); gtk_widget_show_all(widget); gtk_main(); } From c808759709c9eb4e3bd1bb5320e2493a684d1cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jan 2021 14:15:17 +0100 Subject: [PATCH 264/876] gst free error only if occurs. --- internal/capture/gst/gst.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 31b9e504..d14711ef 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -172,9 +172,9 @@ func CreatePipeline(pipelineStr string, clockRate float32) (*Pipeline, error) { var gstError *C.GError gstPipeline = C.gst_parse_launch(pipelineStrUnsafe, &gstError) - defer C.g_error_free(gstError) if gstError != nil { + defer C.g_error_free(gstError) return nil, fmt.Errorf("(pipeline error) %s", C.GoString(gstError.message)) } From 253247f6ce7658b6b13628c7c3ef8bf6883e8ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jan 2021 16:42:33 +0100 Subject: [PATCH 265/876] gkt drag and drop remove duplicity. --- internal/desktop/gtk.go | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/internal/desktop/gtk.go b/internal/desktop/gtk.go index 451447cc..5decbd2f 100644 --- a/internal/desktop/gtk.go +++ b/internal/desktop/gtk.go @@ -17,14 +17,22 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) { go gtk.DragWindow(files) // TODO: Find a bettter way. - time.Sleep(DELAY) - manager.Move(0, 0) - manager.ButtonDown(1) - manager.Move(x, y) - time.Sleep(DELAY) - manager.Move(x, y) - time.Sleep(DELAY) - manager.Move(x, y) - time.Sleep(DELAY) - manager.ButtonUp(1) + for step := 1; step <= 6; step++ { + time.Sleep(DELAY) + + switch step { + case 1: + manager.Move(0, 0) + case 2: + manager.ButtonDown(1) + case 3: + fallthrough + case 4: + fallthrough + case 5: + manager.Move(x, y) + case 6: + manager.ButtonUp(1) + } + } } From a96b77005211c96f38eab0aa37e2ef8160cdb98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jan 2021 19:53:58 +0100 Subject: [PATCH 266/876] gtk drop refactored using events. --- internal/desktop/drop.go | 53 +++++++++++++++++ internal/desktop/drop/drop.c | 93 ++++++++++++++++++++++++++++++ internal/desktop/drop/drop.go | 65 +++++++++++++++++++++ internal/desktop/drop/drop.h | 36 ++++++++++++ internal/desktop/gtk.go | 38 ------------- internal/desktop/gtk/gtk.c | 103 ---------------------------------- internal/desktop/gtk/gtk.go | 29 ---------- internal/desktop/gtk/gtk.h | 29 ---------- internal/types/desktop.go | 2 +- 9 files changed, 248 insertions(+), 200 deletions(-) create mode 100644 internal/desktop/drop.go create mode 100644 internal/desktop/drop/drop.c create mode 100644 internal/desktop/drop/drop.go create mode 100644 internal/desktop/drop/drop.h delete mode 100644 internal/desktop/gtk.go delete mode 100644 internal/desktop/gtk/gtk.c delete mode 100644 internal/desktop/gtk/gtk.go delete mode 100644 internal/desktop/gtk/gtk.h diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go new file mode 100644 index 00000000..8bbbdbd4 --- /dev/null +++ b/internal/desktop/drop.go @@ -0,0 +1,53 @@ +package desktop + +import ( + "time" + + "demodesk/neko/internal/desktop/drop" +) + +const ( + DROP_DELAY = 100 * time.Millisecond +) + +func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { + mu.Lock() + defer mu.Unlock() + + drop.Emmiter.Clear() + + drop.Emmiter.Once("create", func(payload ...interface{}) { + manager.Move(0, 0) + }) + + drop.Emmiter.Once("cursor-enter", func(payload ...interface{}) { + manager.ButtonDown(1) + }) + + drop.Emmiter.Once("button-press", func(payload ...interface{}) { + manager.Move(x, y) + }) + + drop.Emmiter.Once("begin", func(payload ...interface{}) { + manager.Move(x, y) + time.Sleep(DROP_DELAY) + manager.Move(x, y) + time.Sleep(DROP_DELAY) + manager.ButtonUp(1) + }) + + finished := make(chan bool) + drop.Emmiter.Once("finish", func(payload ...interface{}) { + finished <- payload[0].(bool) + }) + + go drop.OpenWindow(files) + + select { + case succeeded := <- finished: + return succeeded + case <-time.After(1 * time.Second): + drop.CloseWindow(); + return false + } +} diff --git a/internal/desktop/drop/drop.c b/internal/desktop/drop/drop.c new file mode 100644 index 00000000..25568c07 --- /dev/null +++ b/internal/desktop/drop/drop.c @@ -0,0 +1,93 @@ +#include "drop.h" + +GtkWidget *drag_widget = NULL; + +static void dragDataGet( + GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *data, + guint target_type, + guint time, + gpointer user_data +) { + gchar **uris = (gchar **) user_data; + + if (target_type == DRAG_TARGET_TYPE_URI) { + gtk_selection_data_set_uris(data, uris); + return; + } + + if (target_type == DRAG_TARGET_TYPE_TEXT) { + gtk_selection_data_set_text(data, uris[0], -1); + return; + } +} + +static void dragEnd( + GtkWidget *widget, + GdkDragContext *context, + gpointer user_data +) { + gboolean succeeded = gdk_drag_drop_succeeded(context); + gtk_widget_destroy(widget); + goDragFinish(succeeded); + drag_widget = NULL; +} + +void dragWindowOpen(char **uris) { + if (drag_widget != NULL) dragWindowClose(); + + gtk_init(NULL, NULL); + + GtkWidget *widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);; + GtkWindow *window = GTK_WINDOW(widget); + + gtk_window_move(window, 0, 0); + gtk_window_set_title(window, "Neko Drag & Drop Window"); + gtk_window_set_decorated(window, FALSE); + gtk_window_set_keep_above(window, TRUE); + gtk_window_set_default_size(window, 100, 100); + + GtkTargetList* target_list = gtk_target_list_new(NULL, 0); + gtk_target_list_add_uri_targets(target_list, DRAG_TARGET_TYPE_URI); + gtk_target_list_add_text_targets(target_list, DRAG_TARGET_TYPE_TEXT); + + gtk_drag_source_set(widget, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_ASK); + gtk_drag_source_set_target_list(widget, target_list); + + g_signal_connect(widget, "map-event", G_CALLBACK(goDragCreate), NULL); + g_signal_connect(widget, "enter-notify-event", G_CALLBACK(goDragCursorEnter), NULL); + g_signal_connect(widget, "button-press-event", G_CALLBACK(goDragButtonPress), NULL); + g_signal_connect(widget, "drag-begin", G_CALLBACK(goDragBegin), NULL); + + g_signal_connect(widget, "drag-data-get", G_CALLBACK(dragDataGet), uris); + g_signal_connect(widget, "drag-end", G_CALLBACK(dragEnd), NULL); + g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); + + gtk_widget_show_all(widget); + drag_widget = widget; + + gtk_main(); +} + +void dragWindowClose() { + gtk_widget_destroy(drag_widget); + drag_widget = NULL; +} + +char **dragUrisMake(int size) { + return calloc(size + 1, sizeof(char *)); +} + +void dragUrisSetFile(char **uris, char *file, int n) { + GFile *gfile = g_file_new_for_path(file); + uris[n] = g_file_get_uri(gfile); +} + +void dragUrisFree(char **uris, int size) { + for (int i = 0; i < size; i++) { + free(uris[i]); + } + + free(uris); +} diff --git a/internal/desktop/drop/drop.go b/internal/desktop/drop/drop.go new file mode 100644 index 00000000..dd06f993 --- /dev/null +++ b/internal/desktop/drop/drop.go @@ -0,0 +1,65 @@ +package drop + +/* +#cgo pkg-config: gtk+-3.0 + +#include "drop.h" +*/ +import "C" + +import ( + "sync" + + "github.com/kataras/go-events" +) + +var Emmiter events.EventEmmiter +var mu = sync.Mutex{} + +func init() { + Emmiter = events.New() +} + +func OpenWindow(files []string) { + mu.Lock() + defer mu.Unlock() + + size := C.int(len(files)) + urisUnsafe := C.dragUrisMake(size); + defer C.dragUrisFree(urisUnsafe, size) + + for i, file := range files { + C.dragUrisSetFile(urisUnsafe, C.CString(file), C.int(i)) + } + + C.dragWindowOpen(urisUnsafe) +} + +func CloseWindow() { + C.dragWindowClose() +} + +//export goDragCreate +func goDragCreate(widget *C.GtkWidget, event *C.GdkEvent, user_data C.gpointer) { + go Emmiter.Emit("create") +} + +//export goDragCursorEnter +func goDragCursorEnter(widget *C.GtkWidget, event *C.GdkEvent, user_data C.gpointer) { + go Emmiter.Emit("cursor-enter") +} + +//export goDragButtonPress +func goDragButtonPress(widget *C.GtkWidget, event *C.GdkEvent, user_data C.gpointer) { + go Emmiter.Emit("button-press") +} + +//export goDragBegin +func goDragBegin(widget *C.GtkWidget, context *C.GdkDragContext, user_data C.gpointer) { + go Emmiter.Emit("begin") +} + +//export goDragFinish +func goDragFinish(succeeded C.gboolean) { + go Emmiter.Emit("finish", bool(succeeded == C.int(1))) +} diff --git a/internal/desktop/drop/drop.h b/internal/desktop/drop/drop.h new file mode 100644 index 00000000..e18c99a2 --- /dev/null +++ b/internal/desktop/drop/drop.h @@ -0,0 +1,36 @@ +#pragma once + +#include + +enum { + DRAG_TARGET_TYPE_TEXT, + DRAG_TARGET_TYPE_URI +}; + +extern void goDragCreate(GtkWidget *widget, GdkEvent *event, gpointer user_data); +extern void goDragCursorEnter(GtkWidget *widget, GdkEvent *event, gpointer user_data); +extern void goDragButtonPress(GtkWidget *widget, GdkEvent *event, gpointer user_data); +extern void goDragBegin(GtkWidget *widget, GdkDragContext *context, gpointer user_data); +extern void goDragFinish(gboolean succeeded); + +static void dragDataGet( + GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *data, + guint target_type, + guint time, + gpointer user_data +); + +static void dragEnd( + GtkWidget *widget, + GdkDragContext *context, + gpointer user_data +); + +void dragWindowOpen(char **uris); +void dragWindowClose(); + +char **dragUrisMake(int size); +void dragUrisSetFile(char **uris, char *file, int n); +void dragUrisFree(char **uris, int size); diff --git a/internal/desktop/gtk.go b/internal/desktop/gtk.go deleted file mode 100644 index 5decbd2f..00000000 --- a/internal/desktop/gtk.go +++ /dev/null @@ -1,38 +0,0 @@ -package desktop - -import ( - "time" - - "demodesk/neko/internal/desktop/gtk" -) - -const ( - DELAY = 100 * time.Millisecond -) - -func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) { - mu.Lock() - defer mu.Unlock() - - go gtk.DragWindow(files) - - // TODO: Find a bettter way. - for step := 1; step <= 6; step++ { - time.Sleep(DELAY) - - switch step { - case 1: - manager.Move(0, 0) - case 2: - manager.ButtonDown(1) - case 3: - fallthrough - case 4: - fallthrough - case 5: - manager.Move(x, y) - case 6: - manager.ButtonUp(1) - } - } -} diff --git a/internal/desktop/gtk/gtk.c b/internal/desktop/gtk/gtk.c deleted file mode 100644 index ffdb0ff1..00000000 --- a/internal/desktop/gtk/gtk.c +++ /dev/null @@ -1,103 +0,0 @@ -#include "gtk.h" - -static void drag_data_get( - GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *data, - guint target_type, - guint time, - gpointer user_data -) { - gchar **uris = (gchar **) user_data; - - if (target_type == TARGET_TYPE_URI) { - gtk_selection_data_set_uris(data, uris); - return; - } - - if (target_type == TARGET_TYPE_TEXT) { - gtk_selection_data_set_text(data, uris[0], -1); - return; - } -} - -static void drag_end( - GtkWidget *widget, - GdkDragContext *context, - gpointer user_data -) { - gboolean succeeded = gdk_drag_drop_succeeded(context); - GdkDragAction action = gdk_drag_context_get_selected_action(context); - - char* action_str; - switch (action) { - case GDK_ACTION_COPY: - action_str = "COPY"; break; - case GDK_ACTION_MOVE: - action_str = "MOVE"; break; - case GDK_ACTION_LINK: - action_str = "LINK"; break; - case GDK_ACTION_ASK: - action_str = "ASK"; break; - default: - action_str = malloc(sizeof(char) * 20); - snprintf(action_str, 20, "invalid (%d)", action); - break; - } - - fprintf(stderr, "Selected drop action: %s; Succeeded: %d\n", action_str, succeeded); - if (action_str[0] == 'i') { - free(action_str); - } - - gtk_widget_destroy(widget); -} - -void drag_window(char **uris) { - if (gtk_init_check(NULL, NULL) == FALSE) { - fprintf(stderr, "Unable to initialize GTK for drag and drop widget!\n"); - return; - } - - GtkWidget *widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); - GtkWindow *window = GTK_WINDOW(widget); - - gtk_window_move(window, 0, 0); - gtk_window_set_title(window, "Neko Drag & Drop Window"); - gtk_window_set_decorated(window, FALSE); - gtk_window_set_keep_above(window, TRUE); - gtk_window_set_default_size(window, 0, 0); - - GtkTargetList* target_list = gtk_target_list_new(NULL, 0); - gtk_target_list_add_uri_targets(target_list, TARGET_TYPE_URI); - gtk_target_list_add_text_targets(target_list, TARGET_TYPE_TEXT); - - gtk_drag_source_set(widget, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_ASK); - gtk_drag_source_set_target_list(widget, target_list); - - g_signal_connect(widget, "drag-data-get", G_CALLBACK(drag_data_get), uris); - g_signal_connect(widget, "drag-end", G_CALLBACK(drag_end), NULL); - g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); - - fprintf(stderr, "Preparing to show drag and drop widget.\n"); - gtk_widget_show_all(widget); - gtk_main(); -} - -char **uris_make(int size) { - return calloc(size + 1, sizeof(char *)); -} - -void uris_set_file(char **uris, char *file, int n) { - GFile *gfile = g_file_new_for_path(file); - uris[n] = g_file_get_uri(gfile); -} - -void uris_free(char **uris, int size) { - int i; - for (i = 0; i < size; i++) { - free(uris[i]); - } - - free(uris); -} diff --git a/internal/desktop/gtk/gtk.go b/internal/desktop/gtk/gtk.go deleted file mode 100644 index 58d64dce..00000000 --- a/internal/desktop/gtk/gtk.go +++ /dev/null @@ -1,29 +0,0 @@ -package gtk - -/* -#cgo pkg-config: gtk+-3.0 - -#include "gtk.h" -*/ -import "C" - -import ( - "sync" -) - -var mu = sync.Mutex{} - -func DragWindow(files []string) { - mu.Lock() - defer mu.Unlock() - - size := C.int(len(files)) - urisUnsafe := C.uris_make(size); - defer C.uris_free(urisUnsafe, size) - - for i, file := range files { - C.uris_set_file(urisUnsafe, C.CString(file), C.int(i)) - } - - C.drag_window(urisUnsafe) -} diff --git a/internal/desktop/gtk/gtk.h b/internal/desktop/gtk/gtk.h deleted file mode 100644 index da2a06e9..00000000 --- a/internal/desktop/gtk/gtk.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include - -enum { - TARGET_TYPE_TEXT, - TARGET_TYPE_URI -}; - -static void drag_data_get( - GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *data, - guint target_type, - guint time, - gpointer user_data -); - -static void drag_end( - GtkWidget *widget, - GdkDragContext *context, - gpointer user_data -); - -void drag_window(char **uris); - -char **uris_make(int size); -void uris_set_file(char **uris, char *file, int n); -void uris_free(char **uris, int size); diff --git a/internal/types/desktop.go b/internal/types/desktop.go index afecec53..ec1af1d3 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -59,5 +59,5 @@ type DesktopManager interface { WriteClipboard(data string) // drop - DropFiles(x int, y int, files []string) + DropFiles(x int, y int, files []string) bool } From 8c47cbae688bf582280d5bbe34aae71df4b31706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jan 2021 19:54:22 +0100 Subject: [PATCH 267/876] multipart form correct destroying. --- internal/api/room/upload.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index acb6bc0f..e98d5ff3 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -19,6 +19,13 @@ const ( func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { r.ParseMultipartForm(MAX_UPLOAD_SIZE) + if r.MultipartForm == nil { + utils.HttpBadRequest(w, "No MultipartForm received.") + return + } + + defer r.MultipartForm.RemoveAll() + X, err := strconv.Atoi(r.FormValue("x")) if err != nil { utils.HttpBadRequest(w, "No X coordinate received.") @@ -31,11 +38,6 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { return } - if r.MultipartForm == nil { - utils.HttpBadRequest(w, "No MultipartForm received.") - return - } - req_files := r.MultipartForm.File["files"] if len(req_files) == 0 { utils.HttpBadRequest(w, "No files received.") @@ -77,8 +79,10 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { files = append(files, path) } - h.desktop.DropFiles(X, Y, files) + if !h.desktop.DropFiles(X, Y, files) { + utils.HttpInternalServerError(w, "Unable to drop files.") + return + } - r.MultipartForm.RemoveAll() utils.HttpSuccess(w) } From 0e09609c6737893c283c2df464293fb5ec047b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 15 Jan 2021 16:53:03 +0100 Subject: [PATCH 268/876] KeyboardLayout to KeyboardMap. --- internal/api/room/handler.go | 3 ++- internal/api/room/keyboard.go | 28 +++++++++++++++++++----- internal/desktop/xorg.go | 30 ++++++++++++++++++++++++-- internal/types/desktop.go | 8 ++++++- internal/types/event/events.go | 2 +- internal/types/message/messages.go | 12 +++++------ internal/websocket/handler/handler.go | 8 +++---- internal/websocket/handler/keyboard.go | 7 ++++-- 8 files changed, 76 insertions(+), 22 deletions(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 13d06800..3d7026f7 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -43,7 +43,8 @@ func (h *RoomHandler) Route(r chi.Router) { }) r.Route("/keyboard", func(r chi.Router) { - r.With(auth.HostsOnly).Post("/layout", h.keyboardLayoutSet) + r.Get("/map", h.keyboardMapGet) + r.With(auth.HostsOnly).Post("/map", h.keyboardMapSet) r.Get("/modifiers", h.keyboardModifiersGet) r.With(auth.HostsOnly).Post("/modifiers", h.keyboardModifiersSet) diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index f2f89e2f..1a3bf8c9 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -7,7 +7,7 @@ import ( "demodesk/neko/internal/types" ) -type KeyboardLayoutData struct { +type KeyboardMapData struct { Layout string `json:"layout"` Variant string `json:"variant"` } @@ -17,21 +17,39 @@ type KeyboardModifiersData struct { CapsLock *bool `json:"capslock"` } -func (h *RoomHandler) keyboardLayoutSet(w http.ResponseWriter, r *http.Request) { - data := &KeyboardLayoutData{} +func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) { + data := &KeyboardMapData{} if !utils.HttpJsonRequest(w, r, data) { return } - err := h.desktop.SetKeyboardLayout(data.Layout, data.Variant) + err := h.desktop.SetKeyboardMap(types.KeyboardMap{ + Layout: data.Layout, + Variant: data.Variant, + }) + if err != nil{ - utils.HttpInternalServerError(w, "Unable to change keyboard layout.") + utils.HttpInternalServerError(w, "Unable to change keyboard map.") return } utils.HttpSuccess(w) } +func (h *RoomHandler) keyboardMapGet(w http.ResponseWriter, r *http.Request) { + data, err := h.desktop.GetKeyboardMap() + + if err != nil{ + utils.HttpInternalServerError(w, "Unable to get keyboard map.") + return + } + + utils.HttpSuccess(w, KeyboardMapData{ + Layout: data.Layout, + Variant: data.Variant, + }) +} + func (h *RoomHandler) keyboardModifiersSet(w http.ResponseWriter, r *http.Request) { data := &KeyboardModifiersData{} if !utils.HttpJsonRequest(w, r, data) { diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 3ab84b40..6fd2c8f2 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -1,6 +1,7 @@ package desktop import ( + "regexp" "os/exec" "demodesk/neko/internal/types" @@ -55,13 +56,38 @@ func (manager *DesktopManagerCtx) ChangeScreenSize(width int, height int, rate i return xorg.ChangeScreenSize(width, height, rate) } -func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string, variant string) error { +func (manager *DesktopManagerCtx) SetKeyboardMap(kbd types.KeyboardMap) error { // TOOD: Use native API. - cmd := exec.Command("setxkbmap", "-layout", layout, "-variant", variant) + cmd := exec.Command("setxkbmap", "-layout", kbd.Layout, "-variant", kbd.Variant) _, err := cmd.Output() return err } +func (manager *DesktopManagerCtx) GetKeyboardMap() (*types.KeyboardMap, error) { + // TOOD: Use native API. + cmd := exec.Command("setxkbmap", "-query") + res, err := cmd.Output() + if err != nil { + return nil, err + } + + kbd := types.KeyboardMap{} + + re := regexp.MustCompile(`layout:\s+(.*)\n`) + arr := re.FindStringSubmatch(string(res)) + if len(arr) > 1 { + kbd.Layout = arr[1] + } + + re = regexp.MustCompile(`variant:\s+(.*)\n`) + arr = re.FindStringSubmatch(string(res)) + if len(arr) > 1 { + kbd.Variant = arr[1] + } + + return &kbd, nil +} + func (manager *DesktopManagerCtx) SetKeyboardModifiers(mod types.KeyboardModifiers) { if mod.NumLock != nil { xorg.SetKeyboardModifier(xorg.KBD_NUM_LOCK, *mod.NumLock) diff --git a/internal/types/desktop.go b/internal/types/desktop.go index ec1af1d3..0f1e646c 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -26,6 +26,11 @@ type KeyboardModifiers struct { CapsLock *bool } +type KeyboardMap struct { + Layout string + Variant string +} + type DesktopManager interface { Start() Shutdown() error @@ -43,7 +48,8 @@ type DesktopManager interface { ResetKeys() ScreenConfigurations() map[int]ScreenConfiguration GetScreenSize() *ScreenSize - SetKeyboardLayout(layout string, variant string) error + SetKeyboardMap(KeyboardMap) error + GetKeyboardMap() (*KeyboardMap, error) SetKeyboardModifiers(mod KeyboardModifiers) GetKeyboardModifiers() KeyboardModifiers GetCursorImage() *CursorImage diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 48a6a6f9..09593304 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -41,7 +41,7 @@ const ( const ( KEYBOARD_MODIFIERS = "keyboard/modifiers" - KEYBOARD_LAYOUT = "keyboard/layout" + KEYBOARD_MAP = "keyboard/map" ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 9102dd91..c1fd0d13 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -132,6 +132,12 @@ type ClipboardData struct { // Keyboard ///////////////////////////// +type KeyboardMap struct { + Event string `json:"event,omitempty"` + Layout string `json:"layout"` + Variant string `json:"variant"` +} + type KeyboardModifiers struct { Event string `json:"event,omitempty"` CapsLock *bool `json:"caps_lock"` @@ -139,12 +145,6 @@ type KeyboardModifiers struct { ScrollLock *bool `json:"scroll_lock"` } -type KeyboardLayout struct { - Event string `json:"event,omitempty"` - Layout string `json:"layout"` - Variant string `json:"variant"` -} - ///////////////////////////// // Cursor ///////////////////////////// diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 6f8c438d..22e109bb 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -76,12 +76,12 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { }) // Keyboard Events - case event.KEYBOARD_MODIFIERS: - payload := &message.KeyboardLayout{} + case event.KEYBOARD_MAP: + payload := &message.KeyboardMap{} err = utils.Unmarshal(payload, raw, func() error { - return h.keyboardLayout(session, payload) + return h.keyboardMap(session, payload) }) - case event.KEYBOARD_LAYOUT: + case event.KEYBOARD_MODIFIERS: payload := &message.KeyboardModifiers{} err = utils.Unmarshal(payload, raw, func() error { return h.keyboardModifiers(session, payload) diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 563feb6d..867b28ff 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -6,13 +6,16 @@ import ( ) -func (h *MessageHandlerCtx) keyboardLayout(session types.Session, payload *message.KeyboardLayout) error { +func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error { if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") return nil } - return h.desktop.SetKeyboardLayout(payload.Layout, payload.Variant) + return h.desktop.SetKeyboardMap(types.KeyboardMap{ + Layout: payload.Layout, + Variant: payload.Variant, + }) } func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *message.KeyboardModifiers) error { From 3bbe3781c87860ad0f9088ff8cbbb5b6e8fda525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 15 Jan 2021 17:30:19 +0100 Subject: [PATCH 269/876] set screen size using struct. --- internal/api/room/screen.go | 17 +++++++++++------ internal/config/desktop.go | 4 ++-- internal/desktop/xorg.go | 12 ++++++------ internal/desktop/xorg/xorg.go | 4 ++-- internal/types/desktop.go | 2 +- internal/types/message/messages.go | 2 +- internal/websocket/handler/screen.go | 6 +++++- internal/websocket/handler/system.go | 4 ++-- 8 files changed, 30 insertions(+), 21 deletions(-) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 06a3b729..a14f22c7 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -3,15 +3,16 @@ package room import ( "net/http" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" "demodesk/neko/internal/utils" ) type ScreenConfigurationPayload struct { - Width int `json:"width"` - Height int `json:"height"` - Rate int `json:"rate"` + Width int `json:"width"` + Height int `json:"height"` + Rate int16 `json:"rate"` } func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request) { @@ -25,7 +26,7 @@ func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request utils.HttpSuccess(w, ScreenConfigurationPayload{ Width: size.Width, Height: size.Height, - Rate: int(size.Rate), + Rate: size.Rate, }) } @@ -35,7 +36,11 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R return } - if err := h.desktop.ChangeScreenSize(data.Width, data.Height, data.Rate); err != nil { + if err := h.desktop.SetScreenSize(types.ScreenSize{ + Width: data.Width, + Height: data.Height, + Rate: data.Rate, + }); err != nil { utils.HttpUnprocessableEntity(w, err) return } @@ -60,7 +65,7 @@ func (h *RoomHandler) screenConfigurationsList(w http.ResponseWriter, r *http.Re list = append(list, ScreenConfigurationPayload{ Width: size.Width, Height: size.Height, - Rate: int(fps), + Rate: fps, }) } } diff --git a/internal/config/desktop.go b/internal/config/desktop.go index bd484b05..f67daace 100644 --- a/internal/config/desktop.go +++ b/internal/config/desktop.go @@ -11,7 +11,7 @@ import ( type Desktop struct { ScreenWidth int ScreenHeight int - ScreenRate int + ScreenRate int16 } func (Desktop) Init(cmd *cobra.Command) error { @@ -39,7 +39,7 @@ func (s *Desktop) Set() { if err1 == nil && err2 == nil && err3 == nil { s.ScreenWidth = int(width) s.ScreenHeight = int(height) - s.ScreenRate = int(rate) + s.ScreenRate = int16(rate) } } } diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 6fd2c8f2..f1c1dd4e 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -40,11 +40,7 @@ func (manager *DesktopManagerCtx) ScreenConfigurations() map[int]types.ScreenCon return xorg.ScreenConfigurations } -func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize { - return xorg.GetScreenSize() -} - -func (manager *DesktopManagerCtx) ChangeScreenSize(width int, height int, rate int) error { +func (manager *DesktopManagerCtx) SetScreenSize(size types.ScreenSize) error { mu.Lock() manager.emmiter.Emit("before_screen_size_change") @@ -53,7 +49,11 @@ func (manager *DesktopManagerCtx) ChangeScreenSize(width int, height int, rate i mu.Unlock() }() - return xorg.ChangeScreenSize(width, height, rate) + return xorg.ChangeScreenSize(size.Width, size.Height, size.Rate) +} + +func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize { + return xorg.GetScreenSize() } func (manager *DesktopManagerCtx) SetKeyboardMap(kbd types.KeyboardMap) error { diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 6649d93e..22a745f6 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -167,14 +167,14 @@ func CheckKeys(duration time.Duration) { } } -func ChangeScreenSize(width int, height int, rate int) error { +func ChangeScreenSize(width int, height int, rate int16) error { mu.Lock() defer mu.Unlock() for index, size := range ScreenConfigurations { if size.Width == width && size.Height == height { for _, fps := range size.Rates { - if int16(rate) == fps { + if rate == fps { C.XSetScreenConfiguration(C.int(index), C.short(fps)) return nil } diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 0f1e646c..a0aaad3b 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -38,7 +38,6 @@ type DesktopManager interface { OnAfterScreenSizeChange(listener func()) // xorg - ChangeScreenSize(width int, height int, rate int) error Move(x, y int) Scroll(x, y int) ButtonDown(code int) error @@ -47,6 +46,7 @@ type DesktopManager interface { KeyUp(code uint64) error ResetKeys() ScreenConfigurations() map[int]ScreenConfiguration + SetScreenSize(ScreenSize) error GetScreenSize() *ScreenSize SetKeyboardMap(KeyboardMap) error GetKeyboardMap() (*KeyboardMap, error) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index c1fd0d13..fe31194c 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -116,7 +116,7 @@ type ScreenSize struct { Event string `json:"event,omitempty"` Width int `json:"width"` Height int `json:"height"` - Rate int `json:"rate"` + Rate int16 `json:"rate"` } ///////////////////////////// diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 5aa5da14..1062d46b 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -12,7 +12,11 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc return nil } - if err := h.desktop.ChangeScreenSize(payload.Width, payload.Height, payload.Rate); err != nil { + if err := h.desktop.SetScreenSize(types.ScreenSize{ + Width: payload.Width, + Height: payload.Height, + Rate: payload.Rate, + }); err != nil { return err } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 4f08831d..f9bdf978 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -55,7 +55,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { ScreenSize: message.ScreenSize{ Width: size.Width, Height: size.Height, - Rate: int(size.Rate), + Rate: size.Rate, }, Members: members, ImplicitHosting: h.sessions.ImplicitHosting(), @@ -70,7 +70,7 @@ func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { screenSizesList = append(screenSizesList, message.ScreenSize{ Width: size.Width, Height: size.Height, - Rate: int(fps), + Rate: fps, }) } } From 80550350a85e3188b9212fe70f8bc049fa064563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 15 Jan 2021 18:00:04 +0100 Subject: [PATCH 270/876] DROP_MOVE_REPEAT. --- internal/desktop/drop.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index 8bbbdbd4..0fe7c8f6 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -7,6 +7,7 @@ import ( ) const ( + DROP_MOVE_REPEAT = 4 DROP_DELAY = 100 * time.Millisecond ) @@ -29,10 +30,11 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { }) drop.Emmiter.Once("begin", func(payload ...interface{}) { - manager.Move(x, y) - time.Sleep(DROP_DELAY) - manager.Move(x, y) - time.Sleep(DROP_DELAY) + for i := 0; i < DROP_MOVE_REPEAT; i++ { + manager.Move(x, y) + time.Sleep(DROP_DELAY) + } + manager.ButtonUp(1) }) From ac7200c6307b43a5035db24ab0c288060726aba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 17 Jan 2021 19:10:49 +0100 Subject: [PATCH 271/876] simplify xorg condition. --- internal/desktop/xorg/xorg.c | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index ef8b8001..aded68c8 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -52,33 +52,33 @@ void XScroll(int x, int y) { } void XButton(unsigned int button, int down) { - if (button != 0) { - Display *display = getXDisplay(); - XTestFakeButtonEvent(display, button, down, CurrentTime); - XSync(display, 0); - } + if (button == 0) return; + + Display *display = getXDisplay(); + XTestFakeButtonEvent(display, button, down, CurrentTime); + XSync(display, 0); } void XKey(unsigned long key, int down) { - if (key != 0) { - Display *display = getXDisplay(); - KeyCode code = XKeysymToKeycode(display, key); + if (key == 0) return; - // Map non-existing keysyms to new keycodes - if (code == 0) { - int min, max, numcodes; - XDisplayKeycodes(display, &min, &max); - XGetKeyboardMapping(display, min, max-min, &numcodes); + Display *display = getXDisplay(); + KeyCode code = XKeysymToKeycode(display, key); - code = (max-min+1)*numcodes; - KeySym keysym_list[numcodes]; - for(int i=0;i Date: Sun, 17 Jan 2021 19:10:59 +0100 Subject: [PATCH 272/876] allow debug mode from ENV or config. --- cmd/root.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/root.go b/cmd/root.go index 172cd652..41835a9c 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -104,6 +104,11 @@ func init() { } } + // debug mode from ENV or config + if viper.GetBool("debug") { + zerolog.SetGlobalLevel(zerolog.DebugLevel) + } + file := viper.ConfigFileUsed() logger := log.With(). Bool("debug", viper.GetBool("debug")). From 98dc08cba926441514aa8ab20d33d637ab2d28c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 17 Jan 2021 20:47:34 +0100 Subject: [PATCH 273/876] Dockerfile updated. --- Dockerfile | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 98fc5b07..ceb85cd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,17 +7,19 @@ WORKDIR /src # # install dependencies ENV DEBIAN_FRONTEND=noninteractive -RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends git cmake make libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly; \ +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \ + git cmake make; \ # # install libclipboard - set -eux; \ cd /tmp; \ git clone https://github.com/jtanx/libclipboard; \ cd libclipboard; \ cmake .; \ - make -j4; \ + make -j`nproc`; \ make install; \ rm -rf /tmp/libclipboard; \ # @@ -44,14 +46,20 @@ ARG USER_GID=$USER_UID # # install dependencies ENV DEBIAN_FRONTEND=noninteractive -RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends wget ca-certificates supervisor; \ - apt-get install -y --no-install-recommends pulseaudio dbus-x11 xserver-xorg-video-dummy xserver-xorg-input-void; \ - apt-get install -y --no-install-recommends libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx5; \ - # - # gst - apt-get install -y --no-install-recommends libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \ - gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-pulseaudio; \ +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + wget ca-certificates supervisor \ + pulseaudio dbus-x11 xserver-xorg-video-dummy xserver-xorg-input-void \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx5 \ + # + # file chooser handler + xdotool \ + # + # gst + gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ + gstreamer1.0-pulseaudio; \ # # create a non-root user groupadd --gid $USER_GID $USERNAME; \ @@ -88,7 +96,7 @@ COPY runtime/xorg.conf /etc/neko/xorg.conf # # copy runtime folders -COPY runtime/icon-theme /home/neko/.icons/default +COPY runtime/icon-theme /home/$USERNAME/.icons/default # # set default envs From 2b3bb6e21aace89e4d0f6414935fa0de9595e13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 17 Jan 2021 23:50:03 +0100 Subject: [PATCH 274/876] upload dialog API. --- internal/api/room/handler.go | 1 + internal/api/room/upload.go | 62 +++++++++++++++++++++++++++++++++ internal/desktop/filechooser.go | 58 ++++++++++++++++++++++++++++++ internal/types/desktop.go | 5 +++ 4 files changed, 126 insertions(+) create mode 100644 internal/desktop/filechooser.go diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 3d7026f7..247d3a14 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -69,6 +69,7 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(h.uploadMiddleware).Route("/upload", func(r chi.Router) { r.Post("/drop", h.uploadDrop) + r.Post("/dialog", h.uploadDialog) }) } diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index e98d5ff3..cec1d8e3 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -86,3 +86,65 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } + + +func (h *RoomHandler) uploadDialog(w http.ResponseWriter, r *http.Request) { + r.ParseMultipartForm(MAX_UPLOAD_SIZE) + + if r.MultipartForm == nil { + utils.HttpBadRequest(w, "No MultipartForm received.") + return + } + + defer r.MultipartForm.RemoveAll() + + if !h.desktop.IsFileChooserDialogOpen() { + utils.HttpBadRequest(w, "Open file chooser dialog first.") + return + } + + req_files := r.MultipartForm.File["files"] + if len(req_files) == 0 { + utils.HttpBadRequest(w, "No files received.") + return + } + + dir, err := ioutil.TempDir("", "neko-dialog-*") + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + for _, req_file := range req_files { + path := path.Join(dir, req_file.Filename) + + srcFile, err := req_file.Open() + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + defer srcFile.Close() + + dstFile, err := os.OpenFile(path, os.O_APPEND | os.O_CREATE | os.O_WRONLY, 0644) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + defer dstFile.Close() + + _, err = io.Copy(dstFile, srcFile) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + } + + if err := h.desktop.HandleFileChooserDialog(dir); err != nil { + utils.HttpInternalServerError(w, "Unable to handle file chooser dialog.") + return + } + + utils.HttpSuccess(w) +} diff --git a/internal/desktop/filechooser.go b/internal/desktop/filechooser.go new file mode 100644 index 00000000..9fc25af8 --- /dev/null +++ b/internal/desktop/filechooser.go @@ -0,0 +1,58 @@ +package desktop + +import ( + "os/exec" +) + +func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { + mu.Lock() + defer mu.Unlock() + + // TOOD: Use native API. + cmd := exec.Command( + "xdotool", + "search", "--name", "Open", "windowfocus", + "sleep", "0.2", + "key", "--clearmodifiers", "ctrl+l", + "type", "--args", "1", uri + "//", + "key", "--clearmodifiers", "Return", + "sleep", "1", + "key", "--clearmodifiers", "Down", + "key", "--clearmodifiers", "ctrl+a", + "key", "--clearmodifiers", "Return", + "sleep", "0.3", + ) + + _, err := cmd.Output() + return err +} + +func (manager *DesktopManagerCtx) CloseFileChooserDialog() error { + mu.Lock() + defer mu.Unlock() + + // TOOD: Use native API. + cmd := exec.Command( + "xdotool", + "search", "--name", "Open", "windowfocus", + "sleep", "0.2", + "key", "--clearmodifiers", "alt+f4", + ) + + _, err := cmd.Output() + return err +} + +func (manager *DesktopManagerCtx) IsFileChooserDialogOpen() bool { + mu.Lock() + defer mu.Unlock() + + // TOOD: Use native API. + cmd := exec.Command( + "xdotool", + "search", "--name", "Open", "windowfocus", + ) + + _, err := cmd.Output() + return err == nil +} diff --git a/internal/types/desktop.go b/internal/types/desktop.go index a0aaad3b..7fa60538 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -66,4 +66,9 @@ type DesktopManager interface { // drop DropFiles(x int, y int, files []string) bool + + // filechooser + HandleFileChooserDialog(uri string) error + CloseFileChooserDialog() error + IsFileChooserDialogOpen() bool } From 8f60041b2db9774945b7f4f6525b876b15b39aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 18 Jan 2021 10:34:33 +0100 Subject: [PATCH 275/876] fix dialog close and add API. --- internal/api/room/handler.go | 3 ++- internal/api/room/upload.go | 17 +++++++++++++++-- internal/desktop/filechooser.go | 28 ++++++++++++++++------------ internal/types/desktop.go | 2 +- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 247d3a14..310b1817 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -69,7 +69,8 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(h.uploadMiddleware).Route("/upload", func(r chi.Router) { r.Post("/drop", h.uploadDrop) - r.Post("/dialog", h.uploadDialog) + r.Post("/dialog", h.uploadDialogPost) + r.Delete("/dialog", h.uploadDialogClose) }) } diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index cec1d8e3..6e8a098c 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -87,8 +87,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } - -func (h *RoomHandler) uploadDialog(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { r.ParseMultipartForm(MAX_UPLOAD_SIZE) if r.MultipartForm == nil { @@ -148,3 +147,17 @@ func (h *RoomHandler) uploadDialog(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w) } + +func (h *RoomHandler) uploadDialogClose(w http.ResponseWriter, r *http.Request) { + if !h.desktop.IsFileChooserDialogOpen() { + utils.HttpBadRequest(w, "File chooser dialog is not open.") + return + } + + if !h.desktop.CloseFileChooserDialog() { + utils.HttpInternalServerError(w, "Unable to close file chooser dialog.") + return + } + + utils.HttpSuccess(w) +} diff --git a/internal/desktop/filechooser.go b/internal/desktop/filechooser.go index 9fc25af8..df2922c5 100644 --- a/internal/desktop/filechooser.go +++ b/internal/desktop/filechooser.go @@ -27,20 +27,24 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { return err } -func (manager *DesktopManagerCtx) CloseFileChooserDialog() error { - mu.Lock() - defer mu.Unlock() +func (manager *DesktopManagerCtx) CloseFileChooserDialog() bool { + for i := 0; i < 5; i++ { + // TOOD: Use native API. + mu.Lock() + exec.Command( + "xdotool", + "search", "--name", "Open", "windowfocus", + "sleep", "0.2", + "key", "--clearmodifiers", "alt+F4", + ).Output() + mu.Unlock() - // TOOD: Use native API. - cmd := exec.Command( - "xdotool", - "search", "--name", "Open", "windowfocus", - "sleep", "0.2", - "key", "--clearmodifiers", "alt+f4", - ) + if !manager.IsFileChooserDialogOpen() { + return true + } + } - _, err := cmd.Output() - return err + return false } func (manager *DesktopManagerCtx) IsFileChooserDialogOpen() bool { diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 7fa60538..50333d20 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -69,6 +69,6 @@ type DesktopManager interface { // filechooser HandleFileChooserDialog(uri string) error - CloseFileChooserDialog() error + CloseFileChooserDialog() bool IsFileChooserDialogOpen() bool } From bd062d394921dbc56cded944f975920b727aceff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 18 Jan 2021 15:31:00 +0100 Subject: [PATCH 276/876] lint fix. --- internal/desktop/filechooser.go | 4 ++-- internal/desktop/xorg.go | 4 ++-- internal/utils/cursor.go | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/desktop/filechooser.go b/internal/desktop/filechooser.go index df2922c5..346673d6 100644 --- a/internal/desktop/filechooser.go +++ b/internal/desktop/filechooser.go @@ -9,7 +9,7 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { defer mu.Unlock() // TOOD: Use native API. - cmd := exec.Command( + cmd := exec.Command( "xdotool", "search", "--name", "Open", "windowfocus", "sleep", "0.2", @@ -52,7 +52,7 @@ func (manager *DesktopManagerCtx) IsFileChooserDialogOpen() bool { defer mu.Unlock() // TOOD: Use native API. - cmd := exec.Command( + cmd := exec.Command( "xdotool", "search", "--name", "Open", "windowfocus", ) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index f1c1dd4e..270f7baf 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -58,14 +58,14 @@ func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize { func (manager *DesktopManagerCtx) SetKeyboardMap(kbd types.KeyboardMap) error { // TOOD: Use native API. - cmd := exec.Command("setxkbmap", "-layout", kbd.Layout, "-variant", kbd.Variant) + cmd := exec.Command("setxkbmap", "-layout", kbd.Layout, "-variant", kbd.Variant) _, err := cmd.Output() return err } func (manager *DesktopManagerCtx) GetKeyboardMap() (*types.KeyboardMap, error) { // TOOD: Use native API. - cmd := exec.Command("setxkbmap", "-query") + cmd := exec.Command("setxkbmap", "-query") res, err := cmd.Output() if err != nil { return nil, err diff --git a/internal/utils/cursor.go b/internal/utils/cursor.go index d1c148d2..8f8d93ab 100644 --- a/internal/utils/cursor.go +++ b/internal/utils/cursor.go @@ -2,8 +2,8 @@ package utils import ( "bytes" - "image" - "image/color" + "image" + "image/color" "image/png" "encoding/base64" @@ -29,8 +29,8 @@ func GetCursorImageURI(cursor *types.CursorImage) (string, error) { } } - out := new(bytes.Buffer) - err := png.Encode(out, img) + out := new(bytes.Buffer) + err := png.Encode(out, img) if err != nil { return "", err } From 54760551f723f2a3898a0f4395faa28eafbfd116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 18 Jan 2021 21:40:57 +0100 Subject: [PATCH 277/876] add OnWindowConfigured. --- internal/desktop/xevent.go | 4 ++++ internal/desktop/xevent/xevent.c | 34 ++++++++++++++++++++++--------- internal/desktop/xevent/xevent.go | 15 ++++++++++++-- internal/desktop/xevent/xevent.h | 4 ++-- internal/types/desktop.go | 1 + 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index f59f2025..6f605fb1 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -16,6 +16,10 @@ func (manager *DesktopManagerCtx) OnWindowCreated(listener func(window uint32, n xevent.OnWindowCreated(listener) } +func (manager *DesktopManagerCtx) OnWindowConfigured(listener func(window uint32, name string, role string)) { + xevent.OnWindowConfigured(listener) +} + func (manager *DesktopManagerCtx) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { xevent.OnEventError(listener) } diff --git a/internal/desktop/xevent/xevent.c b/internal/desktop/xevent/xevent.c index f7d9e870..36aaa40e 100644 --- a/internal/desktop/xevent/xevent.c +++ b/internal/desktop/xevent/xevent.c @@ -23,8 +23,8 @@ void XEventLoop(char *name) { return; } - Atom XA_CLIPBOARD; - XA_CLIPBOARD = XInternAtom(display, "CLIPBOARD", 0); + Atom WM_WINDOW_ROLE = XInternAtom(display, "WM_WINDOW_ROLE", 1); + Atom XA_CLIPBOARD = XInternAtom(display, "CLIPBOARD", 0); XFixesSelectSelectionInput(display, root, XA_CLIPBOARD, XFixesSetSelectionOwnerNotifyMask); XFixesSelectCursorInput(display, root, XFixesDisplayCursorNotifyMask); XSelectInput(display, root, SubstructureNotifyMask); @@ -54,18 +54,32 @@ void XEventLoop(char *name) { } } - // XFixesSelectionNotifyEvent + // CreateNotify if (event.type == CreateNotify) { + Window window = event.xcreatewindow.window; + char *name; - XFetchName(display, event.xcreatewindow.window, &name); + XFetchName(display, window, &name); - char *role; - XTextProperty text_data; - Atom atom = XInternAtom(display, "WM_WINDOW_ROLE", True); - int status = XGetTextProperty(display, event.xcreatewindow.window, &text_data, atom); - role = (char *)text_data.value; + XTextProperty role; + XGetTextProperty(display, window, &role, WM_WINDOW_ROLE); - goXEventWindowCreated(event.xcreatewindow, name, role); + goXEventWindowCreated(window, name, role.value); + XFree(name); + continue; + } + + // ConfigureNotify + if (event.type == ConfigureNotify) { + Window window = event.xconfigure.window; + + char *name; + XFetchName(display, window, &name); + + XTextProperty role; + XGetTextProperty(display, window, &role, WM_WINDOW_ROLE); + + goXEventWindowConfigured(window, name, role.value); XFree(name); continue; } diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go index 467baa14..d6b32548 100644 --- a/internal/desktop/xevent/xevent.go +++ b/internal/desktop/xevent/xevent.go @@ -44,6 +44,12 @@ func OnWindowCreated(listener func(window uint32, name string, role string)) { }) } +func OnWindowConfigured(listener func(window uint32, name string, role string)) { + emmiter.On("window-configured", func(payload ...interface{}) { + listener(payload[0].(uint32), payload[1].(string), payload[2].(string)) + }) +} + func OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { emmiter.On("event-error", func(payload ...interface{}) { listener(payload[0].(uint8), payload[1].(string), payload[2].(uint8), payload[3].(uint8)) @@ -61,8 +67,13 @@ func goXEventClipboardUpdated() { } //export goXEventWindowCreated -func goXEventWindowCreated(event C.XCreateWindowEvent, name *C.char, role *C.char) { - emmiter.Emit("window-created", uint32(event.window), C.GoString(name), C.GoString(role)) +func goXEventWindowCreated(window C.Window, name *C.char, role *C.char) { + emmiter.Emit("window-created", uint32(window), C.GoString(name), C.GoString(role)) +} + +//export goXEventWindowConfigured +func goXEventWindowConfigured(window C.Window, name *C.char, role *C.char) { + emmiter.Emit("window-configured", uint32(window), C.GoString(name), C.GoString(role)) } //export goXEventError diff --git a/internal/desktop/xevent/xevent.h b/internal/desktop/xevent/xevent.h index 24ee7160..9314fc70 100644 --- a/internal/desktop/xevent/xevent.h +++ b/internal/desktop/xevent/xevent.h @@ -8,10 +8,10 @@ extern void goXEventCursorChanged(XFixesCursorNotifyEvent event); extern void goXEventClipboardUpdated(); -extern void goXEventWindowCreated(XCreateWindowEvent event, char *name, char *role); +extern void goXEventWindowCreated(Window window, char *name, char *role); +extern void goXEventWindowConfigured(Window window, char *name, char *role); extern void goXEventError(XErrorEvent *event, char *message); extern int goXEventActive(); static int XEventError(Display *display, XErrorEvent *event); void XEventLoop(char *display); - diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 50333d20..9ec70e8b 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -58,6 +58,7 @@ type DesktopManager interface { OnCursorChanged(listener func(serial uint64)) OnClipboardUpdated(listener func()) OnWindowCreated(listener func(window uint32, name string, role string)) + OnWindowConfigured(listener func(window uint32, name string, role string)) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) // clipboard From b49ed65a5cd677f3dbc99297d9ec331814f83c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 18 Jan 2021 21:43:44 +0100 Subject: [PATCH 278/876] add xorg PutWindowBelow. --- internal/desktop/xorg.go | 4 ++++ internal/desktop/xorg/xorg.c | 43 +++++++++++++++++++++++++++++++++++ internal/desktop/xorg/xorg.go | 7 ++++++ internal/desktop/xorg/xorg.h | 2 ++ 4 files changed, 56 insertions(+) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 270f7baf..1d1efef9 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -113,3 +113,7 @@ func (manager *DesktopManagerCtx) GetKeyboardModifiers() types.KeyboardModifiers func (manager *DesktopManagerCtx) GetCursorImage() *types.CursorImage { return xorg.GetCursorImage() } + +func (manager *DesktopManagerCtx) PutWindowBelow(window uint32) { + xorg.PutWindowBelow(window) +} diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index aded68c8..bb68a6ae 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -136,3 +136,46 @@ XFixesCursorImage *XGetCursorImage(void) { Display *display = getXDisplay(); return XFixesGetCursorImage(display); } + +void XPutWindowBelow(Window window) { + Display *display = getXDisplay(); + Window root = RootWindow(display, 0); + + // The WM_TRANSIENT_FOR property is defined by the [ICCCM] for managed windows. + // This specification extends the use of the property to override-redirect windows. + // If an override-redirect is a pop-up on behalf of another window, then the Client + // SHOULD set WM_TRANSIENT_FOR on the override-redirect to this other window. + // + // As an example, a Client should set WM_TRANSIENT_FOR on dropdown menus to the + // toplevel application window that contains the menubar. + + // Remove WM_TRANSIENT_FOR + Atom WM_TRANSIENT_FOR = XInternAtom(display, "WM_TRANSIENT_FOR", 0); + XDeleteProperty(display, window, WM_TRANSIENT_FOR); + + // Add _NET_WM_STATE_BELOW + XClientMessageEvent clientMessageEvent; + memset(&clientMessageEvent, 0, sizeof(clientMessageEvent)); + + // window = the respective client window + // message_type = _NET_WM_STATE + // format = 32 + // data.l[0] = the action, as listed below + // _NET_WM_STATE_REMOVE 0 // remove/unset property + // _NET_WM_STATE_ADD 1 // add/set property + // _NET_WM_STATE_TOGGLE 2 // toggle property + // data.l[1] = first property to alter + // data.l[2] = second property to alter + // data.l[3] = source indication + // other data.l[] elements = 0 + + clientMessageEvent.type = ClientMessage; + clientMessageEvent.window = window; + clientMessageEvent.message_type = XInternAtom(display, "_NET_WM_STATE", 0); + clientMessageEvent.format = 32; + clientMessageEvent.data.l[0] = 1; + clientMessageEvent.data.l[1] = XInternAtom(display, "_NET_WM_STATE_BELOW", 0); + clientMessageEvent.data.l[3] = 1; + + XSendEvent(display, root, 0, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent *)&clientMessageEvent); +} diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 22a745f6..de92246d 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -244,6 +244,13 @@ func GetCursorImage() *types.CursorImage { } } +func PutWindowBelow(window uint32) { + mu.Lock() + defer mu.Unlock() + + C.XPutWindowBelow(C.Window(window)) +} + //export goCreateScreenSize func goCreateScreenSize(index C.int, width C.int, height C.int, mwidth C.int, mheight C.int) { ScreenConfigurations[int(index)] = types.ScreenConfiguration{ diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index ef9c04f9..ea6fb385 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -28,3 +28,5 @@ short XGetScreenRate(); void XSetKeyboardModifier(int mod, int on); char XGetKeyboardModifiers(); XFixesCursorImage *XGetCursorImage(void); + +void XPutWindowBelow(Window window); From 22d31e871c79bd2152efea2b45db7bf843d979a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 18 Jan 2021 22:01:11 +0100 Subject: [PATCH 279/876] file chooser (WIP). --- internal/desktop/filechooser.go | 48 +++++++++++++++++++++++++++++++++ internal/desktop/manager.go | 11 ++++++++ 2 files changed, 59 insertions(+) diff --git a/internal/desktop/filechooser.go b/internal/desktop/filechooser.go index 346673d6..c37c9b27 100644 --- a/internal/desktop/filechooser.go +++ b/internal/desktop/filechooser.go @@ -1,9 +1,52 @@ package desktop import ( + "time" "os/exec" ) +var ( + file_chooser_dialog_open = false +) + +func (manager *DesktopManagerCtx) fileChooserDialogStart() { + if manager.IsFileChooserDialogOpen() { + manager.CloseFileChooserDialog() + } + + manager.OnWindowCreated(func(window uint32, name string, role string) { + if role != "GtkFileChooserDialog" { + return + } + + // TODO: Implement, call event. + file_chooser_dialog_open = true + + manager.logger.Debug(). + Uint32("window", window). + Msg("GtkFileChooserDialog has been opened") + }) + + manager.OnWindowConfigured(func(window uint32, name string, role string) { + if role != "GtkFileChooserDialog" { + return + } + + go func(){ + // TOOD: Refactor. + manager.PutWindowBelow(window) + + // Because first dialog is not put properly to background + time.Sleep(500 * time.Millisecond) + manager.PutWindowBelow(window) + }() + + manager.logger.Debug(). + Uint32("window", window). + Msg("GtkFileChooserDialog has been put below main window") + }) +} + func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { mu.Lock() defer mu.Unlock() @@ -23,6 +66,9 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { "sleep", "0.3", ) + // TODO: Implement, call event. + file_chooser_dialog_open = false + _, err := cmd.Output() return err } @@ -40,6 +86,8 @@ func (manager *DesktopManagerCtx) CloseFileChooserDialog() bool { mu.Unlock() if !manager.IsFileChooserDialogOpen() { + // TODO: Implement, call event. + file_chooser_dialog_open = false return true } } diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 96ddac60..21264741 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -53,6 +53,17 @@ func (manager *DesktopManagerCtx) Start() { go xevent.EventLoop(manager.display) + go manager.fileChooserDialogStart() + + manager.OnEventError(func(error_code uint8, message string, request_code uint8, minor_code uint8) { + manager.logger.Warn(). + Uint8("error_code", error_code). + Str("message", message). + Uint8("request_code", request_code). + Uint8("minor_code", minor_code). + Msg("X event error occured") + }) + go func() { defer func() { xorg.DisplayClose() From d4e0287eb5eaecee297dde98110adb3d8990bcd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 19 Jan 2021 21:01:31 +0100 Subject: [PATCH 280/876] file chooser dialog events implementation. --- internal/api/room/upload.go | 10 ++--- internal/desktop/filechooser.go | 68 ++++--------------------------- internal/desktop/manager.go | 3 +- internal/desktop/xevent.go | 8 ++-- internal/desktop/xevent/xevent.c | 61 ++++++++++++++++++++++++--- internal/desktop/xevent/xevent.go | 50 +++++++++++++++++------ internal/desktop/xevent/xevent.h | 8 +++- internal/desktop/xorg.go | 4 -- internal/desktop/xorg/xorg.c | 43 ------------------- internal/desktop/xorg/xorg.go | 7 ---- internal/desktop/xorg/xorg.h | 3 -- internal/types/desktop.go | 8 ++-- internal/websocket/manager.go | 13 +++--- 13 files changed, 129 insertions(+), 157 deletions(-) diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 6e8a098c..01e6a863 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -97,7 +97,7 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { defer r.MultipartForm.RemoveAll() - if !h.desktop.IsFileChooserDialogOpen() { + if !h.desktop.IsFileChooserDialogOpened() { utils.HttpBadRequest(w, "Open file chooser dialog first.") return } @@ -149,15 +149,11 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { } func (h *RoomHandler) uploadDialogClose(w http.ResponseWriter, r *http.Request) { - if !h.desktop.IsFileChooserDialogOpen() { + if !h.desktop.IsFileChooserDialogOpened() { utils.HttpBadRequest(w, "File chooser dialog is not open.") return } - if !h.desktop.CloseFileChooserDialog() { - utils.HttpInternalServerError(w, "Unable to close file chooser dialog.") - return - } - + h.desktop.CloseFileChooserDialog() utils.HttpSuccess(w) } diff --git a/internal/desktop/filechooser.go b/internal/desktop/filechooser.go index c37c9b27..8c6fc776 100644 --- a/internal/desktop/filechooser.go +++ b/internal/desktop/filechooser.go @@ -1,52 +1,9 @@ package desktop import ( - "time" "os/exec" ) -var ( - file_chooser_dialog_open = false -) - -func (manager *DesktopManagerCtx) fileChooserDialogStart() { - if manager.IsFileChooserDialogOpen() { - manager.CloseFileChooserDialog() - } - - manager.OnWindowCreated(func(window uint32, name string, role string) { - if role != "GtkFileChooserDialog" { - return - } - - // TODO: Implement, call event. - file_chooser_dialog_open = true - - manager.logger.Debug(). - Uint32("window", window). - Msg("GtkFileChooserDialog has been opened") - }) - - manager.OnWindowConfigured(func(window uint32, name string, role string) { - if role != "GtkFileChooserDialog" { - return - } - - go func(){ - // TOOD: Refactor. - manager.PutWindowBelow(window) - - // Because first dialog is not put properly to background - time.Sleep(500 * time.Millisecond) - manager.PutWindowBelow(window) - }() - - manager.logger.Debug(). - Uint32("window", window). - Msg("GtkFileChooserDialog has been put below main window") - }) -} - func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { mu.Lock() defer mu.Unlock() @@ -54,7 +11,7 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { // TOOD: Use native API. cmd := exec.Command( "xdotool", - "search", "--name", "Open", "windowfocus", + "search", "--name", "Open File", "windowfocus", "sleep", "0.2", "key", "--clearmodifiers", "ctrl+l", "type", "--args", "1", uri + "//", @@ -66,43 +23,36 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { "sleep", "0.3", ) - // TODO: Implement, call event. - file_chooser_dialog_open = false - _, err := cmd.Output() return err } -func (manager *DesktopManagerCtx) CloseFileChooserDialog() bool { +func (manager *DesktopManagerCtx) CloseFileChooserDialog() { for i := 0; i < 5; i++ { + if !manager.IsFileChooserDialogOpened() { + return + } + // TOOD: Use native API. mu.Lock() exec.Command( "xdotool", - "search", "--name", "Open", "windowfocus", + "search", "--name", "Open File", "windowfocus", "sleep", "0.2", "key", "--clearmodifiers", "alt+F4", ).Output() mu.Unlock() - - if !manager.IsFileChooserDialogOpen() { - // TODO: Implement, call event. - file_chooser_dialog_open = false - return true - } } - - return false } -func (manager *DesktopManagerCtx) IsFileChooserDialogOpen() bool { +func (manager *DesktopManagerCtx) IsFileChooserDialogOpened() bool { mu.Lock() defer mu.Unlock() // TOOD: Use native API. cmd := exec.Command( "xdotool", - "search", "--name", "Open", "windowfocus", + "search", "--name", "Open File", ) _, err := cmd.Output() diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 21264741..a4816457 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -53,7 +53,8 @@ func (manager *DesktopManagerCtx) Start() { go xevent.EventLoop(manager.display) - go manager.fileChooserDialogStart() + // In case it was opened + go manager.CloseFileChooserDialog() manager.OnEventError(func(error_code uint8, message string, request_code uint8, minor_code uint8) { manager.logger.Warn(). diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index 6f605fb1..3e4f5942 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -12,12 +12,12 @@ func (manager *DesktopManagerCtx) OnClipboardUpdated(listener func()) { xevent.OnClipboardUpdated(listener) } -func (manager *DesktopManagerCtx) OnWindowCreated(listener func(window uint32, name string, role string)) { - xevent.OnWindowCreated(listener) +func (manager *DesktopManagerCtx) OnFileChooserDialogOpened(listener func()) { + xevent.OnFileChooserDialogOpened(listener) } -func (manager *DesktopManagerCtx) OnWindowConfigured(listener func(window uint32, name string, role string)) { - xevent.OnWindowConfigured(listener) +func (manager *DesktopManagerCtx) OnFileChooserDialogClosed(listener func()) { + xevent.OnFileChooserDialogClosed(listener) } func (manager *DesktopManagerCtx) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { diff --git a/internal/desktop/xevent/xevent.c b/internal/desktop/xevent/xevent.c index 36aaa40e..238d7756 100644 --- a/internal/desktop/xevent/xevent.c +++ b/internal/desktop/xevent/xevent.c @@ -60,11 +60,11 @@ void XEventLoop(char *name) { char *name; XFetchName(display, window, &name); - + XTextProperty role; XGetTextProperty(display, window, &role, WM_WINDOW_ROLE); - - goXEventWindowCreated(window, name, role.value); + + goXEventCreateNotify(window, name, role.value); XFree(name); continue; } @@ -75,15 +75,64 @@ void XEventLoop(char *name) { char *name; XFetchName(display, window, &name); - + XTextProperty role; XGetTextProperty(display, window, &role, WM_WINDOW_ROLE); - - goXEventWindowConfigured(window, name, role.value); + + goXEventConfigureNotify(display, window, name, role.value); XFree(name); continue; } + + // UnmapNotify + if (event.type == UnmapNotify) { + Window window = event.xunmap.window; + goXEventUnmapNotify(window); + continue; + } } XCloseDisplay(display); } + +void XFileChooserHide(Display *display, Window window) { + Window root = RootWindow(display, 0); + + // The WM_TRANSIENT_FOR property is defined by the [ICCCM] for managed windows. + // This specification extends the use of the property to override-redirect windows. + // If an override-redirect is a pop-up on behalf of another window, then the Client + // SHOULD set WM_TRANSIENT_FOR on the override-redirect to this other window. + // + // As an example, a Client should set WM_TRANSIENT_FOR on dropdown menus to the + // toplevel application window that contains the menubar. + + // Remove WM_TRANSIENT_FOR + Atom WM_TRANSIENT_FOR = XInternAtom(display, "WM_TRANSIENT_FOR", 0); + XDeleteProperty(display, window, WM_TRANSIENT_FOR); + + // Add _NET_WM_STATE_BELOW + XClientMessageEvent clientMessageEvent; + memset(&clientMessageEvent, 0, sizeof(clientMessageEvent)); + + // window = the respective client window + // message_type = _NET_WM_STATE + // format = 32 + // data.l[0] = the action, as listed below + // _NET_WM_STATE_REMOVE 0 // remove/unset property + // _NET_WM_STATE_ADD 1 // add/set property + // _NET_WM_STATE_TOGGLE 2 // toggle property + // data.l[1] = first property to alter + // data.l[2] = second property to alter + // data.l[3] = source indication + // other data.l[] elements = 0 + + clientMessageEvent.type = ClientMessage; + clientMessageEvent.window = window; + clientMessageEvent.message_type = XInternAtom(display, "_NET_WM_STATE", 0); + clientMessageEvent.format = 32; + clientMessageEvent.data.l[0] = 1; + clientMessageEvent.data.l[1] = XInternAtom(display, "_NET_WM_STATE_BELOW", 0); + clientMessageEvent.data.l[3] = 1; + + XSendEvent(display, root, 0, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent *)&clientMessageEvent); +} diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go index d6b32548..ba40d19f 100644 --- a/internal/desktop/xevent/xevent.go +++ b/internal/desktop/xevent/xevent.go @@ -8,12 +8,14 @@ package xevent import "C" import ( + "time" "unsafe" "github.com/kataras/go-events" ) var emmiter events.EventEmmiter +var file_chooser_dialog_window uint32 = 0 func init() { emmiter = events.New() @@ -38,15 +40,15 @@ func OnClipboardUpdated(listener func()) { }) } -func OnWindowCreated(listener func(window uint32, name string, role string)) { - emmiter.On("window-created", func(payload ...interface{}) { - listener(payload[0].(uint32), payload[1].(string), payload[2].(string)) +func OnFileChooserDialogOpened(listener func()) { + emmiter.On("file-chooser-dialog-opened", func(payload ...interface{}) { + listener() }) } -func OnWindowConfigured(listener func(window uint32, name string, role string)) { - emmiter.On("window-configured", func(payload ...interface{}) { - listener(payload[0].(uint32), payload[1].(string), payload[2].(string)) +func OnFileChooserDialogClosed(listener func()) { + emmiter.On("file-chooser-dialog-closed", func(payload ...interface{}) { + listener() }) } @@ -66,14 +68,38 @@ func goXEventClipboardUpdated() { emmiter.Emit("clipboard-updated") } -//export goXEventWindowCreated -func goXEventWindowCreated(window C.Window, name *C.char, role *C.char) { - emmiter.Emit("window-created", uint32(window), C.GoString(name), C.GoString(role)) +//export goXEventCreateNotify +func goXEventCreateNotify(window C.Window, nameUnsafe *C.char, roleUnsafe *C.char) { + role := C.GoString(roleUnsafe) + if role != "GtkFileChooserDialog" { + return + } + + file_chooser_dialog_window = uint32(window) + emmiter.Emit("file-chooser-dialog-opened") } -//export goXEventWindowConfigured -func goXEventWindowConfigured(window C.Window, name *C.char, role *C.char) { - emmiter.Emit("window-configured", uint32(window), C.GoString(name), C.GoString(role)) +//export goXEventConfigureNotify +func goXEventConfigureNotify(display *C.Display, window C.Window, nameUnsafe *C.char, roleUnsafe *C.char) { + role := C.GoString(roleUnsafe) + if role != "GtkFileChooserDialog" { + return + } + + C.XFileChooserHide(display, window) + + // Because first dialog is not put properly to background + time.Sleep(10 * time.Millisecond) + C.XFileChooserHide(display, window) +} + +//export goXEventUnmapNotify +func goXEventUnmapNotify(window C.Window) { + if uint32(window) != file_chooser_dialog_window { + return + } + + emmiter.Emit("file-chooser-dialog-closed") } //export goXEventError diff --git a/internal/desktop/xevent/xevent.h b/internal/desktop/xevent/xevent.h index 9314fc70..bf744e63 100644 --- a/internal/desktop/xevent/xevent.h +++ b/internal/desktop/xevent/xevent.h @@ -5,13 +5,17 @@ #include #include #include +#include extern void goXEventCursorChanged(XFixesCursorNotifyEvent event); extern void goXEventClipboardUpdated(); -extern void goXEventWindowCreated(Window window, char *name, char *role); -extern void goXEventWindowConfigured(Window window, char *name, char *role); +extern void goXEventCreateNotify(Window window, char *name, char *role); +extern void goXEventConfigureNotify(Display *display, Window window, char *name, char *role); +extern void goXEventUnmapNotify(Window window); extern void goXEventError(XErrorEvent *event, char *message); extern int goXEventActive(); static int XEventError(Display *display, XErrorEvent *event); void XEventLoop(char *display); + +void XFileChooserHide(Display *display, Window window); diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 1d1efef9..270f7baf 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -113,7 +113,3 @@ func (manager *DesktopManagerCtx) GetKeyboardModifiers() types.KeyboardModifiers func (manager *DesktopManagerCtx) GetCursorImage() *types.CursorImage { return xorg.GetCursorImage() } - -func (manager *DesktopManagerCtx) PutWindowBelow(window uint32) { - xorg.PutWindowBelow(window) -} diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index bb68a6ae..aded68c8 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -136,46 +136,3 @@ XFixesCursorImage *XGetCursorImage(void) { Display *display = getXDisplay(); return XFixesGetCursorImage(display); } - -void XPutWindowBelow(Window window) { - Display *display = getXDisplay(); - Window root = RootWindow(display, 0); - - // The WM_TRANSIENT_FOR property is defined by the [ICCCM] for managed windows. - // This specification extends the use of the property to override-redirect windows. - // If an override-redirect is a pop-up on behalf of another window, then the Client - // SHOULD set WM_TRANSIENT_FOR on the override-redirect to this other window. - // - // As an example, a Client should set WM_TRANSIENT_FOR on dropdown menus to the - // toplevel application window that contains the menubar. - - // Remove WM_TRANSIENT_FOR - Atom WM_TRANSIENT_FOR = XInternAtom(display, "WM_TRANSIENT_FOR", 0); - XDeleteProperty(display, window, WM_TRANSIENT_FOR); - - // Add _NET_WM_STATE_BELOW - XClientMessageEvent clientMessageEvent; - memset(&clientMessageEvent, 0, sizeof(clientMessageEvent)); - - // window = the respective client window - // message_type = _NET_WM_STATE - // format = 32 - // data.l[0] = the action, as listed below - // _NET_WM_STATE_REMOVE 0 // remove/unset property - // _NET_WM_STATE_ADD 1 // add/set property - // _NET_WM_STATE_TOGGLE 2 // toggle property - // data.l[1] = first property to alter - // data.l[2] = second property to alter - // data.l[3] = source indication - // other data.l[] elements = 0 - - clientMessageEvent.type = ClientMessage; - clientMessageEvent.window = window; - clientMessageEvent.message_type = XInternAtom(display, "_NET_WM_STATE", 0); - clientMessageEvent.format = 32; - clientMessageEvent.data.l[0] = 1; - clientMessageEvent.data.l[1] = XInternAtom(display, "_NET_WM_STATE_BELOW", 0); - clientMessageEvent.data.l[3] = 1; - - XSendEvent(display, root, 0, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent *)&clientMessageEvent); -} diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index de92246d..22a745f6 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -244,13 +244,6 @@ func GetCursorImage() *types.CursorImage { } } -func PutWindowBelow(window uint32) { - mu.Lock() - defer mu.Unlock() - - C.XPutWindowBelow(C.Window(window)) -} - //export goCreateScreenSize func goCreateScreenSize(index C.int, width C.int, height C.int, mwidth C.int, mheight C.int) { ScreenConfigurations[int(index)] = types.ScreenConfiguration{ diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index ea6fb385..aed4c841 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -6,7 +6,6 @@ #include #include #include -#include extern void goCreateScreenSize(int index, int width, int height, int mwidth, int mheight); extern void goSetScreenRates(int index, int rate_index, short rate); @@ -28,5 +27,3 @@ short XGetScreenRate(); void XSetKeyboardModifier(int mod, int on); char XGetKeyboardModifiers(); XFixesCursorImage *XGetCursorImage(void); - -void XPutWindowBelow(Window window); diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 9ec70e8b..3a7b0c24 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -57,8 +57,8 @@ type DesktopManager interface { // xevent OnCursorChanged(listener func(serial uint64)) OnClipboardUpdated(listener func()) - OnWindowCreated(listener func(window uint32, name string, role string)) - OnWindowConfigured(listener func(window uint32, name string, role string)) + OnFileChooserDialogOpened(listener func()) + OnFileChooserDialogClosed(listener func()) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) // clipboard @@ -70,6 +70,6 @@ type DesktopManager interface { // filechooser HandleFileChooserDialog(uri string) error - CloseFileChooserDialog() bool - IsFileChooserDialogOpen() bool + CloseFileChooserDialog() + IsFileChooserDialogOpened() bool } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index b7b18014..12feb094 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -134,13 +134,16 @@ func (ws *WebSocketManagerCtx) Start() { } }) - ws.desktop.OnWindowCreated(func(window uint32, name string, role string) { + ws.desktop.OnFileChooserDialogOpened(func() { // TODO: Implement. ws.logger.Info(). - Uint32("window", window). - Str("name", name). - Str("role", role). - Msg("created new window") + Msg("FileChooserDialog opened") + }) + + ws.desktop.OnFileChooserDialogClosed(func() { + // TODO: Implement. + ws.logger.Info(). + Msg("FileChooserDialog closed") }) } From 1559c6c3bd5353e193650d362e9e30990eb18936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 20 Jan 2021 19:45:47 +0100 Subject: [PATCH 281/876] filechooser -> filechooserdialog. --- internal/desktop/{filechooser.go => filechooserdialog.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename internal/desktop/{filechooser.go => filechooserdialog.go} (100%) diff --git a/internal/desktop/filechooser.go b/internal/desktop/filechooserdialog.go similarity index 100% rename from internal/desktop/filechooser.go rename to internal/desktop/filechooserdialog.go From dbbbc85c18f4f79e4081dee1fced492b65dd96d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 20 Jan 2021 23:47:49 +0100 Subject: [PATCH 282/876] xevent file-chooser-dialog-opened onConfigure. --- internal/desktop/xevent/xevent.c | 15 --------------- internal/desktop/xevent/xevent.go | 17 ++++++----------- internal/desktop/xevent/xevent.h | 1 - 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/internal/desktop/xevent/xevent.c b/internal/desktop/xevent/xevent.c index 238d7756..3791375c 100644 --- a/internal/desktop/xevent/xevent.c +++ b/internal/desktop/xevent/xevent.c @@ -54,21 +54,6 @@ void XEventLoop(char *name) { } } - // CreateNotify - if (event.type == CreateNotify) { - Window window = event.xcreatewindow.window; - - char *name; - XFetchName(display, window, &name); - - XTextProperty role; - XGetTextProperty(display, window, &role, WM_WINDOW_ROLE); - - goXEventCreateNotify(window, name, role.value); - XFree(name); - continue; - } - // ConfigureNotify if (event.type == ConfigureNotify) { Window window = event.xconfigure.window; diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go index ba40d19f..6f1d53f5 100644 --- a/internal/desktop/xevent/xevent.go +++ b/internal/desktop/xevent/xevent.go @@ -68,17 +68,6 @@ func goXEventClipboardUpdated() { emmiter.Emit("clipboard-updated") } -//export goXEventCreateNotify -func goXEventCreateNotify(window C.Window, nameUnsafe *C.char, roleUnsafe *C.char) { - role := C.GoString(roleUnsafe) - if role != "GtkFileChooserDialog" { - return - } - - file_chooser_dialog_window = uint32(window) - emmiter.Emit("file-chooser-dialog-opened") -} - //export goXEventConfigureNotify func goXEventConfigureNotify(display *C.Display, window C.Window, nameUnsafe *C.char, roleUnsafe *C.char) { role := C.GoString(roleUnsafe) @@ -91,6 +80,11 @@ func goXEventConfigureNotify(display *C.Display, window C.Window, nameUnsafe *C. // Because first dialog is not put properly to background time.Sleep(10 * time.Millisecond) C.XFileChooserHide(display, window) + + if file_chooser_dialog_window == 0 { + file_chooser_dialog_window = uint32(window) + emmiter.Emit("file-chooser-dialog-opened") + } } //export goXEventUnmapNotify @@ -99,6 +93,7 @@ func goXEventUnmapNotify(window C.Window) { return } + file_chooser_dialog_window = 0 emmiter.Emit("file-chooser-dialog-closed") } diff --git a/internal/desktop/xevent/xevent.h b/internal/desktop/xevent/xevent.h index bf744e63..3dfdfc0b 100644 --- a/internal/desktop/xevent/xevent.h +++ b/internal/desktop/xevent/xevent.h @@ -9,7 +9,6 @@ extern void goXEventCursorChanged(XFixesCursorNotifyEvent event); extern void goXEventClipboardUpdated(); -extern void goXEventCreateNotify(Window window, char *name, char *role); extern void goXEventConfigureNotify(Display *display, Window window, char *name, char *role); extern void goXEventUnmapNotify(Window window); extern void goXEventError(XErrorEvent *event, char *message); From 64dd31844b339fe3982297bdb85d374a95833975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 20 Jan 2021 23:48:50 +0100 Subject: [PATCH 283/876] filechooser websocket handler. --- internal/types/event/events.go | 5 ++ internal/websocket/filechooserdialog.go | 72 +++++++++++++++++++++++++ internal/websocket/manager.go | 12 +---- 3 files changed, 78 insertions(+), 11 deletions(-) create mode 100644 internal/websocket/filechooserdialog.go diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 09593304..36d48ede 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -51,3 +51,8 @@ const ( const ( BORADCAST_STATUS = "broadcast/status" ) + +const ( + FILE_CHOOSER_DIALOG_OPENED = "file_chooser_dialog/opened" + FILE_CHOOSER_DIALOG_CLOSED = "file_chooser_dialog/closed" +) diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go new file mode 100644 index 00000000..9ad4def2 --- /dev/null +++ b/internal/websocket/filechooserdialog.go @@ -0,0 +1,72 @@ +package websocket + +import ( + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" +) + +func (ws *WebSocketManagerCtx) fileChooserDialogEvents() { + var file_chooser_dialog_member types.Session + + // when dialog opens, everyone should be notified. + ws.desktop.OnFileChooserDialogOpened(func() { + ws.logger.Info().Msg("FileChooserDialog opened") + + host := ws.sessions.GetHost() + if host == nil { + ws.logger.Warn().Msg("no host for FileChooserDialog found, closing") + go ws.desktop.CloseFileChooserDialog() + return + } + + file_chooser_dialog_member = host + + go ws.sessions.Broadcast(message.MemberID{ + Event: event.FILE_CHOOSER_DIALOG_OPENED, + ID: host.ID(), + }, nil) + }) + + // when dialog closes, everyone should be notified. + ws.desktop.OnFileChooserDialogClosed(func() { + ws.logger.Info().Msg("FileChooserDialog closed") + + file_chooser_dialog_member = nil + + go ws.sessions.Broadcast(message.MemberID{ + Event: event.FILE_CHOOSER_DIALOG_CLOSED, + }, nil) + }) + + + // when new user joins, and someone holds dialog, he shouldd be notified about it. + ws.sessions.OnConnected(func(session types.Session) { + if file_chooser_dialog_member == nil { + return + } + + if err := session.Send(message.MemberID{ + Event: event.FILE_CHOOSER_DIALOG_OPENED, + ID: file_chooser_dialog_member.ID(), + }); err != nil { + ws.logger.Warn(). + Str("id", session.ID()). + Err(err). + Msgf("could not send event `%s` to session", event.FILE_CHOOSER_DIALOG_OPENED) + } + }) + + // when user, that holds dialog, disconnects, it should be closed. + ws.sessions.OnDisconnected(func(session types.Session) { + if file_chooser_dialog_member == nil { + return + } + + if session.ID() != file_chooser_dialog_member.ID() { + return + } + + ws.desktop.CloseFileChooserDialog() + }) +} diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 12feb094..511c9450 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -134,17 +134,7 @@ func (ws *WebSocketManagerCtx) Start() { } }) - ws.desktop.OnFileChooserDialogOpened(func() { - // TODO: Implement. - ws.logger.Info(). - Msg("FileChooserDialog opened") - }) - - ws.desktop.OnFileChooserDialogClosed(func() { - // TODO: Implement. - ws.logger.Info(). - Msg("FileChooserDialog closed") - }) + ws.fileChooserDialogEvents() } func (ws *WebSocketManagerCtx) Shutdown() error { From 7ff6ada2050c8716d5231b5633ba2ffbdec35f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 20 Jan 2021 23:51:53 +0100 Subject: [PATCH 284/876] filechooserdialog refactor desktop. --- internal/desktop/filechooserdialog.go | 76 ++++++++++++++++++--------- 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index 8c6fc776..0bd1af91 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -1,46 +1,71 @@ package desktop import ( + "time" "os/exec" ) +const ( + FILE_CHOOSER_DIALOG_NAME = "Open File" + FILE_CHOOSER_DIALOG_SLEEP = "0.2" +) + func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { mu.Lock() defer mu.Unlock() - // TOOD: Use native API. - cmd := exec.Command( + // TODO: Use native API. + err := exec.Command( "xdotool", - "search", "--name", "Open File", "windowfocus", - "sleep", "0.2", + "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", + "sleep", FILE_CHOOSER_DIALOG_SLEEP, "key", "--clearmodifiers", "ctrl+l", "type", "--args", "1", uri + "//", - "key", "--clearmodifiers", "Return", - "sleep", "1", - "key", "--clearmodifiers", "Down", - "key", "--clearmodifiers", "ctrl+a", - "key", "--clearmodifiers", "Return", - "sleep", "0.3", - ) + "key", "Return", + "sleep", FILE_CHOOSER_DIALOG_SLEEP, + ).Run() + + // TODO: Use native API. + exec.Command( + "xdotool", + "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", + "sleep", FILE_CHOOSER_DIALOG_SLEEP, + "key", "Down", + "key", "--clearmodifiers", "ctrl+a", + "key", "Return", + "sleep", FILE_CHOOSER_DIALOG_SLEEP, + ).Run() - _, err := cmd.Output() return err } func (manager *DesktopManagerCtx) CloseFileChooserDialog() { for i := 0; i < 5; i++ { - if !manager.IsFileChooserDialogOpened() { + mu.Lock() + + manager.logger.Debug().Msg("attempting to close file chooser dialog") + + // TODO: Use native API. + err := exec.Command( + "xdotool", + "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", + ).Run() + + if err != nil { + mu.Unlock() + manager.logger.Info().Msg("file chooser dialog is closed") return } - // TOOD: Use native API. - mu.Lock() - exec.Command( - "xdotool", - "search", "--name", "Open File", "windowfocus", - "sleep", "0.2", - "key", "--clearmodifiers", "alt+F4", - ).Output() + // custom press Alt + F4 + // because xdotool is failing to send proper Alt+F4 + + manager.ResetKeys() + manager.KeyDown(65513) // Alt + manager.KeyDown(65473) // F4 + time.Sleep(10 * time.Millisecond) + manager.ResetKeys() + mu.Unlock() } } @@ -49,12 +74,11 @@ func (manager *DesktopManagerCtx) IsFileChooserDialogOpened() bool { mu.Lock() defer mu.Unlock() - // TOOD: Use native API. - cmd := exec.Command( + // TODO: Use native API. + err := exec.Command( "xdotool", - "search", "--name", "Open File", - ) + "search", "--name", FILE_CHOOSER_DIALOG_NAME, + ).Run() - _, err := cmd.Output() return err == nil } From afd3dd2f5675ef83abbdbad93a1c56fb87ec4918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 21 Jan 2021 20:44:09 +0100 Subject: [PATCH 285/876] generate screenshot using Xlib. --- internal/api/room/handler.go | 3 ++- internal/api/room/screen.go | 23 +++++++++++++++++++++++ internal/desktop/xorg.go | 5 +++++ internal/desktop/xorg/xorg.c | 30 ++++++++++++++++++++++++++++++ internal/desktop/xorg/xorg.go | 31 +++++++++++++++++++++++++++++++ internal/desktop/xorg/xorg.h | 3 +++ internal/http/auth/auth.go | 11 +++++++++++ internal/types/desktop.go | 5 +++++ 8 files changed, 110 insertions(+), 1 deletion(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 310b1817..f620e430 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -61,7 +61,8 @@ func (h *RoomHandler) Route(r chi.Router) { }) r.Route("/screen", func(r chi.Router) { - r.Get("/", h.screenConfiguration) + r.With(auth.CanWatchOnly).Get("/", h.screenConfiguration) + r.With(auth.CanWatchOnly).Get("/image", h.screenImageGet) r.With(auth.AdminsOnly).Post("/", h.screenConfigurationChange) r.With(auth.AdminsOnly).Get("/configurations", h.screenConfigurationsList) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index a14f22c7..ffd3b2ca 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -1,6 +1,9 @@ package room import ( + "bytes" + "image/jpeg" + "strconv" "net/http" "demodesk/neko/internal/types" @@ -72,3 +75,23 @@ func (h *RoomHandler) screenConfigurationsList(w http.ResponseWriter, r *http.Re utils.HttpSuccess(w, list) } + +func (h *RoomHandler) screenImageGet(w http.ResponseWriter, r *http.Request) { + var options *jpeg.Options + if quality, err := strconv.Atoi(r.URL.Query().Get("quality")); err == nil { + options = &jpeg.Options{ quality } + } else { + options = &jpeg.Options{ 90 } + } + + img := h.desktop.GetScreenshotImage() + out := new(bytes.Buffer) + err := jpeg.Encode(out, img, options) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + w.Header().Set("Content-Type", "image/jpeg") + w.Write(out.Bytes()) +} diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 270f7baf..e68c3621 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -1,6 +1,7 @@ package desktop import ( + "image" "regexp" "os/exec" @@ -113,3 +114,7 @@ func (manager *DesktopManagerCtx) GetKeyboardModifiers() types.KeyboardModifiers func (manager *DesktopManagerCtx) GetCursorImage() *types.CursorImage { return xorg.GetCursorImage() } + +func (manager *DesktopManagerCtx) GetScreenshotImage() *image.RGBA { + return xorg.GetScreenshotImage() +} diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index aded68c8..fd5be1f9 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -136,3 +136,33 @@ XFixesCursorImage *XGetCursorImage(void) { Display *display = getXDisplay(); return XFixesGetCursorImage(display); } + +char *XGetScreenshot(int *w, int *h) { + Display *display = getXDisplay(); + Window root = DefaultRootWindow(display); + + XWindowAttributes attr; + XGetWindowAttributes(display, root, &attr); + int width = attr.width; + int height = attr.height; + + XImage *ximage = XGetImage(display, root, 0, 0, width, height, AllPlanes, ZPixmap); + + *w = width; + *h = height; + char *pixels = (char *)malloc(width * height * 3); + + for (int row = 0; row < height; row++) { + for (int col = 0; col < width; col++) { + int pos = ((row * width) + col) * 3; + unsigned long pixel = XGetPixel(ximage, col, row); + + pixels[pos] = (pixel & ximage->red_mask) >> 16; + pixels[pos+1] = (pixel & ximage->green_mask) >> 8; + pixels[pos+2] = pixel & ximage->blue_mask; + } + } + + XDestroyImage(ximage); + return pixels; +} diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 22a745f6..f2677f24 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -13,6 +13,9 @@ import ( "time" "unsafe" + "image" + "image/color" + "demodesk/neko/internal/types" ) @@ -244,6 +247,34 @@ func GetCursorImage() *types.CursorImage { } } +func GetScreenshotImage() *image.RGBA { + mu.Lock() + defer mu.Unlock() + + var w, h C.int + pixelsUnsafe := C.XGetScreenshot(&w, &h) + pixels := C.GoBytes(unsafe.Pointer(pixelsUnsafe), w * h * 3) + defer C.free(unsafe.Pointer(pixelsUnsafe)) + + width := int(w) + height := int(h) + img := image.NewRGBA(image.Rect(0, 0, width, height)) + for row := 0; row < height; row++ { + for col := 0; col < width; col++ { + pos := ((row * width) + col) * 3 + + img.SetRGBA(col, row, color.RGBA{ + R: uint8(pixels[pos]), + G: uint8(pixels[pos+1]), + B: uint8(pixels[pos+2]), + A: 0xFF, + }) + } + } + + return img +} + //export goCreateScreenSize func goCreateScreenSize(index C.int, width C.int, height C.int, mwidth C.int, mheight C.int) { ScreenConfigurations[int(index)] = types.ScreenConfiguration{ diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index aed4c841..caa99fc8 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -27,3 +28,5 @@ short XGetScreenRate(); void XSetKeyboardModifier(int mod, int on); char XGetKeyboardModifiers(); XFixesCursorImage *XGetCursorImage(void); + +char *XGetScreenshot(int *w, int *h); diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index 625337b2..a8d627e7 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -66,3 +66,14 @@ func CanHostOnly(next http.Handler) http.Handler { } }) } + +func CanWatchOnly(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + session := GetSession(r) + if !session.CanWatch() { + utils.HttpForbidden(w, "Only for members, that can watch.") + } else { + next.ServeHTTP(w, r) + } + }) +} diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 3a7b0c24..eb8f11b6 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -1,5 +1,9 @@ package types +import ( + "image" +) + type CursorImage struct { Width uint16 Height uint16 @@ -53,6 +57,7 @@ type DesktopManager interface { SetKeyboardModifiers(mod KeyboardModifiers) GetKeyboardModifiers() KeyboardModifiers GetCursorImage() *CursorImage + GetScreenshotImage() *image.RGBA // xevent OnCursorChanged(listener func(serial uint64)) From 407853eeb13ef37028b6c56b9efbb1c64132c6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 22 Jan 2021 14:09:47 +0100 Subject: [PATCH 286/876] decouple BroadcastManager from CaptureManager. --- internal/api/room/broadcast.go | 23 +++++----- internal/capture/broadcast.go | 65 ++++++++++++++++++---------- internal/capture/manager.go | 27 ++++++------ internal/types/capture.go | 15 ++++--- internal/websocket/handler/system.go | 5 ++- 5 files changed, 82 insertions(+), 53 deletions(-) diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index de2c72f6..817c07b7 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -14,9 +14,10 @@ type BroadcastStatusPayload struct { } func (h *RoomHandler) broadcastStatus(w http.ResponseWriter, r *http.Request) { + broadcast := h.capture.Broadcast() utils.HttpSuccess(w, BroadcastStatusPayload{ - IsActive: h.capture.BroadcastEnabled(), - URL: h.capture.BroadcastUrl(), + IsActive: broadcast.Enabled(), + URL: broadcast.Url(), }) } @@ -31,12 +32,13 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { return } - if h.capture.BroadcastEnabled() { + broadcast := h.capture.Broadcast() + if broadcast.Enabled() { utils.HttpUnprocessableEntity(w, "Server is already broadcasting.") return } - if err := h.capture.StartBroadcast(data.URL); err != nil { + if err := broadcast.Start(data.URL); err != nil { utils.HttpInternalServerError(w, err) return } @@ -44,26 +46,27 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { h.sessions.AdminBroadcast( message.BroadcastStatus{ Event: event.BORADCAST_STATUS, - IsActive: h.capture.BroadcastEnabled(), - URL: h.capture.BroadcastUrl(), + IsActive: broadcast.Enabled(), + URL: broadcast.Url(), }, nil) utils.HttpSuccess(w) } func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { - if !h.capture.BroadcastEnabled() { + broadcast := h.capture.Broadcast() + if !broadcast.Enabled() { utils.HttpUnprocessableEntity(w, "Server is not broadcasting.") return } - h.capture.StopBroadcast() + broadcast.Stop() h.sessions.AdminBroadcast( message.BroadcastStatus{ Event: event.BORADCAST_STATUS, - IsActive: h.capture.BroadcastEnabled(), - URL: h.capture.BroadcastUrl(), + IsActive: broadcast.Enabled(), + URL: broadcast.Url(), }, nil) utils.HttpSuccess(w) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index d0d419be..4fd4c20e 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -1,59 +1,80 @@ package capture import ( + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "demodesk/neko/internal/config" "demodesk/neko/internal/capture/gst" ) -func (manager *CaptureManagerCtx) StartBroadcast(url string) error { - manager.broadcast_url = url - manager.broadcasting = true - return manager.createBroadcastPipeline() +type BroacastManagerCtx struct { + logger zerolog.Logger + config *config.Capture + pipeline *gst.Pipeline + enabled bool + url string } -func (manager *CaptureManagerCtx) StopBroadcast() { - manager.broadcasting = false - manager.destroyBroadcastPipeline() +func broadcastNew(config *config.Capture) *BroacastManagerCtx { + return &BroacastManagerCtx{ + logger: log.With().Str("module", "capture").Str("submodule", "broadcast").Logger(), + config: config, + enabled: false, + url: "", + } } -func (manager *CaptureManagerCtx) BroadcastEnabled() bool { - return manager.broadcasting +func (manager *BroacastManagerCtx) Start(url string) error { + manager.url = url + manager.enabled = true + return manager.createPipeline() } -func (manager *CaptureManagerCtx) BroadcastUrl() string { - return manager.broadcast_url +func (manager *BroacastManagerCtx) Stop() { + manager.enabled = false + manager.destroyPipeline() } -func (manager *CaptureManagerCtx) createBroadcastPipeline() error { +func (manager *BroacastManagerCtx) Enabled() bool { + return manager.enabled +} + +func (manager *BroacastManagerCtx) Url() string { + return manager.url +} + +func (manager *BroacastManagerCtx) createPipeline() error { var err error manager.logger.Info(). Str("audio_device", manager.config.Device). Str("video_display", manager.config.Display). Str("broadcast_pipeline", manager.config.BroadcastPipeline). - Msgf("creating broadcast pipeline") + Msgf("creating pipeline") - manager.broadcast, err = gst.CreateRTMPPipeline( + manager.pipeline, err = gst.CreateRTMPPipeline( manager.config.Device, manager.config.Display, manager.config.BroadcastPipeline, - manager.broadcast_url, + manager.url, ) if err != nil { return err } - manager.broadcast.Play() - manager.logger.Info().Msgf("starting broadcast pipeline") + manager.pipeline.Play() + manager.logger.Info().Msgf("starting pipeline") return nil } -func (manager *CaptureManagerCtx) destroyBroadcastPipeline() { - if manager.broadcast == nil { +func (manager *BroacastManagerCtx) destroyPipeline() { + if manager.pipeline == nil { return } - manager.broadcast.Stop() - manager.logger.Info().Msgf("stopping broadcast pipeline") - manager.broadcast = nil + manager.pipeline.Stop() + manager.logger.Info().Msgf("stopping pipeline") + manager.pipeline = nil } diff --git a/internal/capture/manager.go b/internal/capture/manager.go index ed1d8d61..4b15fc69 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -17,7 +17,6 @@ type CaptureManagerCtx struct { mu sync.Mutex video *gst.Pipeline audio *gst.Pipeline - broadcast *gst.Pipeline config *config.Capture emit_update chan bool emit_stop chan bool @@ -25,9 +24,8 @@ type CaptureManagerCtx struct { audio_sample chan types.Sample emmiter events.EventEmmiter streaming bool - broadcasting bool - broadcast_url string desktop types.DesktopManager + broadcast *BroacastManagerCtx } func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { @@ -39,15 +37,14 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt emmiter: events.New(), config: config, streaming: false, - broadcasting: false, - broadcast_url: "", desktop: desktop, + broadcast: broadcastNew(config), } } func (manager *CaptureManagerCtx) Start() { - if manager.BroadcastEnabled() { - if err := manager.createBroadcastPipeline(); err != nil { + if manager.broadcast.Enabled() { + if err := manager.broadcast.createPipeline(); err != nil { manager.logger.Panic().Err(err).Msg("unable to create broadcast pipeline") } } @@ -57,8 +54,8 @@ func (manager *CaptureManagerCtx) Start() { manager.destroyVideoPipeline() } - if manager.BroadcastEnabled() { - manager.destroyBroadcastPipeline() + if manager.broadcast.Enabled() { + manager.broadcast.destroyPipeline() } }) @@ -67,8 +64,8 @@ func (manager *CaptureManagerCtx) Start() { manager.createVideoPipeline() } - if manager.BroadcastEnabled() { - if err := manager.createBroadcastPipeline(); err != nil { + if manager.broadcast.Enabled() { + if err := manager.broadcast.createPipeline(); err != nil { manager.logger.Panic().Err(err).Msg("unable to create broadcast pipeline") } } @@ -100,14 +97,18 @@ func (manager *CaptureManagerCtx) Shutdown() error { manager.StopStream() } - if manager.BroadcastEnabled() { - manager.destroyBroadcastPipeline() + if manager.broadcast.Enabled() { + manager.broadcast.destroyPipeline() } manager.emit_stop <- true return nil } +func (manager *CaptureManagerCtx) Broadcast() types.BroadcastManager { + return manager.broadcast +} + func (manager *CaptureManagerCtx) VideoCodec() string { return manager.config.VideoCodec } diff --git a/internal/types/capture.go b/internal/types/capture.go index a2d47aa9..3fd5bbe2 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -5,10 +5,19 @@ type Sample struct { Samples uint32 } +type BroadcastManager interface { + Start(url string) error + Stop() + Enabled() bool + Url() string +} + type CaptureManager interface { Start() Shutdown() error + Broadcast() BroadcastManager + VideoCodec() string AudioCodec() string @@ -18,10 +27,4 @@ type CaptureManager interface { StartStream() StopStream() Streaming() bool - - // broacast - StartBroadcast(url string) error - StopBroadcast() - BroadcastEnabled() bool - BroadcastUrl() string } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index f9bdf978..ae82707c 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -75,13 +75,14 @@ func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { } } + broadcast := h.capture.Broadcast() return session.Send( message.SystemAdmin{ Event: event.SYSTEM_ADMIN, ScreenSizesList: screenSizesList, BroadcastStatus: message.BroadcastStatus{ - IsActive: h.capture.BroadcastEnabled(), - URL: h.capture.BroadcastUrl(), + IsActive: broadcast.Enabled(), + URL: broadcast.Url(), }, }) } From 316187090651dc7e6e04ef93f7d30c231380a397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 22 Jan 2021 18:13:32 +0100 Subject: [PATCH 287/876] add screencast to capture. --- internal/api/room/handler.go | 1 + internal/api/room/screen.go | 13 ++++ internal/capture/gst/gst.go | 21 ++++++- internal/capture/manager.go | 30 ++++++++-- internal/capture/screencast.go | 106 +++++++++++++++++++++++++++++++++ internal/config/capture.go | 17 ++++++ internal/types/capture.go | 8 +++ 7 files changed, 189 insertions(+), 7 deletions(-) create mode 100644 internal/capture/screencast.go diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index f620e430..f00b2d56 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -63,6 +63,7 @@ func (h *RoomHandler) Route(r chi.Router) { r.Route("/screen", func(r chi.Router) { r.With(auth.CanWatchOnly).Get("/", h.screenConfiguration) r.With(auth.CanWatchOnly).Get("/image", h.screenImageGet) + r.With(auth.CanWatchOnly).Get("/cast", h.screenCastGet) r.With(auth.AdminsOnly).Post("/", h.screenConfigurationChange) r.With(auth.AdminsOnly).Get("/configurations", h.screenConfigurationsList) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index ffd3b2ca..d06d4a4f 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -95,3 +95,16 @@ func (h *RoomHandler) screenImageGet(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "image/jpeg") w.Write(out.Bytes()) } + +func (h *RoomHandler) screenCastGet(w http.ResponseWriter, r *http.Request) { + screencast := h.capture.Screencast() + if !screencast.Enabled() { + utils.HttpBadRequest(w, "Screencast pipeline is not enabled.") + return + } + + bytes := screencast.Image() + w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") + w.Header().Set("Content-Type", "image/jpeg") + w.Write(bytes) +} diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index d14711ef..6989abdd 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -58,6 +58,18 @@ func CreateRTMPPipeline(pipelineDevice string, pipelineDisplay string, pipelineS return CreatePipeline(pipelineStr, 0) } +// CreateJPEGPipeline creates a GStreamer Pipeline +func CreateJPEGPipeline(pipelineDisplay string, pipelineSrc string) (*Pipeline, error) { + var pipelineStr string + if pipelineSrc != "" { + pipelineStr = fmt.Sprintf(pipelineSrc, pipelineDisplay) + } else { + pipelineStr = fmt.Sprintf("ximagesrc display-name=%s show-pointer=true use-damage=false ! videoconvert ! videoscale ! videorate ! video/x-raw,framerate=10/1 ! jpegenc quality=60" + appSink, pipelineDisplay) + } + + return CreatePipeline(pipelineStr, 0) +} + // CreateAppPipeline creates a GStreamer Pipeline func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc string) (*Pipeline, error) { var clockRate float32 @@ -222,15 +234,18 @@ func CheckPlugins(plugins []string) error { //export goHandlePipelineBuffer func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.int, pipelineID C.int) { + defer C.free(buffer) + pipelinesLock.Lock() pipeline, ok := pipelines[int(pipelineID)] pipelinesLock.Unlock() if ok { - samples := uint32(pipeline.ClockRate * (float32(duration) / 1000000000)) - pipeline.Sample <- types.Sample{Data: C.GoBytes(buffer, bufferLen), Samples: samples} + pipeline.Sample <- types.Sample{ + Data: C.GoBytes(buffer, bufferLen), + Samples: uint32(pipeline.ClockRate * (float32(duration) / 1e9)), + } } else { fmt.Printf("discarding buffer, no pipeline with id %d", int(pipelineID)) } - C.free(buffer) } diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 4b15fc69..ee0988e7 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -26,6 +26,7 @@ type CaptureManagerCtx struct { streaming bool desktop types.DesktopManager broadcast *BroacastManagerCtx + screencast *ScreencastManagerCtx } func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { @@ -39,6 +40,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt streaming: false, desktop: desktop, broadcast: broadcastNew(config), + screencast: screencastNew(config), } } @@ -49,6 +51,12 @@ func (manager *CaptureManagerCtx) Start() { } } + if manager.screencast.Enabled() { + if err := manager.screencast.createPipeline(); err != nil { + manager.logger.Panic().Err(err).Msg("unable to create screencast pipeline") + } + } + manager.desktop.OnBeforeScreenSizeChange(func() { if manager.Streaming() { manager.destroyVideoPipeline() @@ -57,6 +65,10 @@ func (manager *CaptureManagerCtx) Start() { if manager.broadcast.Enabled() { manager.broadcast.destroyPipeline() } + + if manager.screencast.Enabled() { + manager.screencast.destroyPipeline() + } }) manager.desktop.OnAfterScreenSizeChange(func() { @@ -66,7 +78,13 @@ func (manager *CaptureManagerCtx) Start() { if manager.broadcast.Enabled() { if err := manager.broadcast.createPipeline(); err != nil { - manager.logger.Panic().Err(err).Msg("unable to create broadcast pipeline") + manager.logger.Panic().Err(err).Msg("unable to recreate broadcast pipeline") + } + } + + if manager.screencast.Enabled() { + if err := manager.screencast.createPipeline(); err != nil { + manager.logger.Panic().Err(err).Msg("unable to recreate screencast pipeline") } } }) @@ -97,11 +115,11 @@ func (manager *CaptureManagerCtx) Shutdown() error { manager.StopStream() } - if manager.broadcast.Enabled() { - manager.broadcast.destroyPipeline() - } + manager.broadcast.destroyPipeline() + manager.screencast.destroyPipeline() manager.emit_stop <- true + manager.screencast.shutdown <- true return nil } @@ -109,6 +127,10 @@ func (manager *CaptureManagerCtx) Broadcast() types.BroadcastManager { return manager.broadcast } +func (manager *CaptureManagerCtx) Screencast() types.ScreencastManager { + return manager.screencast +} + func (manager *CaptureManagerCtx) VideoCodec() string { return manager.config.VideoCodec } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go new file mode 100644 index 00000000..c9e1d7d1 --- /dev/null +++ b/internal/capture/screencast.go @@ -0,0 +1,106 @@ +package capture + +import ( + "bytes" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "demodesk/neko/internal/config" + "demodesk/neko/internal/types" + "demodesk/neko/internal/capture/gst" +) + +type ScreencastManagerCtx struct { + logger zerolog.Logger + config *config.Capture + pipeline *gst.Pipeline + enabled bool + shutdown chan bool + refresh chan bool + sample chan types.Sample + image *bytes.Buffer +} + +func screencastNew(config *config.Capture) *ScreencastManagerCtx { + manager := &ScreencastManagerCtx{ + logger: log.With().Str("module", "capture").Str("submodule", "screencast").Logger(), + config: config, + enabled: config.Screencast, + shutdown: make(chan bool), + refresh: make(chan bool), + image: new(bytes.Buffer), + } + + go func() { + manager.logger.Debug().Msg("subroutine started") + + for { + select { + case <-manager.shutdown: + manager.logger.Debug().Msg("shutting down") + return + case <-manager.refresh: + manager.logger.Debug().Msg("subroutine updated") + case sample := <-manager.sample: + manager.image.Reset() + manager.image.Write(sample.Data) + } + } + }() + + return manager +} + +func (manager *ScreencastManagerCtx) Start() error { + manager.enabled = true + return manager.createPipeline() +} + +func (manager *ScreencastManagerCtx) Stop() { + manager.enabled = false + manager.destroyPipeline() +} + +func (manager *ScreencastManagerCtx) Enabled() bool { + return manager.enabled +} + +func (manager *ScreencastManagerCtx) Image() []byte { + return manager.image.Bytes() +} + +func (manager *ScreencastManagerCtx) createPipeline() error { + var err error + + manager.logger.Info(). + Str("video_display", manager.config.Display). + Str("screencast_pipeline", manager.config.ScreencastPipeline). + Msgf("creating pipeline") + + manager.pipeline, err = gst.CreateJPEGPipeline( + manager.config.Display, + manager.config.ScreencastPipeline, + ) + + if err != nil { + return err + } + + manager.pipeline.Start() + manager.logger.Info().Msgf("starting pipeline") + + manager.sample = manager.pipeline.Sample + manager.refresh <-true + return nil +} + +func (manager *ScreencastManagerCtx) destroyPipeline() { + if manager.pipeline == nil { + return + } + + manager.pipeline.Stop() + manager.logger.Info().Msgf("stopping pipeline") + manager.pipeline = nil +} diff --git a/internal/config/capture.go b/internal/config/capture.go index 5d6ea659..ede2a616 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -13,7 +13,10 @@ type Capture struct { AudioParams string VideoCodec string VideoParams string + BroadcastPipeline string + Screencast bool + ScreencastPipeline string } func (Capture) Init(cmd *cobra.Command) error { @@ -80,6 +83,17 @@ func (Capture) Init(cmd *cobra.Command) error { return err } + // screencast + cmd.PersistentFlags().Bool("screencast", false, "enable screencast") + if err := viper.BindPFlag("screencast", cmd.PersistentFlags().Lookup("screencast")); err != nil { + return err + } + + cmd.PersistentFlags().String("screencast_pipeline", "", "custom screencast pipeline") + if err := viper.BindPFlag("screencast_pipeline", cmd.PersistentFlags().Lookup("screencast_pipeline")); err != nil { + return err + } + return nil } @@ -110,5 +124,8 @@ func (s *Capture) Set() { s.Display = viper.GetString("display") s.VideoCodec = videoCodec s.VideoParams = viper.GetString("video") + s.BroadcastPipeline = viper.GetString("broadcast_pipeline") + s.Screencast = viper.GetBool("screencast") + s.ScreencastPipeline = viper.GetString("screencast_pipeline") } diff --git a/internal/types/capture.go b/internal/types/capture.go index 3fd5bbe2..9bd90a7e 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -12,11 +12,19 @@ type BroadcastManager interface { Url() string } +type ScreencastManager interface { + Start() error + Stop() + Enabled() bool + Image() []byte +} + type CaptureManager interface { Start() Shutdown() error Broadcast() BroadcastManager + Screencast() ScreencastManager VideoCodec() string AudioCodec() string From 75393905e8298ef48433648fd1ef488a7983bc43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 22 Jan 2021 18:44:27 +0100 Subject: [PATCH 288/876] screencast quality and framerate. --- internal/capture/gst/gst.go | 4 ++-- internal/capture/screencast.go | 2 ++ internal/config/capture.go | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 6989abdd..d41608a4 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -59,12 +59,12 @@ func CreateRTMPPipeline(pipelineDevice string, pipelineDisplay string, pipelineS } // CreateJPEGPipeline creates a GStreamer Pipeline -func CreateJPEGPipeline(pipelineDisplay string, pipelineSrc string) (*Pipeline, error) { +func CreateJPEGPipeline(pipelineDisplay string, pipelineSrc string, rate string, quality string) (*Pipeline, error) { var pipelineStr string if pipelineSrc != "" { pipelineStr = fmt.Sprintf(pipelineSrc, pipelineDisplay) } else { - pipelineStr = fmt.Sprintf("ximagesrc display-name=%s show-pointer=true use-damage=false ! videoconvert ! videoscale ! videorate ! video/x-raw,framerate=10/1 ! jpegenc quality=60" + appSink, pipelineDisplay) + pipelineStr = fmt.Sprintf("ximagesrc display-name=%s show-pointer=true use-damage=false ! videoconvert ! videoscale ! videorate ! video/x-raw,framerate=%s ! jpegenc quality=%s" + appSink, pipelineDisplay, rate, quality) } return CreatePipeline(pipelineStr, 0) diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index c9e1d7d1..da2f9ccf 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -81,6 +81,8 @@ func (manager *ScreencastManagerCtx) createPipeline() error { manager.pipeline, err = gst.CreateJPEGPipeline( manager.config.Display, manager.config.ScreencastPipeline, + manager.config.ScreencastRate, + manager.config.ScreencastQuality, ) if err != nil { diff --git a/internal/config/capture.go b/internal/config/capture.go index ede2a616..397367b4 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -16,6 +16,8 @@ type Capture struct { BroadcastPipeline string Screencast bool + ScreencastRate string + ScreencastQuality string ScreencastPipeline string } @@ -89,6 +91,16 @@ func (Capture) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().String("screencast_rate", "10/1", "set screencast frame rate") + if err := viper.BindPFlag("screencast_rate", cmd.PersistentFlags().Lookup("screencast_rate")); err != nil { + return err + } + + cmd.PersistentFlags().String("screencast_quality", "60", "set screencast JPEG quality") + if err := viper.BindPFlag("screencast_quality", cmd.PersistentFlags().Lookup("screencast_quality")); err != nil { + return err + } + cmd.PersistentFlags().String("screencast_pipeline", "", "custom screencast pipeline") if err := viper.BindPFlag("screencast_pipeline", cmd.PersistentFlags().Lookup("screencast_pipeline")); err != nil { return err @@ -127,5 +139,7 @@ func (s *Capture) Set() { s.BroadcastPipeline = viper.GetString("broadcast_pipeline") s.Screencast = viper.GetBool("screencast") + s.ScreencastRate = viper.GetString("screencast_rate") + s.ScreencastQuality = viper.GetString("screencast_quality") s.ScreencastPipeline = viper.GetString("screencast_pipeline") } From fdd98377b38e1c33c98a3da63f51147207feb6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 23 Jan 2021 15:17:52 +0100 Subject: [PATCH 289/876] lazy screencast. --- internal/api/room/handler.go | 2 +- internal/api/room/screen.go | 7 ++- internal/capture/manager.go | 10 +--- internal/capture/screencast.go | 89 +++++++++++++++++++++++++++------- internal/types/capture.go | 5 +- 5 files changed, 83 insertions(+), 30 deletions(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index f00b2d56..0718cbd6 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -63,7 +63,7 @@ func (h *RoomHandler) Route(r chi.Router) { r.Route("/screen", func(r chi.Router) { r.With(auth.CanWatchOnly).Get("/", h.screenConfiguration) r.With(auth.CanWatchOnly).Get("/image", h.screenImageGet) - r.With(auth.CanWatchOnly).Get("/cast", h.screenCastGet) + r.With(auth.CanWatchOnly).Get("/cast.jpg", h.screenCastGet) r.With(auth.AdminsOnly).Post("/", h.screenConfigurationChange) r.With(auth.AdminsOnly).Get("/configurations", h.screenConfigurationsList) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index d06d4a4f..70645cc9 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -103,7 +103,12 @@ func (h *RoomHandler) screenCastGet(w http.ResponseWriter, r *http.Request) { return } - bytes := screencast.Image() + bytes, err := screencast.Image() + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") w.Header().Set("Content-Type", "image/jpeg") w.Write(bytes) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index ee0988e7..46770ac2 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -51,12 +51,6 @@ func (manager *CaptureManagerCtx) Start() { } } - if manager.screencast.Enabled() { - if err := manager.screencast.createPipeline(); err != nil { - manager.logger.Panic().Err(err).Msg("unable to create screencast pipeline") - } - } - manager.desktop.OnBeforeScreenSizeChange(func() { if manager.Streaming() { manager.destroyVideoPipeline() @@ -66,7 +60,7 @@ func (manager *CaptureManagerCtx) Start() { manager.broadcast.destroyPipeline() } - if manager.screencast.Enabled() { + if manager.screencast.Started() { manager.screencast.destroyPipeline() } }) @@ -82,7 +76,7 @@ func (manager *CaptureManagerCtx) Start() { } } - if manager.screencast.Enabled() { + if manager.screencast.Started() { if err := manager.screencast.createPipeline(); err != nil { manager.logger.Panic().Err(err).Msg("unable to recreate screencast pipeline") } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index da2f9ccf..f5589710 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -1,7 +1,9 @@ package capture import ( - "bytes" + "fmt" + "time" + "sync" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -13,13 +15,17 @@ import ( type ScreencastManagerCtx struct { logger zerolog.Logger + mu sync.Mutex config *config.Capture pipeline *gst.Pipeline enabled bool + started bool shutdown chan bool refresh chan bool + expires time.Time + timeout time.Duration sample chan types.Sample - image *bytes.Buffer + image types.Sample } func screencastNew(config *config.Capture) *ScreencastManagerCtx { @@ -27,24 +33,34 @@ func screencastNew(config *config.Capture) *ScreencastManagerCtx { logger: log.With().Str("module", "capture").Str("submodule", "screencast").Logger(), config: config, enabled: config.Screencast, + started: false, shutdown: make(chan bool), refresh: make(chan bool), - image: new(bytes.Buffer), + timeout: 10 * time.Second, + } + + if !manager.enabled { + return manager } go func() { + ticker := time.NewTicker(1 * time.Second) manager.logger.Debug().Msg("subroutine started") for { select { case <-manager.shutdown: manager.logger.Debug().Msg("shutting down") + ticker.Stop() return case <-manager.refresh: manager.logger.Debug().Msg("subroutine updated") case sample := <-manager.sample: - manager.image.Reset() - manager.image.Write(sample.Data) + manager.image = sample + case <-ticker.C: + if manager.started && time.Now().After(manager.expires) { + manager.stop() + } } } }() @@ -52,25 +68,61 @@ func screencastNew(config *config.Capture) *ScreencastManagerCtx { return manager } -func (manager *ScreencastManagerCtx) Start() error { - manager.enabled = true - return manager.createPipeline() -} - -func (manager *ScreencastManagerCtx) Stop() { - manager.enabled = false - manager.destroyPipeline() -} - func (manager *ScreencastManagerCtx) Enabled() bool { return manager.enabled } -func (manager *ScreencastManagerCtx) Image() []byte { - return manager.image.Bytes() +func (manager *ScreencastManagerCtx) Started() bool { + return manager.started +} + +func (manager *ScreencastManagerCtx) Image() ([]byte, error) { + manager.expires = time.Now().Add(manager.timeout) + + if !manager.started { + err := manager.start() + if err != nil { + return nil, err + } + + select { + case sample := <-manager.sample: + return sample.Data, nil + case <-time.After(1 * time.Second): + return nil, fmt.Errorf("timeouted") + } + } + + if manager.image.Data == nil { + return nil, fmt.Errorf("image sample not found") + } + + return manager.image.Data, nil +} + +func (manager *ScreencastManagerCtx) start() error { + if !manager.enabled { + return fmt.Errorf("screenshot pipeline not enabled") + } + + err := manager.createPipeline() + if err != nil { + return err + } + + manager.started = true + return nil +} + +func (manager *ScreencastManagerCtx) stop() { + manager.started = false + manager.destroyPipeline() } func (manager *ScreencastManagerCtx) createPipeline() error { + manager.mu.Lock() + defer manager.mu.Unlock() + var err error manager.logger.Info(). @@ -98,6 +150,9 @@ func (manager *ScreencastManagerCtx) createPipeline() error { } func (manager *ScreencastManagerCtx) destroyPipeline() { + manager.mu.Lock() + defer manager.mu.Unlock() + if manager.pipeline == nil { return } diff --git a/internal/types/capture.go b/internal/types/capture.go index 9bd90a7e..6481dfe4 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -13,10 +13,9 @@ type BroadcastManager interface { } type ScreencastManager interface { - Start() error - Stop() Enabled() bool - Image() []byte + Started() bool + Image() ([]byte, error) } type CaptureManager interface { From 1ffbe337d440bb12d6bbe4b678ae81de7efbb010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 23 Jan 2021 15:23:10 +0100 Subject: [PATCH 290/876] shot.jpg. --- internal/api/room/handler.go | 2 +- internal/api/room/screen.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 0718cbd6..de9485a0 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -62,7 +62,7 @@ func (h *RoomHandler) Route(r chi.Router) { r.Route("/screen", func(r chi.Router) { r.With(auth.CanWatchOnly).Get("/", h.screenConfiguration) - r.With(auth.CanWatchOnly).Get("/image", h.screenImageGet) + r.With(auth.CanWatchOnly).Get("/shot.jpg", h.screenShotGet) r.With(auth.CanWatchOnly).Get("/cast.jpg", h.screenCastGet) r.With(auth.AdminsOnly).Post("/", h.screenConfigurationChange) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 70645cc9..9003f422 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -76,7 +76,7 @@ func (h *RoomHandler) screenConfigurationsList(w http.ResponseWriter, r *http.Re utils.HttpSuccess(w, list) } -func (h *RoomHandler) screenImageGet(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) { var options *jpeg.Options if quality, err := strconv.Atoi(r.URL.Query().Get("quality")); err == nil { options = &jpeg.Options{ quality } @@ -92,6 +92,7 @@ func (h *RoomHandler) screenImageGet(w http.ResponseWriter, r *http.Request) { return } + w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") w.Header().Set("Content-Type", "image/jpeg") w.Write(out.Bytes()) } From 79d67c4a09c3dc4f458a21ebd12ea34fd871b506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 23 Jan 2021 16:29:47 +0100 Subject: [PATCH 291/876] screencast atomic expired. --- internal/capture/screencast.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index f5589710..f08a05ab 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -4,6 +4,7 @@ import ( "fmt" "time" "sync" + "sync/atomic" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -22,8 +23,7 @@ type ScreencastManagerCtx struct { started bool shutdown chan bool refresh chan bool - expires time.Time - timeout time.Duration + expired int32 sample chan types.Sample image types.Sample } @@ -36,7 +36,6 @@ func screencastNew(config *config.Capture) *ScreencastManagerCtx { started: false, shutdown: make(chan bool), refresh: make(chan bool), - timeout: 10 * time.Second, } if !manager.enabled { @@ -44,7 +43,7 @@ func screencastNew(config *config.Capture) *ScreencastManagerCtx { } go func() { - ticker := time.NewTicker(1 * time.Second) + ticker := time.NewTicker(5 * time.Second) manager.logger.Debug().Msg("subroutine started") for { @@ -58,7 +57,7 @@ func screencastNew(config *config.Capture) *ScreencastManagerCtx { case sample := <-manager.sample: manager.image = sample case <-ticker.C: - if manager.started && time.Now().After(manager.expires) { + if manager.started && !atomic.CompareAndSwapInt32(&manager.expired, 0, 1) { manager.stop() } } @@ -77,7 +76,7 @@ func (manager *ScreencastManagerCtx) Started() bool { } func (manager *ScreencastManagerCtx) Image() ([]byte, error) { - manager.expires = time.Now().Add(manager.timeout) + atomic.StoreInt32(&manager.expired, 0) if !manager.started { err := manager.start() From d30d6deb7912d338ed9da1465bac211d2508fd6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 23 Jan 2021 18:18:14 +0100 Subject: [PATCH 292/876] add CORS. --- go.mod | 1 + go.sum | 2 ++ internal/config/server.go | 20 ++++++++++++++++++++ internal/http/manager.go | 15 ++++++++++++++- internal/types/websocket.go | 4 +++- internal/websocket/manager.go | 20 ++++++++------------ 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index cd56a4d7..73ad1a85 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.13 require ( github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-chi/chi v4.1.0+incompatible + github.com/go-chi/cors v1.1.1 github.com/golang/protobuf v1.3.5 // indirect github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 diff --git a/go.sum b/go.sum index 08536a1d..47791a58 100644 --- a/go.sum +++ b/go.sum @@ -50,6 +50,8 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-chi/chi v4.1.0+incompatible h1:ETj3cggsVIY2Xao5ExCu6YhEh5MD6JTfcBzS37R260w= github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/go-chi/cors v1.1.1 h1:eHuqxsIw89iXcWnWUN8R72JMibABJTN/4IOYI5WERvw= +github.com/go-chi/cors v1.1.1/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= diff --git a/internal/config/server.go b/internal/config/server.go index 0153dce4..58848b39 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -3,6 +3,8 @@ package config import ( "github.com/spf13/cobra" "github.com/spf13/viper" + + "demodesk/neko/internal/utils" ) type Server struct { @@ -10,6 +12,7 @@ type Server struct { Key string Bind string Static string + CORS []string //Proxy bool } @@ -34,6 +37,11 @@ func (Server) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().StringSlice("cors", []string{"http://icms:3001"}, "list of allowed origins for CORS") + if err := viper.BindPFlag("cors", cmd.PersistentFlags().Lookup("cors")); err != nil { + return err + } + //cmd.PersistentFlags().Bool("proxy", false, "allow reverse proxies") //if err := viper.BindPFlag("proxy", cmd.PersistentFlags().Lookup("proxy")); err != nil { // return err @@ -47,5 +55,17 @@ func (s *Server) Set() { s.Key = viper.GetString("key") s.Bind = viper.GetString("bind") s.Static = viper.GetString("static") + + s.CORS = viper.GetStringSlice("cors") + in, _ := utils.ArrayIn("*", s.CORS) + if len(s.CORS) == 0 || in { + s.CORS = []string{"*"} + } + //s.Proxy = viper.GetBool("proxy") } + +func (s *Server) AllowOrigin(origin string) bool { + in, _ := utils.ArrayIn(origin, s.CORS) + return in || s.CORS[0] == "*" +} diff --git a/internal/http/manager.go b/internal/http/manager.go index 08d33eb6..3883507a 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -7,6 +7,7 @@ import ( "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" + "github.com/go-chi/cors" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -27,6 +28,16 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c router := chi.NewRouter() router.Use(middleware.Recoverer) // Recover from panics without crashing server + router.Use(cors.Handler(cors.Options{ + AllowOriginFunc: func(r *http.Request, origin string) bool { + return conf.AllowOrigin(origin) + }, + AllowedMethods: []string{"GET", "POST", "DELETE", "OPTIONS"}, + AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"}, + ExposedHeaders: []string{"Link"}, + AllowCredentials: false, + MaxAge: 300, // Maximum value not ignored by any of major browsers + })) router.Use(middleware.RequestID) // Create a request ID for each request router.Use(Logger) // Log API request calls using custom logger function @@ -34,7 +45,9 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { //nolint - WebSocketManager.Upgrade(w, r) + WebSocketManager.Upgrade(w, r, func(r *http.Request) bool { + return conf.AllowOrigin(r.Header.Get("Origin")) + }) }) if conf.Static != "" { diff --git a/internal/types/websocket.go b/internal/types/websocket.go index 836e3d31..154d5b74 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -4,6 +4,8 @@ import "net/http" type HandlerFunction func(Session, []byte) bool +type CheckOrigin func(r *http.Request) bool + type WebSocketPeer interface { Send(v interface{}) error Destroy() error @@ -13,5 +15,5 @@ type WebSocketManager interface { Start() Shutdown() error AddHandler(handler HandlerFunction) - Upgrade(w http.ResponseWriter, r *http.Request) error + Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin CheckOrigin) error } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 511c9450..a63e181a 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -27,11 +27,6 @@ func New( logger: logger, sessions: sessions, desktop: desktop, - upgrader: websocket.Upgrader{ - CheckOrigin: func(r *http.Request) bool { - return true - }, - }, handler: handler.New(sessions, desktop, capture, webrtc), handlers: []types.HandlerFunction{}, } @@ -42,7 +37,6 @@ const pingPeriod = 60 * time.Second type WebSocketManagerCtx struct { logger zerolog.Logger - upgrader websocket.Upgrader sessions types.SessionManager desktop types.DesktopManager handler *handler.MessageHandlerCtx @@ -145,10 +139,14 @@ func (ws *WebSocketManagerCtx) AddHandler(handler types.HandlerFunction) { ws.handlers = append(ws.handlers, handler) } -func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) error { +func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin types.CheckOrigin) error { ws.logger.Debug().Msg("attempting to upgrade connection") - connection, err := ws.upgrader.Upgrade(w, r, nil) + upgrader := websocket.Upgrader{ + CheckOrigin: checkOrigin, + } + + connection, err := upgrader.Upgrade(w, r, nil) if err != nil { ws.logger.Error().Err(err).Msg("failed to upgrade connection") return err @@ -227,11 +225,9 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types.Session) { bytes := make(chan []byte) cancel := make(chan struct{}) - ticker := time.NewTicker(pingPeriod) - defer func() { - ticker.Stop() - }() + ticker := time.NewTicker(pingPeriod) + defer ticker.Stop() go func() { for { From 789d812b3d9d34049b78b222d5a1b0355c6e1457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 23 Jan 2021 18:23:02 +0100 Subject: [PATCH 293/876] go upgrade deps. --- go.mod | 46 +++++--- go.sum | 360 +++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 312 insertions(+), 94 deletions(-) diff --git a/go.mod b/go.mod index 73ad1a85..7ed5a5c9 100644 --- a/go.mod +++ b/go.mod @@ -3,29 +3,37 @@ module demodesk/neko go 1.13 require ( - github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/go-chi/chi v4.1.0+incompatible + github.com/go-chi/chi v4.1.2+incompatible github.com/go-chi/cors v1.1.1 - github.com/golang/protobuf v1.3.5 // indirect + github.com/golang/protobuf v1.4.3 // indirect + github.com/google/uuid v1.2.0 // indirect github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 - github.com/lucas-clemente/quic-go v0.15.2 // indirect - github.com/mitchellh/mapstructure v1.2.2 // indirect - github.com/pelletier/go-toml v1.7.0 // indirect - github.com/pion/ice v0.7.12 // indirect + github.com/lucas-clemente/quic-go v0.19.3 // indirect + github.com/magiconair/properties v1.8.4 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/pelletier/go-toml v1.8.1 // indirect + github.com/pion/dtls/v2 v2.0.4 // indirect github.com/pion/logging v0.2.2 - github.com/pion/rtp v1.4.0 // indirect - github.com/pion/sdp/v2 v2.3.5 // indirect - github.com/pion/webrtc/v2 v2.2.4 - github.com/rs/zerolog v1.18.0 - github.com/spf13/afero v1.2.2 // indirect + github.com/pion/quic v0.1.4 // indirect + github.com/pion/rtcp v1.2.6 // indirect + github.com/pion/rtp v1.6.2 // indirect + github.com/pion/sctp v1.7.11 // indirect + github.com/pion/srtp v1.5.2 // indirect + github.com/pion/transport v0.12.2 // indirect + github.com/pion/turn/v2 v2.0.5 // indirect + github.com/pion/webrtc/v2 v2.2.26 + github.com/rs/zerolog v1.20.0 + github.com/spf13/afero v1.5.1 // indirect github.com/spf13/cast v1.3.1 // indirect - github.com/spf13/cobra v0.0.7 + github.com/spf13/cobra v1.1.1 github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.6.2 - golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 // indirect - golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f // indirect - golang.org/x/text v0.3.2 // indirect - gopkg.in/ini.v1 v1.55.0 // indirect + github.com/spf13/viper v1.7.1 + golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect + golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect + golang.org/x/sys v0.0.0-20210123111255-9b0068b26619 // indirect + golang.org/x/text v0.3.5 // indirect + google.golang.org/protobuf v1.25.0 // indirect + gopkg.in/ini.v1 v1.62.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 47791a58..31d2060f 100644 --- a/go.sum +++ b/go.sum @@ -2,32 +2,47 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75 h1:3ILjVyslFbc4jl1w5TWuvvslFD/nDfR2H8tVaMVLrEY= -github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= @@ -39,6 +54,9 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= @@ -48,11 +66,12 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/go-chi/chi v4.1.0+incompatible h1:ETj3cggsVIY2Xao5ExCu6YhEh5MD6JTfcBzS37R260w= -github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec= +github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-chi/cors v1.1.1 h1:eHuqxsIw89iXcWnWUN8R72JMibABJTN/4IOYI5WERvw= github.com/go-chi/cors v1.1.1/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -61,29 +80,54 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/mock v1.4.0 h1:Rd1kQnQu0Hq3qvJppYSG0HtP+f5LPPUiDswTLiEegLg= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= +github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= @@ -91,8 +135,27 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmg github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -109,6 +172,7 @@ github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxP github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -118,90 +182,127 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9 h1:tbuodUh2vuhOVZAdW3NEUvosFHUMJwUNl7jk/VSEiwc= github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9/go.mod h1:PpMmPfPKO9nKJ/psF49ESTAGQSdfXxlg1otPbEB2nOw= -github.com/lucas-clemente/quic-go v0.15.2 h1:RgxRJ7rPde0Q/uXDeb3/UdblVvxrYGDAG9G9GO78LmI= -github.com/lucas-clemente/quic-go v0.15.2/go.mod h1:qxmO5Y4ZMhdNkunGfxuZnZXnJwYpW9vjQkyrZ7BsgUI= +github.com/lucas-clemente/quic-go v0.18.0/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg= +github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4= +github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= +github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI= +github.com/marten-seemann/qpack v0.2.0/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= +github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= github.com/marten-seemann/qtls v0.2.3 h1:0yWJ43C62LsZt08vuQJDK1uC1czUc3FJeCLPoNAI4vA= github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= -github.com/marten-seemann/qtls v0.8.0 h1:aj+MPLibzKByw8CmG0WvWgbtBkctYPAXeB11cQJC8mo= -github.com/marten-seemann/qtls v0.8.0/go.mod h1:Lao6jDqlCfxyLKYFmZXGm2LSHBgVn+P+ROOex6YkT+k= +github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc= +github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs= +github.com/marten-seemann/qtls-go1-15 v0.1.0/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= +github.com/marten-seemann/qtls-go1-15 v0.1.1 h1:LIH6K34bPVttyXnUWixk0bzH6/N07VxbSabxn5A5gZQ= +github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.2.2 h1:dxe5oCinTXiTIcfgmZecdCzPmAJKd46KsCWc35r0TV4= -github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= -github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= -github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pion/datachannel v1.4.16 h1:dvuDC0IBMUDQvwO+gRu0Dv+W5j7rrgNpCmtheb6iYnc= -github.com/pion/datachannel v1.4.16/go.mod h1:gRGhxZv7X2/30Qxes4WEXtimKBXcwj/3WsDtBlHnvJY= -github.com/pion/dtls/v2 v2.0.0-rc.7/go.mod h1:U199DvHpRBN0muE9+tVN4TMy1jvEhZIZ63lk4xkvVSk= -github.com/pion/dtls/v2 v2.0.0-rc.9 h1:wPb0JKmYoleAM2o8vQSPaUM+geJq7l0AdeUlPsg19ec= -github.com/pion/dtls/v2 v2.0.0-rc.9/go.mod h1:6eFkFvpo0T+odQ+39HFEtOO7LX5cUlFqXdSo4ucZtGg= -github.com/pion/ice v0.7.10/go.mod h1:YufCtyMmPeZXGTuARCracYfe0mb3EXbcRUS+vHJB5Cs= -github.com/pion/ice v0.7.12 h1:Lsh4f0Uvh/vOCXSyj+w5C736LrKt66qAKeA2LFwSkn0= -github.com/pion/ice v0.7.12/go.mod h1:yLt/9LAJEZXFtnOBdpq5YGaOF9SsDjVGCvzF3MF4k5k= +github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= +github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= +github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0= +github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= +github.com/pion/dtls/v2 v2.0.1/go.mod h1:uMQkz2W0cSqY00xav7WByQ4Hb+18xeQh2oH2fRezr5U= +github.com/pion/dtls/v2 v2.0.2/go.mod h1:27PEO3MDdaCfo21heT59/vsdmZc0zMt9wQPcSlLu/1I= +github.com/pion/dtls/v2 v2.0.4 h1:WuUcqi6oYMu/noNTz92QrF1DaFj4eXbhQ6dzaaAwOiI= +github.com/pion/dtls/v2 v2.0.4/go.mod h1:qAkFscX0ZHoI1E07RfYPoRw3manThveu+mlTDdOxoGI= +github.com/pion/ice v0.7.18 h1:KbAWlzWRUdX9SmehBh3gYpIFsirjhSQsCw6K2MjYMK0= +github.com/pion/ice v0.7.18/go.mod h1:+Bvnm3nYC6Nnp7VV6glUkuOfToB/AtMRZpOU8ihuf4c= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY= github.com/pion/mdns v0.0.4/go.mod h1:R1sL0p50l42S5lJs91oNdUL58nm0QHrhxnSegr++qC0= github.com/pion/quic v0.1.1 h1:D951FV+TOqI9A0rTF7tHx0Loooqz+nyzjEyj8o3PuMA= github.com/pion/quic v0.1.1/go.mod h1:zEU51v7ru8Mp4AUBJvj6psrSth5eEFNnVQK5K48oV3k= -github.com/pion/rtcp v1.2.1 h1:S3yG4KpYAiSmBVqKAfgRa5JdwBNj4zK3RLUa8JYdhak= -github.com/pion/rtcp v1.2.1/go.mod h1:a5dj2d6BKIKHl43EnAOIrCczcjESrtPuMgfmL6/K6QM= -github.com/pion/rtp v1.3.2/go.mod h1:q9wPnA96pu2urCcW/sK/RiDn597bhGoAQQ+y2fDwHuY= -github.com/pion/rtp v1.4.0 h1:EkeHEXKuJhZoRUxtL2Ie80vVg9gBH+poT9UoL8M14nw= -github.com/pion/rtp v1.4.0/go.mod h1:/l4cvcKd0D3u9JLs2xSVI95YkfXW87a3br3nqmVtSlE= -github.com/pion/sctp v1.7.6 h1:8qZTdJtbKfAns/Hv5L0PAj8FyXcsKhMH1pKUCGisQg4= -github.com/pion/sctp v1.7.6/go.mod h1:ichkYQ5tlgCQwEwvgfdcAolqx1nHbYCxo4D7zK/K0X8= -github.com/pion/sdp/v2 v2.3.4/go.mod h1:jccXVYW0fuK6ds2pwKr89SVBDYlCjhgMI6nucl5R5rA= -github.com/pion/sdp/v2 v2.3.5 h1:DtS9Z9R+E3/mn2jt+RQKBnneK1g+p3PT25+TkQHodfU= -github.com/pion/sdp/v2 v2.3.5/go.mod h1:+ZZf35r1+zbaWYiZLfPutWfx58DAWcGb2QsS3D/s9M8= -github.com/pion/srtp v1.3.1 h1:WNDLN41ST0P6cXRpzx97JJW//vChAEo1+Etdqo+UMnM= -github.com/pion/srtp v1.3.1/go.mod h1:nxEytDDGTN+eNKJ1l5gzOCWQFuksgijorsSlgEjc40Y= -github.com/pion/stun v0.3.3 h1:brYuPl9bN9w/VM7OdNzRSLoqsnwlyNvD9MVeJrHjDQw= -github.com/pion/stun v0.3.3/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M= +github.com/pion/quic v0.1.4 h1:bNz9sCJjlM3GqMdq7Fne57FiWfdyiJ++yHVbuqeoD3Y= +github.com/pion/quic v0.1.4/go.mod h1:dBhNvkLoQqRwfi6h3Vqj3IcPLgiW7rkZxBbRdp7Vzvk= +github.com/pion/randutil v0.0.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= +github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= +github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= +github.com/pion/rtcp v1.2.3/go.mod h1:zGhIv0RPRF0Z1Wiij22pUt5W/c9fevqSzT4jje/oK7I= +github.com/pion/rtcp v1.2.4/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= +github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo= +github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= +github.com/pion/rtp v1.6.0/go.mod h1:QgfogHsMBVE/RFNno467U/KBqfUywEH+HK+0rtnwsdI= +github.com/pion/rtp v1.6.1/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.6.2 h1:iGBerLX6JiDjB9NXuaPzHyxHFG9JsIEdgwTC0lp5n/U= +github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= +github.com/pion/sctp v1.7.11 h1:UCnj7MsobLKLuP/Hh+JMiI/6W5Bs/VF45lWKgHFjSIE= +github.com/pion/sctp v1.7.11/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= +github.com/pion/sdp/v2 v2.4.0 h1:luUtaETR5x2KNNpvEMv/r4Y+/kzImzbz4Lm1z8eQNQI= +github.com/pion/sdp/v2 v2.4.0/go.mod h1:L2LxrOpSTJbAns244vfPChbciR/ReU1KWfG04OpkR7E= +github.com/pion/srtp v1.5.1/go.mod h1:B+QgX5xPeQTNc1CJStJPHzOlHK66ViMDWTT0HZTCkcA= +github.com/pion/srtp v1.5.2 h1:25DmvH+fqKZDqvX64vTwnycVwL9ooJxHF/gkX16bDBY= +github.com/pion/srtp v1.5.2/go.mod h1:NiBff/MSxUwMUwx/fRNyD/xGE+dVvf8BOCeXhjCXZ9U= +github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= +github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= github.com/pion/transport v0.6.0/go.mod h1:iWZ07doqOosSLMhZ+FXUTq+TamDoXSllxpbGcfkCmbE= github.com/pion/transport v0.8.10 h1:lTiobMEw2PG6BH/mgIVqTV2mBp/mPT+IJLaN8ZxgdHk= github.com/pion/transport v0.8.10/go.mod h1:tBmha/UCjpum5hqTWhfAEs3CO4/tHSg0MYRhSzR+CZ8= github.com/pion/transport v0.10.0 h1:9M12BSneJm6ggGhJyWpDveFOstJsTiQjkLf4M44rm80= github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE= -github.com/pion/turn/v2 v2.0.3 h1:SJUUIbcPoehlyZgMyIUbBBDhI03sBx32x3JuSIBKBWA= -github.com/pion/turn/v2 v2.0.3/go.mod h1:kl1hmT3NxcLynpXVnwJgObL8C9NaCyPTeqI2DcCpSZs= -github.com/pion/webrtc/v2 v2.2.4 h1:elWyBI/6S2kNoJ5rcTj2EMAvp/fmeiEqiuYbUd0ShRA= -github.com/pion/webrtc/v2 v2.2.4/go.mod h1:9vTqkEISnB5AXlggrFSBLGSz/kopQuYUYzHubuFpnCU= +github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A= +github.com/pion/transport v0.12.2 h1:WYEjhloRHt1R86LhUKjC5y+P52Y11/QqEUalvtzVoys= +github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= +github.com/pion/turn/v2 v2.0.4/go.mod h1:1812p4DcGVbYVBTiraUmP50XoKye++AMkbfp+N27mog= +github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= +github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= +github.com/pion/udp v0.1.0 h1:uGxQsNyrqG3GLINv36Ff60covYmfrLoxzwnCsIYspXI= +github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths= +github.com/pion/webrtc/v2 v2.2.26 h1:01hWE26pL3LgqfxvQ1fr6O4ZtyRFFJmQEZK39pHWfFc= +github.com/pion/webrtc/v2 v2.2.26/go.mod h1:XMZbZRNHyPDe1gzTIHFcQu02283YO45CbiwFgKvXnmc= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3 h1:9iH4JKXLzFbOAdtqv/a+j8aewx2Y8lAjAydhbaScPF8= @@ -209,6 +310,7 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0 h1:7etb9YClo3a6HjLzfl6rIQaU+FDfi0VSX39io3aQ+DM= @@ -219,12 +321,15 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084 h1:sofwID9zm4tzr github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.18.0 h1:CbAm3kP2Tptby1i9sYy2MGRg0uxIN9cyDb59Ys7W8z8= -github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= +github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= +github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= @@ -260,14 +365,14 @@ github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/afero v1.5.1 h1:VHu76Lk0LSP1x254maIu2bplkWpfBWI+B+6fdoZprcg= +github.com/spf13/afero v1.5.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.7 h1:FfTH+vuMXOas8jmfb5/M7dzEYx7LpcLb7a0LPe34uOU= -github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= +github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= @@ -276,9 +381,9 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E= -github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= +github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -287,88 +392,140 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8 h1:fpnn/HnJONpIu6hkXi1u/7rR0NzilgWr4T0JmWkEitk= -golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= +golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f h1:QdHQnPce6K4XQewki9WNbG5KOROuDzqO3NaYjI1cXJ0= -golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210123111255-9b0068b26619 h1:yLLDsUUPDliIQpKl7BjVb1igwngIMH2GBjo1VpwLTE0= +golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -379,41 +536,85 @@ golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.55.0 h1:E8yzL5unfpW3M6fz/eB7Cb5MQAYSZ7GKo4Qth+N2sgQ= -gopkg.in/ini.v1 v1.55.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= @@ -424,10 +625,19 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= From 47689d5372c7ff1b17f141cf314de3c7df53a162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 23 Jan 2021 20:08:30 +0100 Subject: [PATCH 294/876] cors fix typo, default config value. --- internal/config/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/config/server.go b/internal/config/server.go index 58848b39..a093ec65 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -37,7 +37,7 @@ func (Server) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().StringSlice("cors", []string{"http://icms:3001"}, "list of allowed origins for CORS") + cmd.PersistentFlags().StringSlice("cors", []string{"*"}, "list of allowed origins for CORS") if err := viper.BindPFlag("cors", cmd.PersistentFlags().Lookup("cors")); err != nil { return err } From 51d061e9aa02f0e36c07ab69e8d48d926683d3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 25 Jan 2021 17:31:24 +0100 Subject: [PATCH 295/876] minor lint fixes. --- internal/api/room/screen.go | 14 +++++++------- internal/desktop/xorg/xorg.go | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 9003f422..be6bf2dc 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -77,17 +77,17 @@ func (h *RoomHandler) screenConfigurationsList(w http.ResponseWriter, r *http.Re } func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) { - var options *jpeg.Options - if quality, err := strconv.Atoi(r.URL.Query().Get("quality")); err == nil { - options = &jpeg.Options{ quality } - } else { - options = &jpeg.Options{ 90 } + quality, err := strconv.Atoi(r.URL.Query().Get("quality")) + if err != nil { + quality = 90 } img := h.desktop.GetScreenshotImage() out := new(bytes.Buffer) - err := jpeg.Encode(out, img, options) - if err != nil { + + if err := jpeg.Encode(out, img, &jpeg.Options{ + Quality: quality, + }); err != nil { utils.HttpInternalServerError(w, err) return } diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index f2677f24..bc41b0e9 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -229,8 +229,7 @@ func GetCursorImage() *types.CursorImage { mu.Lock() defer mu.Unlock() - var cur *C.XFixesCursorImage - cur = C.XGetCursorImage() + cur := C.XGetCursorImage() defer C.XFree(unsafe.Pointer(cur)) width := uint16(cur.width) From 0ead4bc8fd74d6e4ce7fc74e5e873b148db18ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 25 Jan 2021 17:33:29 +0100 Subject: [PATCH 296/876] reset keys before drop. --- internal/desktop/drop.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index 0fe7c8f6..5e3ce48e 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -22,6 +22,7 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { }) drop.Emmiter.Once("cursor-enter", func(payload ...interface{}) { + //nolint manager.ButtonDown(1) }) @@ -35,6 +36,7 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { time.Sleep(DROP_DELAY) } + //nolint manager.ButtonUp(1) }) @@ -43,6 +45,7 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { finished <- payload[0].(bool) }) + manager.ResetKeys() go drop.OpenWindow(files) select { From 794728f4a8ee9a7c07b20c43f624bd730fe0d65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 25 Jan 2021 17:36:43 +0100 Subject: [PATCH 297/876] add nolint. --- internal/api/room/screen.go | 2 ++ internal/desktop/filechooserdialog.go | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index be6bf2dc..e79531c6 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -94,6 +94,7 @@ func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) { w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") w.Header().Set("Content-Type", "image/jpeg") + //nolint w.Write(out.Bytes()) } @@ -112,5 +113,6 @@ func (h *RoomHandler) screenCastGet(w http.ResponseWriter, r *http.Request) { w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") w.Header().Set("Content-Type", "image/jpeg") + //nolint w.Write(bytes) } diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index 0bd1af91..4e0cd015 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -25,7 +25,7 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { "sleep", FILE_CHOOSER_DIALOG_SLEEP, ).Run() - // TODO: Use native API. + //nolint exec.Command( "xdotool", "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", @@ -61,7 +61,9 @@ func (manager *DesktopManagerCtx) CloseFileChooserDialog() { // because xdotool is failing to send proper Alt+F4 manager.ResetKeys() + //nolint manager.KeyDown(65513) // Alt + //nolint manager.KeyDown(65473) // F4 time.Sleep(10 * time.Millisecond) manager.ResetKeys() From 7cbee94a801d401c1670bded78324d0d76206204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 25 Jan 2021 17:45:52 +0100 Subject: [PATCH 298/876] multipart form lint fixes. --- internal/api/room/upload.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 01e6a863..1bbce9d4 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -17,13 +17,13 @@ const ( ) func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { - r.ParseMultipartForm(MAX_UPLOAD_SIZE) - - if r.MultipartForm == nil { - utils.HttpBadRequest(w, "No MultipartForm received.") + err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) + if err != nil { + utils.HttpBadRequest(w, "Failed to parse multipart form.") return } + //nolint defer r.MultipartForm.RemoveAll() X, err := strconv.Atoi(r.FormValue("x")) @@ -88,13 +88,13 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { } func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { - r.ParseMultipartForm(MAX_UPLOAD_SIZE) - - if r.MultipartForm == nil { - utils.HttpBadRequest(w, "No MultipartForm received.") + err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) + if err != nil { + utils.HttpBadRequest(w, "Failed to parse multipart form.") return } + //nolint defer r.MultipartForm.RemoveAll() if !h.desktop.IsFileChooserDialogOpened() { From c27658d54c12396029f1c8b30df71a936e4689d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 25 Jan 2021 20:23:40 +0100 Subject: [PATCH 299/876] HandleFileChooserDialog: fix auocomplete bug. --- internal/desktop/filechooserdialog.go | 41 ++++++++++++++++++--------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index 4e0cd015..192d578b 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -1,13 +1,15 @@ package desktop import ( + "fmt" "time" "os/exec" ) const ( - FILE_CHOOSER_DIALOG_NAME = "Open File" - FILE_CHOOSER_DIALOG_SLEEP = "0.2" + FILE_CHOOSER_DIALOG_NAME = "Open File" + FILE_CHOOSER_DIALOG_SHORT_SLEEP = "0.2" + FILE_CHOOSER_DIALOG_LONG_SLEEP = "0.4" ) func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { @@ -15,28 +17,39 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { defer mu.Unlock() // TODO: Use native API. - err := exec.Command( + err1 := exec.Command( "xdotool", "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", - "sleep", FILE_CHOOSER_DIALOG_SLEEP, + "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, "key", "--clearmodifiers", "ctrl+l", "type", "--args", "1", uri + "//", + "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, + "key", "Delete", // remove autocomplete results + "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, "key", "Return", - "sleep", FILE_CHOOSER_DIALOG_SLEEP, - ).Run() - - //nolint - exec.Command( - "xdotool", - "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", - "sleep", FILE_CHOOSER_DIALOG_SLEEP, + "sleep", FILE_CHOOSER_DIALOG_LONG_SLEEP, "key", "Down", "key", "--clearmodifiers", "ctrl+a", "key", "Return", - "sleep", FILE_CHOOSER_DIALOG_SLEEP, + "sleep", FILE_CHOOSER_DIALOG_LONG_SLEEP, ).Run() - return err + if err1 != nil { + return err1 + } + + // TODO: Use native API. + err2 := exec.Command( + "xdotool", + "search", "--name", FILE_CHOOSER_DIALOG_NAME, + ).Run() + + // if last command didn't return error, consider dialog as still open + if err2 == nil { + return fmt.Errorf("unable to select files in dialog") + } + + return nil } func (manager *DesktopManagerCtx) CloseFileChooserDialog() { From 8e13a6067741dd24676aa178dac6a28580742564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 28 Jan 2021 15:56:50 +0100 Subject: [PATCH 300/876] send unicast & broadcast. --- internal/types/event/events.go | 5 ++++ internal/types/message/messages.go | 19 +++++++++++++++ internal/websocket/handler/handler.go | 12 ++++++++++ internal/websocket/handler/send.go | 33 +++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 internal/websocket/handler/send.go diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 36d48ede..5541571f 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -52,6 +52,11 @@ const ( BORADCAST_STATUS = "broadcast/status" ) +const ( + SEND_UNICAST = "send/unicast" + SEND_BROADCAST = "send/broadcast" +) + const ( FILE_CHOOSER_DIALOG_OPENED = "file_chooser_dialog/opened" FILE_CHOOSER_DIALOG_CLOSED = "file_chooser_dialog/closed" diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index fe31194c..01c20623 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -167,3 +167,22 @@ type BroadcastStatus struct { IsActive bool `json:"is_active"` URL string `json:"url,omitempty"` } + +///////////////////////////// +// Send (opaque comunication channel) +///////////////////////////// + +type SendUnicast struct { + Event string `json:"event,omitempty"` + Sender string `json:"sender"` + Receiver string `json:"receiver"` + Subject string `json:"subject"` + Body string `json:"body"` +} + +type SendBroadcast struct { + Event string `json:"event,omitempty"` + Sender string `json:"sender"` + Subject string `json:"subject"` + Body string `json:"body"` +} diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 22e109bb..1601a42b 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -86,6 +86,18 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { err = utils.Unmarshal(payload, raw, func() error { return h.keyboardModifiers(session, payload) }) + + // Send Events + case event.SEND_UNICAST: + payload := &message.SendUnicast{} + err = utils.Unmarshal(payload, raw, func() error { + return h.sendUnicast(session, payload) + }) + case event.SEND_BROADCAST: + payload := &message.SendBroadcast{} + err = utils.Unmarshal(payload, raw, func() error { + return h.sendBroadcast(session, payload) + }) default: return false } diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go new file mode 100644 index 00000000..ba757fb8 --- /dev/null +++ b/internal/websocket/handler/send.go @@ -0,0 +1,33 @@ +package handler + +import ( + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/message" + "demodesk/neko/internal/types/event" +) + +func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error { + receiver, ok := h.sessions.Get(payload.Receiver) + if !ok { + h.logger.Debug().Str("id", session.ID()).Msg("receiver ID not found") + return nil + } + + return receiver.Send(message.SendUnicast{ + Event: event.SEND_UNICAST, + Sender: session.ID(), + Receiver: receiver.ID(), + Subject: payload.Subject, + Body: payload.Body, + }) +} + +func (h *MessageHandlerCtx) sendBroadcast(session types.Session, payload *message.SendBroadcast) error { + h.sessions.Broadcast(message.SendBroadcast{ + Event: event.SEND_BROADCAST, + Sender: session.ID(), + Subject: payload.Subject, + Body: payload.Body, + }, []string{ session.ID() }) + return nil +} From ced0a89bbe419c51e454f4efb3bbaf59ae3a763d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 28 Jan 2021 17:11:23 +0100 Subject: [PATCH 301/876] send: body any type. --- internal/types/message/messages.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 01c20623..a0476739 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -173,16 +173,16 @@ type BroadcastStatus struct { ///////////////////////////// type SendUnicast struct { - Event string `json:"event,omitempty"` - Sender string `json:"sender"` - Receiver string `json:"receiver"` - Subject string `json:"subject"` - Body string `json:"body"` + Event string `json:"event,omitempty"` + Sender string `json:"sender"` + Receiver string `json:"receiver"` + Subject string `json:"subject"` + Body interface{} `json:"body"` } type SendBroadcast struct { - Event string `json:"event,omitempty"` - Sender string `json:"sender"` - Subject string `json:"subject"` - Body string `json:"body"` + Event string `json:"event,omitempty"` + Sender string `json:"sender"` + Subject string `json:"subject"` + Body interface{} `json:"body"` } From 11e74459ac0dad9208ed620e319f942fc4331090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 28 Jan 2021 21:12:35 +0100 Subject: [PATCH 302/876] replace libclipboard with xclip. --- Dockerfile | 16 +++-------- internal/api/room/clipboard.go | 15 ++++++++--- internal/desktop/clipboard.go | 14 ++++++---- internal/desktop/clipboard/clipboard.c | 21 --------------- internal/desktop/clipboard/clipboard.go | 35 ------------------------- internal/desktop/clipboard/clipboard.h | 9 ------- internal/types/desktop.go | 4 +-- internal/websocket/handler/clipboard.go | 3 +-- internal/websocket/manager.go | 12 +++++---- 9 files changed, 33 insertions(+), 96 deletions(-) delete mode 100644 internal/desktop/clipboard/clipboard.c delete mode 100644 internal/desktop/clipboard/clipboard.go delete mode 100644 internal/desktop/clipboard/clipboard.h diff --git a/Dockerfile b/Dockerfile index ceb85cd5..95081e30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,17 +11,7 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \ - git cmake make; \ - # - # install libclipboard - cd /tmp; \ - git clone https://github.com/jtanx/libclipboard; \ - cd libclipboard; \ - cmake .; \ - make -j`nproc`; \ - make install; \ - rm -rf /tmp/libclipboard; \ + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ # # clean up apt-get clean -y; \ @@ -53,8 +43,8 @@ RUN set -eux; \ pulseaudio dbus-x11 xserver-xorg-video-dummy xserver-xorg-input-void \ libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx5 \ # - # file chooser handler - xdotool \ + # file chooser handler, clipboard + xdotool xclip \ # # gst gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index c952ac9d..c09e11ef 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -11,8 +11,11 @@ type ClipboardPayload struct { } func (h *RoomHandler) clipboardRead(w http.ResponseWriter, r *http.Request) { - // TODO: error check? - text := h.desktop.ReadClipboard() + text, err := h.desktop.ReadClipboard() + if err != nil { + utils.HttpInternalServerError(w, err) + return + } utils.HttpSuccess(w, ClipboardPayload{ Text: text, @@ -25,7 +28,11 @@ func (h *RoomHandler) clipboardWrite(w http.ResponseWriter, r *http.Request) { return } - // TODO: error check? - h.desktop.WriteClipboard(data.Text) + err := h.desktop.WriteClipboard(data.Text) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + utils.HttpSuccess(w) } diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index 9171bdbd..3dd0cb09 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -1,13 +1,17 @@ package desktop import ( - "demodesk/neko/internal/desktop/clipboard" + "os/exec" + "strings" ) -func (manager *DesktopManagerCtx) ReadClipboard() string { - return clipboard.ReadClipboard() +func (manager *DesktopManagerCtx) ReadClipboard() (string, error) { + out, err := exec.Command("xclip", "-selection", "clipboard", "-o").Output() + return string(out), err } -func (manager *DesktopManagerCtx) WriteClipboard(data string) { - clipboard.WriteClipboard(data) +func (manager *DesktopManagerCtx) WriteClipboard(data string) error { + cmd := exec.Command("xclip", "-selection", "clipboard", "-i") + cmd.Stdin = strings.NewReader(data) + return cmd.Run() } diff --git a/internal/desktop/clipboard/clipboard.c b/internal/desktop/clipboard/clipboard.c deleted file mode 100644 index c500b33e..00000000 --- a/internal/desktop/clipboard/clipboard.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "clipboard.h" - -static clipboard_c *CLIPBOARD = NULL; - -clipboard_c *getClipboard(void) { - if (CLIPBOARD == NULL) { - CLIPBOARD = clipboard_new(NULL); - } - - return CLIPBOARD; -} - -void ClipboardSet(char *src) { - clipboard_c *cb = getClipboard(); - clipboard_set_text_ex(cb, src, strlen(src), 0); -} - -char *ClipboardGet() { - clipboard_c *cb = getClipboard(); - return clipboard_text_ex(cb, NULL, 0); -} diff --git a/internal/desktop/clipboard/clipboard.go b/internal/desktop/clipboard/clipboard.go deleted file mode 100644 index a5047498..00000000 --- a/internal/desktop/clipboard/clipboard.go +++ /dev/null @@ -1,35 +0,0 @@ -package clipboard - -/* -#cgo linux LDFLAGS: /usr/local/lib/libclipboard.a -lxcb - -#include "clipboard.h" -*/ -import "C" - -import ( - "sync" - "unsafe" -) - -var mu = sync.Mutex{} - -func ReadClipboard() string { - mu.Lock() - defer mu.Unlock() - - clipboardUnsafe := C.ClipboardGet() - defer C.free(unsafe.Pointer(clipboardUnsafe)) - - return C.GoString(clipboardUnsafe) -} - -func WriteClipboard(data string) { - mu.Lock() - defer mu.Unlock() - - clipboardUnsafe := C.CString(data) - defer C.free(unsafe.Pointer(clipboardUnsafe)) - - C.ClipboardSet(clipboardUnsafe) -} diff --git a/internal/desktop/clipboard/clipboard.h b/internal/desktop/clipboard/clipboard.h deleted file mode 100644 index 5f5cf36a..00000000 --- a/internal/desktop/clipboard/clipboard.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include -#include - -clipboard_c *getClipboard(void); - -void ClipboardSet(char *src); -char *ClipboardGet(); diff --git a/internal/types/desktop.go b/internal/types/desktop.go index eb8f11b6..6e28ea1e 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -67,8 +67,8 @@ type DesktopManager interface { OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) // clipboard - ReadClipboard() string - WriteClipboard(data string) + ReadClipboard() (string, error) + WriteClipboard(data string) error // drop DropFiles(x int, y int, files []string) bool diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index d30cca2d..65751d23 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -16,6 +16,5 @@ func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message return nil } - h.desktop.WriteClipboard(payload.Text) - return nil + return h.desktop.WriteClipboard(payload.Text) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index a63e181a..f461a13f 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -117,13 +117,15 @@ func (ws *WebSocketManagerCtx) Start() { return } - text := ws.desktop.ReadClipboard() - err := session.Send(message.ClipboardData{ + text, err := ws.desktop.ReadClipboard() + if err != nil { + ws.logger.Warn().Err(err).Msg("could not get clipboard content") + } + + if err := session.Send(message.ClipboardData{ Event: event.CLIPBOARD_UPDATED, Text: text, - }) - - if err != nil { + }); err != nil { ws.logger.Warn().Err(err).Msg("could not sync clipboard") } }) From 4602f5f6cf2ba94f96317ad11a3d1fa7de07e18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 28 Jan 2021 21:19:31 +0100 Subject: [PATCH 303/876] xclip verbose error output. --- internal/desktop/clipboard.go | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index 3dd0cb09..6e113bc2 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -1,17 +1,40 @@ package desktop import ( + "fmt" + "bytes" "os/exec" "strings" ) func (manager *DesktopManagerCtx) ReadClipboard() (string, error) { - out, err := exec.Command("xclip", "-selection", "clipboard", "-o").Output() - return string(out), err + cmd := exec.Command("xclip", "-selection", "clipboard", "-o") + + var stdout, stderr bytes.Buffer + cmd.Stdout = &stdout + cmd.Stderr = &stderr + + err := cmd.Run() + if err != nil { + msg := strings.TrimSpace(string(stderr.Bytes())) + return "", fmt.Errorf("%s", msg) + } + + return string(stdout.Bytes()), nil } func (manager *DesktopManagerCtx) WriteClipboard(data string) error { cmd := exec.Command("xclip", "-selection", "clipboard", "-i") - cmd.Stdin = strings.NewReader(data) - return cmd.Run() + cmd.Stdin = strings.NewReader(data) + + var stderr bytes.Buffer + cmd.Stderr = &stderr + + err := cmd.Run() + if err != nil { + msg := strings.TrimSpace(string(stderr.Bytes())) + return fmt.Errorf("%s", msg) + } + + return nil } From 2d11b4fa561abdcdd84aaedd4aaeb63ddb61f128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 28 Jan 2021 22:51:55 +0100 Subject: [PATCH 304/876] xclip multiple clipboard content types. --- internal/api/room/clipboard.go | 48 +++++++++++++++++-- internal/api/room/handler.go | 7 ++- internal/desktop/clipboard.go | 62 ++++++++++++++++++++++--- internal/types/desktop.go | 9 +++- internal/websocket/handler/clipboard.go | 2 +- internal/websocket/manager.go | 2 +- 6 files changed, 112 insertions(+), 18 deletions(-) diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index c09e11ef..7731e5b3 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -7,11 +7,22 @@ import ( ) type ClipboardPayload struct { - Text string `json:"text"` + Text string `json:"text,omitempty"` + HTML string `json:"html,omitempty"` } -func (h *RoomHandler) clipboardRead(w http.ResponseWriter, r *http.Request) { - text, err := h.desktop.ReadClipboard() +func (h *RoomHandler) clipboardGetTargets(w http.ResponseWriter, r *http.Request) { + targets, err := h.desktop.ClipboardGetTargets() + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + utils.HttpSuccess(w, targets) +} + +func (h *RoomHandler) clipboardGetPlainText(w http.ResponseWriter, r *http.Request) { + text, err := h.desktop.ClipboardGetPlainText() if err != nil { utils.HttpInternalServerError(w, err) return @@ -22,13 +33,40 @@ func (h *RoomHandler) clipboardRead(w http.ResponseWriter, r *http.Request) { }) } -func (h *RoomHandler) clipboardWrite(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) clipboardSetPlainText(w http.ResponseWriter, r *http.Request) { data := &ClipboardPayload{} if !utils.HttpJsonRequest(w, r, data) { return } - err := h.desktop.WriteClipboard(data.Text) + err := h.desktop.ClipboardSetPlainText(data.Text) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + utils.HttpSuccess(w) +} + +func (h *RoomHandler) clipboardGetRichText(w http.ResponseWriter, r *http.Request) { + html, err := h.desktop.ClipboardGetRichText() + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + utils.HttpSuccess(w, ClipboardPayload{ + HTML: html, + }) +} + +func (h *RoomHandler) clipboardSetRichText(w http.ResponseWriter, r *http.Request) { + data := &ClipboardPayload{} + if !utils.HttpJsonRequest(w, r, data) { + return + } + + err := h.desktop.ClipboardSetRichText(data.HTML) if err != nil { utils.HttpInternalServerError(w, err) return diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index de9485a0..ba617c59 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -38,8 +38,11 @@ func (h *RoomHandler) Route(r chi.Router) { }) r.With(auth.HostsOnly).Route("/clipboard", func(r chi.Router) { - r.Get("/", h.clipboardRead) - r.Post("/", h.clipboardWrite) + r.Get("/targets", h.clipboardGetTargets) + r.Get("/text", h.clipboardGetPlainText) + r.Post("/text", h.clipboardSetPlainText) + r.Get("/html", h.clipboardGetRichText) + r.Post("/html", h.clipboardSetRichText) }) r.Route("/keyboard", func(r chi.Router) { diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index 6e113bc2..8619229e 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -7,8 +7,8 @@ import ( "strings" ) -func (manager *DesktopManagerCtx) ReadClipboard() (string, error) { - cmd := exec.Command("xclip", "-selection", "clipboard", "-o") +func (manager *DesktopManagerCtx) ClipboardGetBinary(mime string) ([]byte, error) { + cmd := exec.Command("xclip", "-selection", "clipboard", "-o", "-t", mime) var stdout, stderr bytes.Buffer cmd.Stdout = &stdout @@ -17,15 +17,15 @@ func (manager *DesktopManagerCtx) ReadClipboard() (string, error) { err := cmd.Run() if err != nil { msg := strings.TrimSpace(string(stderr.Bytes())) - return "", fmt.Errorf("%s", msg) + return nil, fmt.Errorf("%s", msg) } - return string(stdout.Bytes()), nil + return stdout.Bytes(), nil } -func (manager *DesktopManagerCtx) WriteClipboard(data string) error { - cmd := exec.Command("xclip", "-selection", "clipboard", "-i") - cmd.Stdin = strings.NewReader(data) +func (manager *DesktopManagerCtx) ClipboardSetBinary(mime string, data []byte) error { + cmd := exec.Command("xclip", "-selection", "clipboard", "-i", "-t", mime) + cmd.Stdin = bytes.NewReader(data) var stderr bytes.Buffer cmd.Stderr = &stderr @@ -38,3 +38,51 @@ func (manager *DesktopManagerCtx) WriteClipboard(data string) error { return nil } + +func (manager *DesktopManagerCtx) ClipboardGetTargets() ([]string, error) { + cmd := exec.Command("xclip", "-selection", "clipboard", "-o", "-t", "TARGETS") + + var stdout, stderr bytes.Buffer + cmd.Stdout = &stdout + cmd.Stderr = &stderr + + err := cmd.Run() + if err != nil { + msg := strings.TrimSpace(string(stderr.Bytes())) + return nil, fmt.Errorf("%s", msg) + } + + var response []string + targets := strings.Split(string(stdout.Bytes()), "\n") + for _, target := range targets { + if target == "" { + continue + } + + if !strings.Contains(target, "/") { + continue + } + + response = append(response, target) + } + + return response, nil +} + +func (manager *DesktopManagerCtx) ClipboardGetPlainText() (string, error) { + bytes, err := manager.ClipboardGetBinary("STRING") + return string(bytes), err +} + +func (manager *DesktopManagerCtx) ClipboardSetPlainText(data string) error { + return manager.ClipboardSetBinary("STRING", []byte(data)) +} + +func (manager *DesktopManagerCtx) ClipboardGetRichText() (string, error) { + bytes, err := manager.ClipboardGetBinary("text/html") + return string(bytes), err +} + +func (manager *DesktopManagerCtx) ClipboardSetRichText(data string) error { + return manager.ClipboardSetBinary("text/html", []byte(data)) +} diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 6e28ea1e..61db56f5 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -67,8 +67,13 @@ type DesktopManager interface { OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) // clipboard - ReadClipboard() (string, error) - WriteClipboard(data string) error + ClipboardGetBinary(mime string) ([]byte, error) + ClipboardSetBinary(mime string, data []byte) error + ClipboardGetTargets() ([]string, error) + ClipboardGetPlainText() (string, error) + ClipboardSetPlainText(data string) error + ClipboardGetRichText() (string, error) + ClipboardSetRichText(data string) error // drop DropFiles(x int, y int, files []string) bool diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 65751d23..69e21dcf 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -16,5 +16,5 @@ func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message return nil } - return h.desktop.WriteClipboard(payload.Text) + return h.desktop.ClipboardSetPlainText(payload.Text) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index f461a13f..eb35a0a0 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -117,7 +117,7 @@ func (ws *WebSocketManagerCtx) Start() { return } - text, err := ws.desktop.ReadClipboard() + text, err := ws.desktop.ClipboardGetPlainText() if err != nil { ws.logger.Warn().Err(err).Msg("could not get clipboard content") } From 1e479dc03f4e9ed6c7ae249cad1e1ca0e623323d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 28 Jan 2021 23:59:51 +0100 Subject: [PATCH 305/876] backward compatibility. --- internal/api/room/handler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index ba617c59..309c1ab5 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -38,9 +38,9 @@ func (h *RoomHandler) Route(r chi.Router) { }) r.With(auth.HostsOnly).Route("/clipboard", func(r chi.Router) { + r.Get("/", h.clipboardGetPlainText) + r.Post("/", h.clipboardSetPlainText) r.Get("/targets", h.clipboardGetTargets) - r.Get("/text", h.clipboardGetPlainText) - r.Post("/text", h.clipboardSetPlainText) r.Get("/html", h.clipboardGetRichText) r.Post("/html", h.clipboardSetRichText) }) From 5c9a57ee91e21c37dea943072c8f6e8eb60e6a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 29 Jan 2021 00:03:22 +0100 Subject: [PATCH 306/876] xclip minor changes + image. --- internal/api/room/clipboard.go | 51 ++++++++++++++++++++++++++++++++++ internal/api/room/handler.go | 3 ++ internal/desktop/clipboard.go | 19 +++++++++---- 3 files changed, 68 insertions(+), 5 deletions(-) diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 7731e5b3..c610ef36 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -1,6 +1,8 @@ package room import ( + "bytes" + "strings" "net/http" "demodesk/neko/internal/utils" @@ -74,3 +76,52 @@ func (h *RoomHandler) clipboardSetRichText(w http.ResponseWriter, r *http.Reques utils.HttpSuccess(w) } + +func (h *RoomHandler) clipboardGetImage(w http.ResponseWriter, r *http.Request) { + bytes, err := h.desktop.ClipboardGetBinary("image/png") + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") + w.Header().Set("Content-Type", "image/png") + //nolint + w.Write(bytes) +} + +func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) { + err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) + if err != nil { + utils.HttpBadRequest(w, "Failed to parse multipart form.") + return + } + + //nolint + defer r.MultipartForm.RemoveAll() + + file, header, err := r.FormFile("file") + if err != nil { + utils.HttpBadRequest(w, "No file received.") + return + } + + defer file.Close() + + mime := header.Header.Get("Content-Type") + if !strings.HasPrefix(mime, "image/") { + utils.HttpBadRequest(w, "File must be image.") + return + } + + buffer := new(bytes.Buffer) + buffer.ReadFrom(file) + + err = h.desktop.ClipboardSetBinary("image/png", buffer.Bytes()) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + utils.HttpSuccess(w) +} diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 309c1ab5..74a44625 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -43,6 +43,9 @@ func (h *RoomHandler) Route(r chi.Router) { r.Get("/targets", h.clipboardGetTargets) r.Get("/html", h.clipboardGetRichText) r.Post("/html", h.clipboardSetRichText) + r.Get("/image", h.clipboardGetImage) + // TODO: Refactor. + //r.Post("/image", h.clipboardSetImage) }) r.Route("/keyboard", func(r chi.Router) { diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index 8619229e..2036ee5d 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -8,7 +8,7 @@ import ( ) func (manager *DesktopManagerCtx) ClipboardGetBinary(mime string) ([]byte, error) { - cmd := exec.Command("xclip", "-selection", "clipboard", "-o", "-t", mime) + cmd := exec.Command("xclip", "-selection", "clipboard", "-out", "-target", mime) var stdout, stderr bytes.Buffer cmd.Stdout = &stdout @@ -24,23 +24,32 @@ func (manager *DesktopManagerCtx) ClipboardGetBinary(mime string) ([]byte, error } func (manager *DesktopManagerCtx) ClipboardSetBinary(mime string, data []byte) error { - cmd := exec.Command("xclip", "-selection", "clipboard", "-i", "-t", mime) - cmd.Stdin = bytes.NewReader(data) + cmd := exec.Command("xclip", "-selection", "clipboard", "-in", "-target", mime) var stderr bytes.Buffer cmd.Stderr = &stderr - err := cmd.Run() + stdin, err := cmd.StdinPipe() + if err != nil { + return err + } + + err = cmd.Start() if err != nil { msg := strings.TrimSpace(string(stderr.Bytes())) return fmt.Errorf("%s", msg) } + + stdin.Write(data) + stdin.Close() + // TODO: Refactor. + // cmd.Wait() return nil } func (manager *DesktopManagerCtx) ClipboardGetTargets() ([]string, error) { - cmd := exec.Command("xclip", "-selection", "clipboard", "-o", "-t", "TARGETS") + cmd := exec.Command("xclip", "-selection", "clipboard", "-out", "-target", "TARGETS") var stdout, stderr bytes.Buffer cmd.Stdout = &stdout From 546cd608c3ddc7c3d79318a19d8c0aebef9ba5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 29 Jan 2021 20:05:13 +0100 Subject: [PATCH 307/876] join plain text and rich text to one struct. --- internal/api/room/clipboard.go | 39 +++++--------------- internal/api/room/handler.go | 18 ++++++---- internal/desktop/clipboard.go | 47 +++++++++++++++---------- internal/types/desktop.go | 11 +++--- internal/websocket/handler/clipboard.go | 5 ++- internal/websocket/manager.go | 5 +-- 6 files changed, 63 insertions(+), 62 deletions(-) diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index c610ef36..88514484 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -6,6 +6,7 @@ import ( "net/http" "demodesk/neko/internal/utils" + "demodesk/neko/internal/types" ) type ClipboardPayload struct { @@ -23,52 +24,30 @@ func (h *RoomHandler) clipboardGetTargets(w http.ResponseWriter, r *http.Request utils.HttpSuccess(w, targets) } -func (h *RoomHandler) clipboardGetPlainText(w http.ResponseWriter, r *http.Request) { - text, err := h.desktop.ClipboardGetPlainText() +func (h *RoomHandler) clipboardGetText(w http.ResponseWriter, r *http.Request) { + data, err := h.desktop.ClipboardGetText() if err != nil { utils.HttpInternalServerError(w, err) return } utils.HttpSuccess(w, ClipboardPayload{ - Text: text, + Text: data.Text, + HTML: data.HTML, }) } -func (h *RoomHandler) clipboardSetPlainText(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) clipboardSetText(w http.ResponseWriter, r *http.Request) { data := &ClipboardPayload{} if !utils.HttpJsonRequest(w, r, data) { return } - err := h.desktop.ClipboardSetPlainText(data.Text) - if err != nil { - utils.HttpInternalServerError(w, err) - return - } - - utils.HttpSuccess(w) -} - -func (h *RoomHandler) clipboardGetRichText(w http.ResponseWriter, r *http.Request) { - html, err := h.desktop.ClipboardGetRichText() - if err != nil { - utils.HttpInternalServerError(w, err) - return - } - - utils.HttpSuccess(w, ClipboardPayload{ - HTML: html, + err := h.desktop.ClipboardSetText(types.ClipboardText{ + Text: data.Text, + HTML: data.HTML, }) -} -func (h *RoomHandler) clipboardSetRichText(w http.ResponseWriter, r *http.Request) { - data := &ClipboardPayload{} - if !utils.HttpJsonRequest(w, r, data) { - return - } - - err := h.desktop.ClipboardSetRichText(data.HTML) if err != nil { utils.HttpInternalServerError(w, err) return diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 74a44625..1045cd96 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -38,14 +38,18 @@ func (h *RoomHandler) Route(r chi.Router) { }) r.With(auth.HostsOnly).Route("/clipboard", func(r chi.Router) { - r.Get("/", h.clipboardGetPlainText) - r.Post("/", h.clipboardSetPlainText) - r.Get("/targets", h.clipboardGetTargets) - r.Get("/html", h.clipboardGetRichText) - r.Post("/html", h.clipboardSetRichText) - r.Get("/image", h.clipboardGetImage) - // TODO: Refactor. + r.Get("/", h.clipboardGetText) + r.Post("/", h.clipboardSetText) + r.Get("/image.png", h.clipboardGetImage) + + // TODO: Refactor. xclip is failing to set propper target type + // and this content is sent back to client as text in another + // clipboard update. Therefore endpoint is not usable! //r.Post("/image", h.clipboardSetImage) + + // TODO: Refactor. If there would be implemented custom target + // retrieval, this endpoint would be useful. + //r.Get("/targets", h.clipboardGetTargets) }) r.Route("/keyboard", func(r chi.Router) { diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index 2036ee5d..f6d94fb5 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -5,8 +5,37 @@ import ( "bytes" "os/exec" "strings" + + "demodesk/neko/internal/types" ) +func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) { + text, err := manager.ClipboardGetBinary("STRING") + if err != nil { + return nil, err + } + + // Rich text must not always be available, can fail silently. + html, _ := manager.ClipboardGetBinary("text/html") + + return &types.ClipboardText{ + Text: string(text), + HTML: string(html), + }, nil +} + +func (manager *DesktopManagerCtx) ClipboardSetText(data types.ClipboardText) error { + // TODO: Refactor. + // Current implementation is unable to set multiple targets. HTML + // is set, if available. Otherwise plain text. + + if data.HTML != "" { + return manager.ClipboardSetBinary("text/html", []byte(data.HTML)) + } + + return manager.ClipboardSetBinary("STRING", []byte(data.Text)) +} + func (manager *DesktopManagerCtx) ClipboardGetBinary(mime string) ([]byte, error) { cmd := exec.Command("xclip", "-selection", "clipboard", "-out", "-target", mime) @@ -77,21 +106,3 @@ func (manager *DesktopManagerCtx) ClipboardGetTargets() ([]string, error) { return response, nil } - -func (manager *DesktopManagerCtx) ClipboardGetPlainText() (string, error) { - bytes, err := manager.ClipboardGetBinary("STRING") - return string(bytes), err -} - -func (manager *DesktopManagerCtx) ClipboardSetPlainText(data string) error { - return manager.ClipboardSetBinary("STRING", []byte(data)) -} - -func (manager *DesktopManagerCtx) ClipboardGetRichText() (string, error) { - bytes, err := manager.ClipboardGetBinary("text/html") - return string(bytes), err -} - -func (manager *DesktopManagerCtx) ClipboardSetRichText(data string) error { - return manager.ClipboardSetBinary("text/html", []byte(data)) -} diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 61db56f5..1501fc40 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -35,6 +35,11 @@ type KeyboardMap struct { Variant string } +type ClipboardText struct { + Text string + HTML string +} + type DesktopManager interface { Start() Shutdown() error @@ -67,13 +72,11 @@ type DesktopManager interface { OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) // clipboard + ClipboardGetText() (*ClipboardText, error) + ClipboardSetText(data ClipboardText) error ClipboardGetBinary(mime string) ([]byte, error) ClipboardSetBinary(mime string, data []byte) error ClipboardGetTargets() ([]string, error) - ClipboardGetPlainText() (string, error) - ClipboardSetPlainText(data string) error - ClipboardGetRichText() (string, error) - ClipboardSetRichText(data string) error // drop DropFiles(x int, y int, files []string) bool diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 69e21dcf..50ae6cfa 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -16,5 +16,8 @@ func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message return nil } - return h.desktop.ClipboardSetPlainText(payload.Text) + return h.desktop.ClipboardSetText(types.ClipboardText{ + Text: payload.Text, + // TODO: Send HTML? + }) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index eb35a0a0..9b218ab3 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -117,14 +117,15 @@ func (ws *WebSocketManagerCtx) Start() { return } - text, err := ws.desktop.ClipboardGetPlainText() + data, err := ws.desktop.ClipboardGetText() if err != nil { ws.logger.Warn().Err(err).Msg("could not get clipboard content") } if err := session.Send(message.ClipboardData{ Event: event.CLIPBOARD_UPDATED, - Text: text, + Text: data.Text, + // TODO: Send HTML? }); err != nil { ws.logger.Warn().Err(err).Msg("could not sync clipboard") } From 6d59b3feffd33c3f207006b5144547dab0dbaf23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 29 Jan 2021 22:22:14 +0100 Subject: [PATCH 308/876] session handler with cookies. --- internal/api/router.go | 29 +++++++------ internal/api/session.go | 80 +++++++++++++++++++++++++++++++++++ internal/session/auth.go | 16 ++++++- internal/types/session.go | 3 +- internal/websocket/manager.go | 2 +- 5 files changed, 113 insertions(+), 17 deletions(-) create mode 100644 internal/api/session.go diff --git a/internal/api/router.go b/internal/api/router.go index 04c3993a..33bdb1d6 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -36,27 +36,30 @@ func New( } func (api *ApiManagerCtx) Route(r chi.Router) { - r.Use(api.Authenticate) + r.Post("/login", api.Login) - membersHandler := members.New(api.sessions) - r.Route("/members", membersHandler.Route) + // Authenticated area + r.Group(func(r chi.Router) { + r.Use(api.Authenticate) - roomHandler := room.New(api.sessions, api.desktop, api.capture) - r.Route("/room", roomHandler.Route) + r.Post("/logout", api.Logout) + r.Get("/whoami", api.Whoami) - r.Get("/test", func(w http.ResponseWriter, r *http.Request) { - session := auth.GetSession(r) - utils.HttpBadRequest(w, "Hi `" + session.ID() + "`, you are authenticated.") + membersHandler := members.New(api.sessions) + r.Route("/members", membersHandler.Route) + + roomHandler := room.New(api.sessions, api.desktop, api.capture) + r.Route("/room", roomHandler.Route) + + for path, router := range api.routers { + r.Route(path, router) + } }) - - for path, router := range api.routers { - r.Route(path, router) - } } func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - session, err := api.sessions.Authenticate(r) + session, err := api.sessions.AuthenticateRequest(r) if err != nil { utils.HttpUnauthorized(w, err) } else { diff --git a/internal/api/session.go b/internal/api/session.go new file mode 100644 index 00000000..fbc763cf --- /dev/null +++ b/internal/api/session.go @@ -0,0 +1,80 @@ +package api + +import ( + "time" + "net/http" + + "demodesk/neko/internal/utils" + "demodesk/neko/internal/types" + "demodesk/neko/internal/http/auth" +) + +type SessionLoginPayload struct { + ID string `json:"id"` + Secret string `json:"secret"` +} + +type SessionWhoamiPayload struct { + ID string `json:"id"` + Profile types.MemberProfile `json:"profile"` + State types.MemberState `json:"state"` +} + +func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { + data := &SessionLoginPayload{} + if !utils.HttpJsonRequest(w, r, data) { + return + } + + session, err := api.sessions.Authenticate(data.ID, data.Secret) + if err != nil { + utils.HttpUnauthorized(w, err) + return + } + + http.SetCookie(w, &http.Cookie{ + Name: "neko-id", + Value: session.ID(), + Expires: time.Now().Add(365 * 24 * time.Hour), + HttpOnly: false, + }) + + http.SetCookie(w, &http.Cookie{ + Name: "neko-secret", + Value: data.Secret, + Expires: time.Now().Add(365 * 24 * time.Hour), + HttpOnly: true, + }) + + utils.HttpSuccess(w) +} + +func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { + http.SetCookie(w, &http.Cookie{ + Name: "neko-id", + Value: "", + Path: "/", + Expires: time.Unix(0, 0), + HttpOnly: false, + }) + + http.SetCookie(w, &http.Cookie{ + Name: "neko-secret", + Value: "", + Path: "/", + Expires: time.Unix(0, 0), + HttpOnly: true, + }) + + utils.HttpSuccess(w) +} + +func (api *ApiManagerCtx) Whoami(w http.ResponseWriter, r *http.Request) { + session := auth.GetSession(r) + + utils.HttpSuccess(w, SessionWhoamiPayload{ + ID: session.ID(), + Profile: session.GetProfile(), + State: session.GetState(), + }) +} diff --git a/internal/session/auth.go b/internal/session/auth.go index 2554b178..2c9be576 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -7,12 +7,16 @@ import ( "demodesk/neko/internal/types" ) -func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, error) { +func (manager *SessionManagerCtx) AuthenticateRequest(r *http.Request) (types.Session, error) { id, secret, ok := getAuthData(r) if !ok { return nil, fmt.Errorf("no authentication provided") } + return manager.Authenticate(id, secret) +} + +func (manager *SessionManagerCtx) Authenticate(id string, secret string) (types.Session, error) { session, ok := manager.Get(id) if !ok { return nil, fmt.Errorf("member not found") @@ -30,14 +34,22 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, } func getAuthData(r *http.Request) (string, string, bool) { + // get from Cookies + cid, err1 := r.Cookie("neko-id") + csecret, err2 := r.Cookie("neko-secret") + if err1 == nil && err2 == nil { + return cid.Value, csecret.Value, true + } + + // get from BasicAuth id, secret, ok := r.BasicAuth() if ok { return id, secret, true } + // get from QueryParams id = r.URL.Query().Get("id") secret = r.URL.Query().Get("secret") - if id != "" && secret != "" { return id, secret, true } diff --git a/internal/types/session.go b/internal/types/session.go index 341f31cc..ae6494b9 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -89,5 +89,6 @@ type SessionManager interface { ImplicitHosting() bool - Authenticate(r *http.Request) (Session, error) + AuthenticateRequest(r *http.Request) (Session, error) + Authenticate(id string, secret string) (Session, error) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 9b218ab3..c764f73b 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -155,7 +155,7 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, c return err } - session, err := ws.sessions.Authenticate(r) + session, err := ws.sessions.AuthenticateRequest(r) if err != nil { ws.logger.Warn().Err(err).Msg("authentication failed") From 57ed35552f5fba565faf24717221545e8b9b4b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 29 Jan 2021 23:02:29 +0100 Subject: [PATCH 309/876] websocket in api scope. --- internal/http/manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/http/manager.go b/internal/http/manager.go index 3883507a..da8b3cff 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -43,7 +43,7 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c router.Route("/api", ApiManager.Route) - router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { + router.Get("/api/ws", func(w http.ResponseWriter, r *http.Request) { //nolint WebSocketManager.Upgrade(w, r, func(r *http.Request) bool { return conf.AllowOrigin(r.Header.Get("Origin")) From dabda571d4849e9591a2a7b825ff37f7f3651725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 29 Jan 2021 23:03:35 +0100 Subject: [PATCH 310/876] session response 200 on login & logout. --- internal/api/session.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/api/session.go b/internal/api/session.go index fbc763cf..05de79bb 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -46,7 +46,11 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { HttpOnly: true, }) - utils.HttpSuccess(w) + utils.HttpSuccess(w, SessionWhoamiPayload{ + ID: session.ID(), + Profile: session.GetProfile(), + State: session.GetState(), + }) } func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { @@ -66,7 +70,7 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { HttpOnly: true, }) - utils.HttpSuccess(w) + utils.HttpSuccess(w, true) } func (api *ApiManagerCtx) Whoami(w http.ResponseWriter, r *http.Request) { From 28f3397723d8a777aff3eb7189c7662c18d27e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 29 Jan 2021 23:07:43 +0100 Subject: [PATCH 311/876] logout correct cookie path. --- internal/api/session.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/api/session.go b/internal/api/session.go index 05de79bb..72821431 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -57,7 +57,6 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { http.SetCookie(w, &http.Cookie{ Name: "neko-id", Value: "", - Path: "/", Expires: time.Unix(0, 0), HttpOnly: false, }) @@ -65,7 +64,6 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { http.SetCookie(w, &http.Cookie{ Name: "neko-secret", Value: "", - Path: "/", Expires: time.Unix(0, 0), HttpOnly: true, }) From 371cfa496cdf4fd9b4da0a52bef8786252fbac18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 30 Jan 2021 23:55:50 +0100 Subject: [PATCH 312/876] modules decouple and conditional build. --- Dockerfile | 2 +- neko.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 95081e30..12471e57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN set -eux; \ # # build server COPY . . -RUN go get -v -t -d . && go build -o bin/neko -i cmd/neko/main.go +RUN go get -v -t -d . && go build -tags browser -o bin/neko -i cmd/neko/main.go # # Stage 2: Runtime. diff --git a/neko.go b/neko.go index 12815f47..c5857d20 100644 --- a/neko.go +++ b/neko.go @@ -27,7 +27,7 @@ const Header = `&34 / |/ / _ \/ //_/ __ \ ) ( ') / /| / __/ ,< / /_/ / ( / ) /_/ |_/\___/_/|_|\____/ \(__)| -&1&37 nurdism/neko &33%s v%s&0 +&1&37 nurdism/m1k1o &33%s v%s&0 ` var ( From 5134ff5c7ed74e33f08e9eeec12eae63271176cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 31 Jan 2021 00:01:43 +0100 Subject: [PATCH 313/876] docker build args. --- Dockerfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 12471e57..43a53213 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,10 +17,22 @@ RUN set -eux; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* +ARG GIT_COMMIT=dev +ARG GIT_BRANCH=dev + # # build server COPY . . -RUN go get -v -t -d . && go build -tags browser -o bin/neko -i cmd/neko/main.go +RUN go get -v -t -d . && go build \ + -tags browser \ + -o bin/neko \ + -ldflags " \ + -s -w \ + -X 'demodesk/neko.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`' \ + -X 'demodesk/neko.gitCommit=${GIT_COMMIT}' \ + -X 'demodesk/neko.gitBranch=${GIT_BRANCH}' \ + " \ + -i cmd/neko/main.go; # # Stage 2: Runtime. From 52670b94156be6910feefe5365649d81df151bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 31 Jan 2021 12:58:15 +0100 Subject: [PATCH 314/876] modules share internal config type. --- cmd/serve.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/serve.go b/cmd/serve.go index 225d9c77..91e69d54 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -23,7 +23,7 @@ func init() { neko.Service.Configs.WebRTC, neko.Service.Configs.Session, neko.Service.Configs.Server, - }, modules.ConfigsList()...) + }, modules.Configs()...) cobra.OnInitialize(func() { for _, cfg := range configs { From b9df65c216c412a2a81a0eb39c2069abbbe90234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 31 Jan 2021 15:01:46 +0100 Subject: [PATCH 315/876] xevent dialog window based on name. --- internal/desktop/xevent/xevent.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go index 6f1d53f5..a5b34404 100644 --- a/internal/desktop/xevent/xevent.go +++ b/internal/desktop/xevent/xevent.go @@ -10,6 +10,7 @@ import "C" import ( "time" "unsafe" + "strings" "github.com/kataras/go-events" ) @@ -69,9 +70,14 @@ func goXEventClipboardUpdated() { } //export goXEventConfigureNotify -func goXEventConfigureNotify(display *C.Display, window C.Window, nameUnsafe *C.char, roleUnsafe *C.char) { - role := C.GoString(roleUnsafe) - if role != "GtkFileChooserDialog" { +func goXEventConfigureNotify(display *C.Display, window C.Window, name *C.char, role *C.char) { + if C.GoString(role) != "GtkFileChooserDialog" { + return + } + + // TODO: Refactor. Right now processing of this dialog relies on identifying + // via its name. When that changes to role, this condition should be removed. + if !strings.HasPrefix(C.GoString(name), "Open File") { return } From b420841f9d0f4406f6e0a775896f67118243a903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Feb 2021 12:23:37 +0100 Subject: [PATCH 316/876] no clipboard content bug. --- internal/websocket/manager.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index c764f73b..a90c7720 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -120,6 +120,7 @@ func (ws *WebSocketManagerCtx) Start() { data, err := ws.desktop.ClipboardGetText() if err != nil { ws.logger.Warn().Err(err).Msg("could not get clipboard content") + return } if err := session.Send(message.ClipboardData{ From 7c305b5a27bad3b6c48a7ced1d1ffe1eeca05101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Feb 2021 18:29:39 +0100 Subject: [PATCH 317/876] clipboard lint fix. --- internal/api/room/clipboard.go | 33 ++++++++++++++++++++------------- internal/desktop/clipboard.go | 16 ++++++++++------ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 88514484..3bd19341 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -1,8 +1,9 @@ package room import ( - "bytes" - "strings" + // TODO: Unused now. + //"bytes" + //"strings" "net/http" "demodesk/neko/internal/utils" @@ -14,16 +15,6 @@ type ClipboardPayload struct { HTML string `json:"html,omitempty"` } -func (h *RoomHandler) clipboardGetTargets(w http.ResponseWriter, r *http.Request) { - targets, err := h.desktop.ClipboardGetTargets() - if err != nil { - utils.HttpInternalServerError(w, err) - return - } - - utils.HttpSuccess(w, targets) -} - func (h *RoomHandler) clipboardGetText(w http.ResponseWriter, r *http.Request) { data, err := h.desktop.ClipboardGetText() if err != nil { @@ -69,6 +60,7 @@ func (h *RoomHandler) clipboardGetImage(w http.ResponseWriter, r *http.Request) w.Write(bytes) } +/* TODO: Unused now. func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) { err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) if err != nil { @@ -94,7 +86,11 @@ func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) } buffer := new(bytes.Buffer) - buffer.ReadFrom(file) + _, err = buffer.ReadFrom(file) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } err = h.desktop.ClipboardSetBinary("image/png", buffer.Bytes()) if err != nil { @@ -104,3 +100,14 @@ func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) utils.HttpSuccess(w) } + +func (h *RoomHandler) clipboardGetTargets(w http.ResponseWriter, r *http.Request) { + targets, err := h.desktop.ClipboardGetTargets() + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + utils.HttpSuccess(w, targets) +} +*/ diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index f6d94fb5..f60a3c1f 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -45,7 +45,7 @@ func (manager *DesktopManagerCtx) ClipboardGetBinary(mime string) ([]byte, error err := cmd.Run() if err != nil { - msg := strings.TrimSpace(string(stderr.Bytes())) + msg := strings.TrimSpace(stderr.String()) return nil, fmt.Errorf("%s", msg) } @@ -65,11 +65,15 @@ func (manager *DesktopManagerCtx) ClipboardSetBinary(mime string, data []byte) e err = cmd.Start() if err != nil { - msg := strings.TrimSpace(string(stderr.Bytes())) + msg := strings.TrimSpace(stderr.String()) return fmt.Errorf("%s", msg) } - - stdin.Write(data) + + _, err = stdin.Write(data) + if err != nil { + return err + } + stdin.Close() // TODO: Refactor. @@ -86,12 +90,12 @@ func (manager *DesktopManagerCtx) ClipboardGetTargets() ([]string, error) { err := cmd.Run() if err != nil { - msg := strings.TrimSpace(string(stderr.Bytes())) + msg := strings.TrimSpace(stderr.String()) return nil, fmt.Errorf("%s", msg) } var response []string - targets := strings.Split(string(stdout.Bytes()), "\n") + targets := strings.Split(stdout.String(), "\n") for _, target := range targets { if target == "" { continue From 9f416b6de1189f26a01ae1856e156976260b470c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Feb 2021 22:44:55 +0100 Subject: [PATCH 318/876] install pion v3. --- go.mod | 13 +--- go.sum | 199 +++++---------------------------------------------------- 2 files changed, 18 insertions(+), 194 deletions(-) diff --git a/go.mod b/go.mod index 7ed5a5c9..fd15c573 100644 --- a/go.mod +++ b/go.mod @@ -5,24 +5,14 @@ go 1.13 require ( github.com/go-chi/chi v4.1.2+incompatible github.com/go-chi/cors v1.1.1 - github.com/golang/protobuf v1.4.3 // indirect github.com/google/uuid v1.2.0 // indirect github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 - github.com/lucas-clemente/quic-go v0.19.3 // indirect github.com/magiconair/properties v1.8.4 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/pelletier/go-toml v1.8.1 // indirect - github.com/pion/dtls/v2 v2.0.4 // indirect github.com/pion/logging v0.2.2 - github.com/pion/quic v0.1.4 // indirect - github.com/pion/rtcp v1.2.6 // indirect - github.com/pion/rtp v1.6.2 // indirect - github.com/pion/sctp v1.7.11 // indirect - github.com/pion/srtp v1.5.2 // indirect - github.com/pion/transport v0.12.2 // indirect - github.com/pion/turn/v2 v2.0.5 // indirect - github.com/pion/webrtc/v2 v2.2.26 + github.com/pion/webrtc/v3 v3.0.4 github.com/rs/zerolog v1.20.0 github.com/spf13/afero v1.5.1 // indirect github.com/spf13/cast v1.3.1 // indirect @@ -33,7 +23,6 @@ require ( golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect golang.org/x/sys v0.0.0-20210123111255-9b0068b26619 // indirect golang.org/x/text v0.3.5 // indirect - google.golang.org/protobuf v1.25.0 // indirect gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 31d2060f..9847a44b 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= @@ -12,19 +10,13 @@ cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= -dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= -dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= -git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -33,17 +25,11 @@ github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= -github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= -github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -53,24 +39,16 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= -github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec= github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-chi/cors v1.1.1 h1:eHuqxsIw89iXcWnWUN8R72JMibABJTN/4IOYI5WERvw= github.com/go-chi/cors v1.1.1/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -80,17 +58,10 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0 h1:Rd1kQnQu0Hq3qvJppYSG0HtP+f5LPPUiDswTLiEegLg= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -100,40 +71,28 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= -github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= @@ -160,7 +119,6 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -177,34 +135,16 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9 h1:tbuodUh2vuhOVZAdW3NEUvosFHUMJwUNl7jk/VSEiwc= -github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9/go.mod h1:PpMmPfPKO9nKJ/psF49ESTAGQSdfXxlg1otPbEB2nOw= -github.com/lucas-clemente/quic-go v0.18.0/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg= -github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4= -github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8= -github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/marten-seemann/qpack v0.2.0/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= -github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= -github.com/marten-seemann/qtls v0.2.3 h1:0yWJ43C62LsZt08vuQJDK1uC1czUc3FJeCLPoNAI4vA= -github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= -github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc= -github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs= -github.com/marten-seemann/qtls-go1-15 v0.1.0/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= -github.com/marten-seemann/qtls-go1-15 v0.1.1 h1:LIH6K34bPVttyXnUWixk0bzH6/N07VxbSabxn5A5gZQ= -github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -220,23 +160,16 @@ github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= -github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -244,56 +177,45 @@ github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNC github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0= github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= -github.com/pion/dtls/v2 v2.0.1/go.mod h1:uMQkz2W0cSqY00xav7WByQ4Hb+18xeQh2oH2fRezr5U= -github.com/pion/dtls/v2 v2.0.2/go.mod h1:27PEO3MDdaCfo21heT59/vsdmZc0zMt9wQPcSlLu/1I= github.com/pion/dtls/v2 v2.0.4 h1:WuUcqi6oYMu/noNTz92QrF1DaFj4eXbhQ6dzaaAwOiI= github.com/pion/dtls/v2 v2.0.4/go.mod h1:qAkFscX0ZHoI1E07RfYPoRw3manThveu+mlTDdOxoGI= -github.com/pion/ice v0.7.18 h1:KbAWlzWRUdX9SmehBh3gYpIFsirjhSQsCw6K2MjYMK0= -github.com/pion/ice v0.7.18/go.mod h1:+Bvnm3nYC6Nnp7VV6glUkuOfToB/AtMRZpOU8ihuf4c= +github.com/pion/ice/v2 v2.0.14 h1:FxXxauyykf89SWAtkQCfnHkno6G8+bhRkNguSh9zU+4= +github.com/pion/ice/v2 v2.0.14/go.mod h1:wqaUbOq5ObDNU5ox1hRsEst0rWfsKuH1zXjQFEWiZwM= +github.com/pion/interceptor v0.0.9 h1:fk5hTdyLO3KURQsf/+RjMpEm4NE3yeTY9Kh97b5BvwA= +github.com/pion/interceptor v0.0.9/go.mod h1:dHgEP5dtxOTf21MObuBAjJeAayPxLUAZjerGH8Xr07c= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY= github.com/pion/mdns v0.0.4/go.mod h1:R1sL0p50l42S5lJs91oNdUL58nm0QHrhxnSegr++qC0= -github.com/pion/quic v0.1.1 h1:D951FV+TOqI9A0rTF7tHx0Loooqz+nyzjEyj8o3PuMA= -github.com/pion/quic v0.1.1/go.mod h1:zEU51v7ru8Mp4AUBJvj6psrSth5eEFNnVQK5K48oV3k= -github.com/pion/quic v0.1.4 h1:bNz9sCJjlM3GqMdq7Fne57FiWfdyiJ++yHVbuqeoD3Y= -github.com/pion/quic v0.1.4/go.mod h1:dBhNvkLoQqRwfi6h3Vqj3IcPLgiW7rkZxBbRdp7Vzvk= -github.com/pion/randutil v0.0.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.3/go.mod h1:zGhIv0RPRF0Z1Wiij22pUt5W/c9fevqSzT4jje/oK7I= -github.com/pion/rtcp v1.2.4/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo= github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= -github.com/pion/rtp v1.6.0/go.mod h1:QgfogHsMBVE/RFNno467U/KBqfUywEH+HK+0rtnwsdI= -github.com/pion/rtp v1.6.1/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/rtp v1.6.2 h1:iGBerLX6JiDjB9NXuaPzHyxHFG9JsIEdgwTC0lp5n/U= github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= github.com/pion/sctp v1.7.11 h1:UCnj7MsobLKLuP/Hh+JMiI/6W5Bs/VF45lWKgHFjSIE= github.com/pion/sctp v1.7.11/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= -github.com/pion/sdp/v2 v2.4.0 h1:luUtaETR5x2KNNpvEMv/r4Y+/kzImzbz4Lm1z8eQNQI= -github.com/pion/sdp/v2 v2.4.0/go.mod h1:L2LxrOpSTJbAns244vfPChbciR/ReU1KWfG04OpkR7E= -github.com/pion/srtp v1.5.1/go.mod h1:B+QgX5xPeQTNc1CJStJPHzOlHK66ViMDWTT0HZTCkcA= -github.com/pion/srtp v1.5.2 h1:25DmvH+fqKZDqvX64vTwnycVwL9ooJxHF/gkX16bDBY= -github.com/pion/srtp v1.5.2/go.mod h1:NiBff/MSxUwMUwx/fRNyD/xGE+dVvf8BOCeXhjCXZ9U= +github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8= +github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= +github.com/pion/srtp/v2 v2.0.1 h1:kgfh65ob3EcnFYA4kUBvU/menCp9u7qaJLXwWgpobzs= +github.com/pion/srtp/v2 v2.0.1/go.mod h1:c8NWHhhkFf/drmHTAblkdu8++lsISEBBdAuiyxgqIsE= github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= -github.com/pion/transport v0.6.0/go.mod h1:iWZ07doqOosSLMhZ+FXUTq+TamDoXSllxpbGcfkCmbE= github.com/pion/transport v0.8.10 h1:lTiobMEw2PG6BH/mgIVqTV2mBp/mPT+IJLaN8ZxgdHk= github.com/pion/transport v0.8.10/go.mod h1:tBmha/UCjpum5hqTWhfAEs3CO4/tHSg0MYRhSzR+CZ8= github.com/pion/transport v0.10.0 h1:9M12BSneJm6ggGhJyWpDveFOstJsTiQjkLf4M44rm80= github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE= github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A= +github.com/pion/transport v0.12.0/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/transport v0.12.2 h1:WYEjhloRHt1R86LhUKjC5y+P52Y11/QqEUalvtzVoys= github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= -github.com/pion/turn/v2 v2.0.4/go.mod h1:1812p4DcGVbYVBTiraUmP50XoKye++AMkbfp+N27mog= github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= github.com/pion/udp v0.1.0 h1:uGxQsNyrqG3GLINv36Ff60covYmfrLoxzwnCsIYspXI= github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths= -github.com/pion/webrtc/v2 v2.2.26 h1:01hWE26pL3LgqfxvQ1fr6O4ZtyRFFJmQEZK39pHWfFc= -github.com/pion/webrtc/v2 v2.2.26/go.mod h1:XMZbZRNHyPDe1gzTIHFcQu02283YO45CbiwFgKvXnmc= +github.com/pion/webrtc/v3 v3.0.4 h1:Tiw3H9fpfcwkvaxonB+Gv1DG9tmgYBQaM1vBagDHP40= +github.com/pion/webrtc/v3 v3.0.4/go.mod h1:1TmFSLpPYFTFXFHPtoq9eGP1ASTa9LC6FBh7sUY8cd4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -303,19 +225,15 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3 h1:9iH4JKXLzFbOAdtqv/a+j8aewx2Y8lAjAydhbaScPF8= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0 h1:7etb9YClo3a6HjLzfl6rIQaU+FDfi0VSX39io3aQ+DM= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084 h1:sofwID9zm4tzrgykg80hfFph1mryUeLRsUfoocVVmRY= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -325,43 +243,17 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= -github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= -github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= -github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= -github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= -github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI= -github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU= -github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag= -github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg= -github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw= -github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= -github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= -github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= -github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= -github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0= -github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= -github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk= -github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= -github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= -github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= @@ -394,36 +286,25 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= -github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= -golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= @@ -434,7 +315,6 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm0 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -450,15 +330,12 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -467,37 +344,29 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -507,17 +376,14 @@ golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210123111255-9b0068b26619 h1:yLLDsUUPDliIQpKl7BjVb1igwngIMH2GBjo1VpwLTE0= golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -526,13 +392,10 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -541,7 +404,6 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -555,25 +417,16 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IV golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= -google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -582,26 +435,16 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -610,7 +453,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= @@ -630,15 +472,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= -sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= From 4e79c487e53b41757f617492fd67e70d2e5f5679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Feb 2021 22:45:44 +0100 Subject: [PATCH 319/876] bump pion v3 compatible. --- internal/webrtc/handle.go | 2 +- internal/webrtc/peer.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/webrtc/handle.go b/internal/webrtc/handle.go index 8ccb05b1..50d0be71 100644 --- a/internal/webrtc/handle.go +++ b/internal/webrtc/handle.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "strconv" - "github.com/pion/webrtc/v2" + "github.com/pion/webrtc/v3" ) const ( diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index da69e441..bd211ffd 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -1,7 +1,7 @@ package webrtc import ( - "github.com/pion/webrtc/v2" + "github.com/pion/webrtc/v3" ) type WebRTCPeerCtx struct { From 6d595e8572663f70c855810af468429d0b77de70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Feb 2021 23:50:18 +0100 Subject: [PATCH 320/876] refactor to v3 + custom codec handler. --- internal/capture/gst/gst.go | 48 +++++--------- internal/capture/manager.go | 9 +-- internal/config/capture.go | 31 +++++---- internal/config/webrtc.go | 1 + internal/types/capture.go | 15 +++-- internal/types/codec/codecs.go | 113 +++++++++++++++++++++++++++++++++ internal/webrtc/manager.go | 87 ++++++++++++------------- 7 files changed, 203 insertions(+), 101 deletions(-) create mode 100644 internal/types/codec/codecs.go diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index d41608a4..9527c257 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -8,19 +8,18 @@ package gst import "C" import ( "fmt" + "time" "sync" "unsafe" - "github.com/pion/webrtc/v2" - "demodesk/neko/internal/types" + "demodesk/neko/internal/types/codec" ) // Pipeline is a wrapper for a GStreamer Pipeline type Pipeline struct { Pipeline *C.GstElement Sample chan types.Sample - ClockRate float32 Src string id int } @@ -30,9 +29,6 @@ var pipelinesLock sync.Mutex var registry *C.GstRegistry const ( - videoClockRate = 90000 - audioClockRate = 48000 - pcmClockRate = 8000 videoSrc = "ximagesrc display-name=%s show-pointer=false use-damage=false ! video/x-raw ! videoconvert ! queue ! " audioSrc = "pulsesrc device=%s ! audio/x-raw,channels=2 ! audioconvert ! " appSink = " ! appsink name=appsink" @@ -55,7 +51,7 @@ func CreateRTMPPipeline(pipelineDevice string, pipelineDisplay string, pipelineS pipelineStr = fmt.Sprintf("flvmux name=mux ! rtmpsink location='%s live=1' %s audio/x-raw,channels=2 ! audioconvert ! voaacenc ! mux. %s x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! mux.", pipelineRTMP, audio, video) } - return CreatePipeline(pipelineStr, 0) + return CreatePipeline(pipelineStr) } // CreateJPEGPipeline creates a GStreamer Pipeline @@ -67,16 +63,15 @@ func CreateJPEGPipeline(pipelineDisplay string, pipelineSrc string, rate string, pipelineStr = fmt.Sprintf("ximagesrc display-name=%s show-pointer=true use-damage=false ! videoconvert ! videoscale ! videorate ! video/x-raw,framerate=%s ! jpegenc quality=%s" + appSink, pipelineDisplay, rate, quality) } - return CreatePipeline(pipelineStr, 0) + return CreatePipeline(pipelineStr) } // CreateAppPipeline creates a GStreamer Pipeline -func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc string) (*Pipeline, error) { - var clockRate float32 +func CreateAppPipeline(codecRTP codec.RTP, pipelineDevice string, pipelineSrc string) (*Pipeline, error) { var pipelineStr string - switch codecName { - case webrtc.VP8: + switch codecRTP.Name { + case codec.VP8: // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html?gi-language=c // gstreamer1.0-plugins-good // vp8enc error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true cpu-used=5 deadline=1 @@ -84,9 +79,8 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri return nil, err } - clockRate = videoClockRate pipelineStr = fmt.Sprintf(videoSrc + "vp8enc cpu-used=8 threads=2 deadline=1 error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true" + appSink, pipelineDevice) - case webrtc.VP9: + case codec.VP9: // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html?gi-language=c // gstreamer1.0-plugins-good // vp9enc @@ -94,9 +88,8 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri return nil, err } - clockRate = videoClockRate pipelineStr = fmt.Sprintf(videoSrc + "vp9enc" + appSink, pipelineDevice) - case webrtc.H264: + case codec.H264: if err := CheckPlugins([]string{"ximagesrc"}); err != nil { return nil, err } @@ -106,7 +99,6 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri // gstreamer1.0-plugins-bad // openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 if err = CheckPlugins([]string{"openh264"}); err == nil { - clockRate = videoClockRate pipelineStr = fmt.Sprintf(videoSrc + "openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream" + appSink, pipelineDevice) break } @@ -115,13 +107,12 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri // gstreamer1.0-plugins-ugly // video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream if err = CheckPlugins([]string{"x264"}); err == nil { - clockRate = videoClockRate pipelineStr = fmt.Sprintf(videoSrc + "video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream" + appSink, pipelineDevice) break } return nil, err - case webrtc.Opus: + case codec.Opus: // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html // gstreamer1.0-plugins-base // opusenc @@ -129,9 +120,8 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri return nil, err } - clockRate = audioClockRate pipelineStr = fmt.Sprintf(audioSrc + "opusenc" + appSink, pipelineDevice) - case webrtc.G722: + case codec.G722: // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html?gi-language=c // gstreamer1.0-libav // avenc_g722 @@ -139,9 +129,8 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri return nil, err } - clockRate = audioClockRate pipelineStr = fmt.Sprintf(audioSrc + "avenc_g722" + appSink, pipelineDevice) - case webrtc.PCMU: + case codec.PCMU: // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html?gi-language=c // gstreamer1.0-plugins-good // audio/x-raw, rate=8000 ! mulawenc @@ -149,9 +138,8 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri return nil, err } - clockRate = pcmClockRate pipelineStr = fmt.Sprintf(audioSrc + "audio/x-raw, rate=8000 ! mulawenc" + appSink, pipelineDevice) - case webrtc.PCMA: + case codec.PCMA: // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html?gi-language=c // gstreamer1.0-plugins-good // audio/x-raw, rate=8000 ! alawenc @@ -159,21 +147,20 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri return nil, err } - clockRate = pcmClockRate pipelineStr = fmt.Sprintf(audioSrc + "audio/x-raw, rate=8000 ! alawenc" + appSink, pipelineDevice) default: - return nil, fmt.Errorf("unknown codec %s", codecName) + return nil, fmt.Errorf("unknown codec %s", codecRTP.Name) } if pipelineSrc != "" { pipelineStr = fmt.Sprintf(pipelineSrc + appSink, pipelineDevice) } - return CreatePipeline(pipelineStr, clockRate) + return CreatePipeline(pipelineStr) } // CreatePipeline creates a GStreamer Pipeline -func CreatePipeline(pipelineStr string, clockRate float32) (*Pipeline, error) { +func CreatePipeline(pipelineStr string) (*Pipeline, error) { pipelineStrUnsafe := C.CString(pipelineStr) defer C.free(unsafe.Pointer(pipelineStrUnsafe)) @@ -193,7 +180,6 @@ func CreatePipeline(pipelineStr string, clockRate float32) (*Pipeline, error) { p := &Pipeline{ Pipeline: gstPipeline, Sample: make(chan types.Sample), - ClockRate: clockRate, Src: pipelineStr, id: len(pipelines), } @@ -243,7 +229,7 @@ func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.i if ok { pipeline.Sample <- types.Sample{ Data: C.GoBytes(buffer, bufferLen), - Samples: uint32(pipeline.ClockRate * (float32(duration) / 1e9)), + Duration: time.Duration(duration), } } else { fmt.Printf("discarding buffer, no pipeline with id %d", int(pipelineID)) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 46770ac2..2116b394 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -8,6 +8,7 @@ import ( "github.com/rs/zerolog/log" "demodesk/neko/internal/types" + "demodesk/neko/internal/types/codec" "demodesk/neko/internal/config" "demodesk/neko/internal/capture/gst" ) @@ -125,11 +126,11 @@ func (manager *CaptureManagerCtx) Screencast() types.ScreencastManager { return manager.screencast } -func (manager *CaptureManagerCtx) VideoCodec() string { +func (manager *CaptureManagerCtx) VideoCodec() codec.RTP { return manager.config.VideoCodec } -func (manager *CaptureManagerCtx) AudioCodec() string { +func (manager *CaptureManagerCtx) AudioCodec() codec.RTP { return manager.config.AudioCodec } @@ -178,7 +179,7 @@ func (manager *CaptureManagerCtx) createVideoPipeline() { var err error manager.logger.Info(). - Str("video_codec", manager.config.VideoCodec). + Str("video_codec", manager.config.VideoCodec.Name). Str("video_display", manager.config.Display). Str("video_params", manager.config.VideoParams). Msgf("creating video pipeline") @@ -212,7 +213,7 @@ func (manager *CaptureManagerCtx) createAudioPipeline() { var err error manager.logger.Info(). - Str("audio_codec", manager.config.AudioCodec). + Str("audio_codec", manager.config.AudioCodec.Name). Str("audio_display", manager.config.Device). Str("audio_params", manager.config.AudioParams). Msgf("creating audio pipeline") diff --git a/internal/config/capture.go b/internal/config/capture.go index 397367b4..fb072d02 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -1,17 +1,18 @@ package config import ( - "github.com/pion/webrtc/v2" "github.com/spf13/cobra" "github.com/spf13/viper" + + "demodesk/neko/internal/types/codec" ) type Capture struct { Display string Device string - AudioCodec string + AudioCodec codec.RTP AudioParams string - VideoCodec string + VideoCodec codec.RTP VideoParams string BroadcastPipeline string @@ -110,24 +111,30 @@ func (Capture) Init(cmd *cobra.Command) error { } func (s *Capture) Set() { - videoCodec := webrtc.VP8 + var videoCodec codec.RTP if viper.GetBool("vp8") { - videoCodec = webrtc.VP8 + videoCodec = codec.New(codec.VP8) } else if viper.GetBool("vp9") { - videoCodec = webrtc.VP9 + videoCodec = codec.New(codec.VP9) } else if viper.GetBool("h264") { - videoCodec = webrtc.H264 + videoCodec = codec.New(codec.H264) + } else { + // default + videoCodec = codec.New(codec.VP8) } - audioCodec := webrtc.Opus + var audioCodec codec.RTP if viper.GetBool("opus") { - audioCodec = webrtc.Opus + audioCodec = codec.New(codec.Opus) } else if viper.GetBool("g722") { - audioCodec = webrtc.G722 + audioCodec = codec.New(codec.G722) } else if viper.GetBool("pcmu") { - audioCodec = webrtc.PCMU + audioCodec = codec.New(codec.PCMU) } else if viper.GetBool("pcma") { - audioCodec = webrtc.PCMA + audioCodec = codec.New(codec.PCMA) + } else { + // default + audioCodec = codec.New(codec.Opus) } s.Device = viper.GetString("device") diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 13cbf185..faa23768 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -6,6 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" + "demodesk/neko/internal/utils" ) diff --git a/internal/types/capture.go b/internal/types/capture.go index 6481dfe4..7af5d01f 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -1,9 +1,12 @@ package types -type Sample struct { - Data []byte - Samples uint32 -} +import ( + "github.com/pion/webrtc/v3/pkg/media" + + "demodesk/neko/internal/types/codec" +) + +type Sample media.Sample type BroadcastManager interface { Start(url string) error @@ -25,8 +28,8 @@ type CaptureManager interface { Broadcast() BroadcastManager Screencast() ScreencastManager - VideoCodec() string - AudioCodec() string + VideoCodec() codec.RTP + AudioCodec() codec.RTP OnVideoFrame(listener func(sample Sample)) OnAudioFrame(listener func(sample Sample)) diff --git a/internal/types/codec/codecs.go b/internal/types/codec/codecs.go new file mode 100644 index 00000000..4ffc4db7 --- /dev/null +++ b/internal/types/codec/codecs.go @@ -0,0 +1,113 @@ +package codec + +import "github.com/pion/webrtc/v3" + +const ( + VP8 = "vp8" + VP9 = "vp9" + H264 = "h264" + Opus = "opus" + G722 = "g722" + PCMU = "pcmu" + PCMA = "pcma" +) + +type RTP struct { + Name string + PayloadType webrtc.PayloadType + Type webrtc.RTPCodecType + Capability webrtc.RTPCodecCapability +} + +func New(codecType string) RTP { + codec := RTP{} + + switch codecType { + case "vp8": + codec.Name = "vp8" + codec.PayloadType = 96 + codec.Type = webrtc.RTPCodecTypeVideo + codec.Capability = webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypeVP8, + ClockRate: 90000, + Channels: 0, + SDPFmtpLine: "", + RTCPFeedback: nil, + } + case "vp9": + codec.Name = "vp9" + codec.PayloadType = 98 + codec.Type = webrtc.RTPCodecTypeVideo + codec.Capability = webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypeVP9, + ClockRate: 90000, + Channels: 0, + SDPFmtpLine: "profile-id=0", + RTCPFeedback: nil, + } + case "h264": + codec.Name = "h264" + codec.PayloadType = 102 + codec.Type = webrtc.RTPCodecTypeVideo + codec.Capability = webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypeH264, + ClockRate: 90000, + Channels: 0, + SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", + RTCPFeedback: nil, + } + case "opus": + codec.Name = "opus" + codec.PayloadType = 111 + codec.Type = webrtc.RTPCodecTypeAudio + codec.Capability = webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypeOpus, + ClockRate: 48000, + Channels: 2, + SDPFmtpLine: "", + RTCPFeedback: nil, + } + case "g722": + codec.Name = "g722" + codec.PayloadType = 9 + codec.Type = webrtc.RTPCodecTypeAudio + codec.Capability = webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypeG722, + ClockRate: 8000, + Channels: 0, + SDPFmtpLine: "", + RTCPFeedback: nil, + } + case "pcmu": + codec.Name = "pcmu" + codec.PayloadType = 0 + codec.Type = webrtc.RTPCodecTypeAudio + codec.Capability = webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypePCMU, + ClockRate: 8000, + Channels: 0, + SDPFmtpLine: "", + RTCPFeedback: nil, + } + case "pcma": + codec.Name = "pcma" + codec.PayloadType = 8 + codec.Type = webrtc.RTPCodecTypeAudio + codec.Capability = webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypePCMA, + ClockRate: 8000, + Channels: 0, + SDPFmtpLine: "", + RTCPFeedback: nil, + } + } + + return codec +} + +func (codec *RTP) Register(engine *webrtc.MediaEngine) error { + return engine.RegisterCodec(webrtc.RTPCodecParameters{ + RTPCodecCapability: codec.Capability, + PayloadType: codec.PayloadType, + }, codec.Type) +} diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index e0346383..fdfd491a 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -3,15 +3,15 @@ package webrtc import ( "fmt" "io" - "math/rand" "strings" - "github.com/pion/webrtc/v2" - "github.com/pion/webrtc/v2/pkg/media" + "github.com/pion/webrtc/v3" + "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "demodesk/neko/internal/types" + "demodesk/neko/internal/types/codec" "demodesk/neko/internal/config" ) @@ -26,10 +26,10 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con type WebRTCManagerCtx struct { logger zerolog.Logger - videoTrack *webrtc.Track - audioTrack *webrtc.Track - videoCodec *webrtc.RTPCodec - audioCodec *webrtc.RTPCodec + videoTrack *webrtc.TrackLocalStaticSample + audioTrack *webrtc.TrackLocalStaticSample + videoCodec codec.RTP + audioCodec codec.RTP desktop types.DesktopManager capture types.CaptureManager config *config.WebRTC @@ -38,7 +38,9 @@ type WebRTCManagerCtx struct { func (manager *WebRTCManagerCtx) Start() { var err error - manager.audioTrack, manager.audioCodec, err = manager.createTrack(manager.capture.AudioCodec()) + // create audio track + manager.audioCodec = manager.capture.AudioCodec() + manager.audioTrack, err = webrtc.NewTrackLocalStaticSample(manager.audioCodec.Capability, "audio", "stream") if err != nil { manager.logger.Panic().Err(err).Msg("unable to create audio track") } @@ -49,7 +51,9 @@ func (manager *WebRTCManagerCtx) Start() { } }) - manager.videoTrack, manager.videoCodec, err = manager.createTrack(manager.capture.VideoCodec()) + // create video track + manager.videoCodec = manager.capture.VideoCodec() + manager.videoTrack, err = webrtc.NewTrackLocalStaticSample(manager.videoCodec.Capability, "video", "stream") if err != nil { manager.logger.Panic().Err(err).Msg("unable to create video track") } @@ -93,6 +97,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool configuration = &webrtc.Configuration{ SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, } + settings.SetLite(true) } @@ -104,10 +109,15 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) // Create MediaEngine based off sdp - engine := webrtc.MediaEngine{} + engine := &webrtc.MediaEngine{} - engine.RegisterCodec(manager.audioCodec) - engine.RegisterCodec(manager.videoCodec) + if err := manager.videoCodec.Register(engine); err != nil { + return "", manager.config.ICELite, manager.config.ICEServers, err + } + + if err := manager.audioCodec.Register(engine); err != nil { + return "", manager.config.ICELite, manager.config.ICEServers, err + } // Create API with MediaEngine and SettingEngine api := webrtc.NewAPI(webrtc.WithMediaEngine(engine), webrtc.WithSettingEngine(settings)) @@ -118,6 +128,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool return "", manager.config.ICELite, manager.config.ICEServers, err } + _, err = connection.CreateDataChannel("data", nil) + if err != nil { + return "", manager.config.ICELite, manager.config.ICEServers, err + } + if _, err = connection.AddTransceiverFromTrack(manager.videoTrack, webrtc.RtpTransceiverInit{ Direction: webrtc.RTPTransceiverDirectionSendonly, }); err != nil { @@ -130,27 +145,32 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool return "", manager.config.ICELite, manager.config.ICEServers, err } - description, err := connection.CreateOffer(nil) + offer, err := connection.CreateOffer(nil) if err != nil { return "", manager.config.ICELite, manager.config.ICEServers, err } - connection.OnDataChannel(func(d *webrtc.DataChannel) { - d.OnMessage(func(msg webrtc.DataChannelMessage) { + connection.OnDataChannel(func(channel *webrtc.DataChannel) { + channel.OnMessage(func(message webrtc.DataChannelMessage) { if !session.IsHost() { return } - if err = manager.handle(msg); err != nil { + if err = manager.handle(message); err != nil { manager.logger.Warn().Err(err).Msg("data handle failed") } }) }) - if err := connection.SetLocalDescription(description); err != nil { + // TODO: Refactor, send request to client. + gatherComplete := webrtc.GatheringCompletePromise(connection) + + if err := connection.SetLocalDescription(offer); err != nil { return "", manager.config.ICELite, manager.config.ICEServers, err } + <-gatherComplete + connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: @@ -170,40 +190,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool session.SetWebRTCPeer(&WebRTCPeerCtx{ api: api, - engine: &engine, + engine: engine, settings: &settings, connection: connection, configuration: configuration, }) - return description.SDP, manager.config.ICELite, manager.config.ICEServers, nil -} - -func (m *WebRTCManagerCtx) createTrack(codecName string) (*webrtc.Track, *webrtc.RTPCodec, error) { - var codec *webrtc.RTPCodec - switch codecName { - case webrtc.VP8: - codec = webrtc.NewRTPVP8Codec(webrtc.DefaultPayloadTypeVP8, 90000) - case webrtc.VP9: - codec = webrtc.NewRTPVP9Codec(webrtc.DefaultPayloadTypeVP9, 90000) - case webrtc.H264: - codec = webrtc.NewRTPH264Codec(webrtc.DefaultPayloadTypeH264, 90000) - case webrtc.Opus: - codec = webrtc.NewRTPOpusCodec(webrtc.DefaultPayloadTypeOpus, 48000) - case webrtc.G722: - codec = webrtc.NewRTPG722Codec(webrtc.DefaultPayloadTypeG722, 8000) - case webrtc.PCMU: - codec = webrtc.NewRTPPCMUCodec(webrtc.DefaultPayloadTypePCMU, 8000) - case webrtc.PCMA: - codec = webrtc.NewRTPPCMACodec(webrtc.DefaultPayloadTypePCMA, 8000) - default: - return nil, nil, fmt.Errorf("unknown codec %s", codecName) - } - - track, err := webrtc.NewTrack(codec.PayloadType, rand.Uint32(), "stream", "stream", codec) - if err != nil { - return nil, nil, err - } - - return track, codec, nil + return connection.LocalDescription().SDP, manager.config.ICELite, manager.config.ICEServers, nil } From 5a1fbadcd50b461e3c5cd9e3854ab77f5cb5e6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 2 Feb 2021 12:30:44 +0100 Subject: [PATCH 321/876] bump chi version. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fd15c573..2d45251f 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module demodesk/neko go 1.13 require ( - github.com/go-chi/chi v4.1.2+incompatible + github.com/go-chi/chi v1.5.1 github.com/go-chi/cors v1.1.1 github.com/google/uuid v1.2.0 // indirect github.com/gorilla/websocket v1.4.2 diff --git a/go.sum b/go.sum index 9847a44b..3dc53b6c 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec= -github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/go-chi/chi v1.5.1 h1:kfTK3Cxd/dkMu/rKs5ZceWYp+t5CtiE7vmaTv3LjC6w= +github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k= github.com/go-chi/cors v1.1.1 h1:eHuqxsIw89iXcWnWUN8R72JMibABJTN/4IOYI5WERvw= github.com/go-chi/cors v1.1.1/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= From 45cf44835c361e4c6293a888d3f724787c595cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 2 Feb 2021 16:21:20 +0100 Subject: [PATCH 322/876] webrtc improved logging & close on disconnect or fail. --- internal/webrtc/manager.go | 40 +++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index fdfd491a..cfc3c344 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -89,7 +89,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool settings := webrtc.SettingEngine{ LoggerFactory: loggerFactory{ - logger: manager.logger, + logger: manager.logger.With().Str("id", session.ID()).Logger(), }, } @@ -108,7 +108,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) - // Create MediaEngine based off sdp + // Create MediaEngine engine := &webrtc.MediaEngine{} if err := manager.videoCodec.Register(engine); err != nil { @@ -119,10 +119,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool return "", manager.config.ICELite, manager.config.ICEServers, err } - // Create API with MediaEngine and SettingEngine + // Create NewAPI with MediaEngine and SettingEngine api := webrtc.NewAPI(webrtc.WithMediaEngine(engine), webrtc.WithSettingEngine(settings)) - // Create new peer connection + // Create NewPeerConnection connection, err := api.NewPeerConnection(*configuration) if err != nil { return "", manager.config.ICELite, manager.config.ICEServers, err @@ -150,18 +150,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool return "", manager.config.ICELite, manager.config.ICEServers, err } - connection.OnDataChannel(func(channel *webrtc.DataChannel) { - channel.OnMessage(func(message webrtc.DataChannelMessage) { - if !session.IsHost() { - return - } - - if err = manager.handle(message); err != nil { - manager.logger.Warn().Err(err).Msg("data handle failed") - } - }) - }) - // TODO: Refactor, send request to client. gatherComplete := webrtc.GatheringCompletePromise(connection) @@ -174,20 +162,28 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: - manager.logger.Info().Str("id", session.ID()).Msg("peer connected") session.SetWebRTCConnected(true) case webrtc.PeerConnectionStateDisconnected: - manager.logger.Info().Str("id", session.ID()).Msg("peer disconnected") - session.SetWebRTCConnected(false) + fallthrough case webrtc.PeerConnectionStateFailed: - manager.logger.Warn().Str("id", session.ID()).Msg("peer failed") - session.SetWebRTCConnected(false) + connection.Close() case webrtc.PeerConnectionStateClosed: - manager.logger.Warn().Str("id", session.ID()).Msg("peer closed") session.SetWebRTCConnected(false) } }) + connection.OnDataChannel(func(channel *webrtc.DataChannel) { + channel.OnMessage(func(message webrtc.DataChannelMessage) { + if !session.IsHost() { + return + } + + if err = manager.handle(message); err != nil { + manager.logger.Warn().Err(err).Msg("data handle failed") + } + }) + }) + session.SetWebRTCPeer(&WebRTCPeerCtx{ api: api, engine: engine, From d880e4384f5821c0e2b77e7c6971f68102010923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 2 Feb 2021 16:58:17 +0100 Subject: [PATCH 323/876] RTPCodec as functions. --- internal/capture/gst/gst.go | 16 +-- internal/capture/manager.go | 4 +- internal/config/capture.go | 26 ++--- internal/types/capture.go | 4 +- internal/types/codec/codecs.go | 207 +++++++++++++++++---------------- internal/webrtc/manager.go | 4 +- 6 files changed, 136 insertions(+), 125 deletions(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 9527c257..135f5443 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -67,11 +67,11 @@ func CreateJPEGPipeline(pipelineDisplay string, pipelineSrc string, rate string, } // CreateAppPipeline creates a GStreamer Pipeline -func CreateAppPipeline(codecRTP codec.RTP, pipelineDevice string, pipelineSrc string) (*Pipeline, error) { +func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineSrc string) (*Pipeline, error) { var pipelineStr string switch codecRTP.Name { - case codec.VP8: + case "vp8": // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html?gi-language=c // gstreamer1.0-plugins-good // vp8enc error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true cpu-used=5 deadline=1 @@ -80,7 +80,7 @@ func CreateAppPipeline(codecRTP codec.RTP, pipelineDevice string, pipelineSrc st } pipelineStr = fmt.Sprintf(videoSrc + "vp8enc cpu-used=8 threads=2 deadline=1 error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true" + appSink, pipelineDevice) - case codec.VP9: + case "vp9": // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html?gi-language=c // gstreamer1.0-plugins-good // vp9enc @@ -89,7 +89,7 @@ func CreateAppPipeline(codecRTP codec.RTP, pipelineDevice string, pipelineSrc st } pipelineStr = fmt.Sprintf(videoSrc + "vp9enc" + appSink, pipelineDevice) - case codec.H264: + case "h264": if err := CheckPlugins([]string{"ximagesrc"}); err != nil { return nil, err } @@ -112,7 +112,7 @@ func CreateAppPipeline(codecRTP codec.RTP, pipelineDevice string, pipelineSrc st } return nil, err - case codec.Opus: + case "opus": // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html // gstreamer1.0-plugins-base // opusenc @@ -121,7 +121,7 @@ func CreateAppPipeline(codecRTP codec.RTP, pipelineDevice string, pipelineSrc st } pipelineStr = fmt.Sprintf(audioSrc + "opusenc" + appSink, pipelineDevice) - case codec.G722: + case "g722": // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html?gi-language=c // gstreamer1.0-libav // avenc_g722 @@ -130,7 +130,7 @@ func CreateAppPipeline(codecRTP codec.RTP, pipelineDevice string, pipelineSrc st } pipelineStr = fmt.Sprintf(audioSrc + "avenc_g722" + appSink, pipelineDevice) - case codec.PCMU: + case "pcmu": // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html?gi-language=c // gstreamer1.0-plugins-good // audio/x-raw, rate=8000 ! mulawenc @@ -139,7 +139,7 @@ func CreateAppPipeline(codecRTP codec.RTP, pipelineDevice string, pipelineSrc st } pipelineStr = fmt.Sprintf(audioSrc + "audio/x-raw, rate=8000 ! mulawenc" + appSink, pipelineDevice) - case codec.PCMA: + case "pcma": // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html?gi-language=c // gstreamer1.0-plugins-good // audio/x-raw, rate=8000 ! alawenc diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 2116b394..e217119f 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -126,11 +126,11 @@ func (manager *CaptureManagerCtx) Screencast() types.ScreencastManager { return manager.screencast } -func (manager *CaptureManagerCtx) VideoCodec() codec.RTP { +func (manager *CaptureManagerCtx) VideoCodec() codec.RTPCodec { return manager.config.VideoCodec } -func (manager *CaptureManagerCtx) AudioCodec() codec.RTP { +func (manager *CaptureManagerCtx) AudioCodec() codec.RTPCodec { return manager.config.AudioCodec } diff --git a/internal/config/capture.go b/internal/config/capture.go index fb072d02..5c1334b0 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -10,9 +10,9 @@ import ( type Capture struct { Display string Device string - AudioCodec codec.RTP + AudioCodec codec.RTPCodec AudioParams string - VideoCodec codec.RTP + VideoCodec codec.RTPCodec VideoParams string BroadcastPipeline string @@ -111,30 +111,30 @@ func (Capture) Init(cmd *cobra.Command) error { } func (s *Capture) Set() { - var videoCodec codec.RTP + var videoCodec codec.RTPCodec if viper.GetBool("vp8") { - videoCodec = codec.New(codec.VP8) + videoCodec = codec.VP8() } else if viper.GetBool("vp9") { - videoCodec = codec.New(codec.VP9) + videoCodec = codec.VP9() } else if viper.GetBool("h264") { - videoCodec = codec.New(codec.H264) + videoCodec = codec.H264() } else { // default - videoCodec = codec.New(codec.VP8) + videoCodec = codec.VP8() } - var audioCodec codec.RTP + var audioCodec codec.RTPCodec if viper.GetBool("opus") { - audioCodec = codec.New(codec.Opus) + audioCodec = codec.Opus() } else if viper.GetBool("g722") { - audioCodec = codec.New(codec.G722) + audioCodec = codec.G722() } else if viper.GetBool("pcmu") { - audioCodec = codec.New(codec.PCMU) + audioCodec = codec.PCMU() } else if viper.GetBool("pcma") { - audioCodec = codec.New(codec.PCMA) + audioCodec = codec.PCMA() } else { // default - audioCodec = codec.New(codec.Opus) + audioCodec = codec.Opus() } s.Device = viper.GetString("device") diff --git a/internal/types/capture.go b/internal/types/capture.go index 7af5d01f..030a8ea9 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -28,8 +28,8 @@ type CaptureManager interface { Broadcast() BroadcastManager Screencast() ScreencastManager - VideoCodec() codec.RTP - AudioCodec() codec.RTP + VideoCodec() codec.RTPCodec + AudioCodec() codec.RTPCodec OnVideoFrame(listener func(sample Sample)) OnAudioFrame(listener func(sample Sample)) diff --git a/internal/types/codec/codecs.go b/internal/types/codec/codecs.go index 4ffc4db7..e902dd10 100644 --- a/internal/types/codec/codecs.go +++ b/internal/types/codec/codecs.go @@ -2,112 +2,123 @@ package codec import "github.com/pion/webrtc/v3" -const ( - VP8 = "vp8" - VP9 = "vp9" - H264 = "h264" - Opus = "opus" - G722 = "g722" - PCMU = "pcmu" - PCMA = "pcma" -) - -type RTP struct { +type RTPCodec struct { Name string PayloadType webrtc.PayloadType Type webrtc.RTPCodecType Capability webrtc.RTPCodecCapability } -func New(codecType string) RTP { - codec := RTP{} - - switch codecType { - case "vp8": - codec.Name = "vp8" - codec.PayloadType = 96 - codec.Type = webrtc.RTPCodecTypeVideo - codec.Capability = webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypeVP8, - ClockRate: 90000, - Channels: 0, - SDPFmtpLine: "", - RTCPFeedback: nil, - } - case "vp9": - codec.Name = "vp9" - codec.PayloadType = 98 - codec.Type = webrtc.RTPCodecTypeVideo - codec.Capability = webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypeVP9, - ClockRate: 90000, - Channels: 0, - SDPFmtpLine: "profile-id=0", - RTCPFeedback: nil, - } - case "h264": - codec.Name = "h264" - codec.PayloadType = 102 - codec.Type = webrtc.RTPCodecTypeVideo - codec.Capability = webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypeH264, - ClockRate: 90000, - Channels: 0, - SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", - RTCPFeedback: nil, - } - case "opus": - codec.Name = "opus" - codec.PayloadType = 111 - codec.Type = webrtc.RTPCodecTypeAudio - codec.Capability = webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypeOpus, - ClockRate: 48000, - Channels: 2, - SDPFmtpLine: "", - RTCPFeedback: nil, - } - case "g722": - codec.Name = "g722" - codec.PayloadType = 9 - codec.Type = webrtc.RTPCodecTypeAudio - codec.Capability = webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypeG722, - ClockRate: 8000, - Channels: 0, - SDPFmtpLine: "", - RTCPFeedback: nil, - } - case "pcmu": - codec.Name = "pcmu" - codec.PayloadType = 0 - codec.Type = webrtc.RTPCodecTypeAudio - codec.Capability = webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypePCMU, - ClockRate: 8000, - Channels: 0, - SDPFmtpLine: "", - RTCPFeedback: nil, - } - case "pcma": - codec.Name = "pcma" - codec.PayloadType = 8 - codec.Type = webrtc.RTPCodecTypeAudio - codec.Capability = webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypePCMA, - ClockRate: 8000, - Channels: 0, - SDPFmtpLine: "", - RTCPFeedback: nil, - } - } - - return codec -} - -func (codec *RTP) Register(engine *webrtc.MediaEngine) error { +func (codec *RTPCodec) Register(engine *webrtc.MediaEngine) error { return engine.RegisterCodec(webrtc.RTPCodecParameters{ RTPCodecCapability: codec.Capability, PayloadType: codec.PayloadType, }, codec.Type) } + +func VP8() RTPCodec { + return RTPCodec{ + Name: "vp8", + PayloadType: 96, + Type: webrtc.RTPCodecTypeVideo, + Capability: webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypeVP8, + ClockRate: 90000, + Channels: 0, + SDPFmtpLine: "", + RTCPFeedback: nil, + }, + } +} + +// TODO: Profile ID. +func VP9() RTPCodec { + return RTPCodec{ + Name: "vp9", + PayloadType: 98, + Type: webrtc.RTPCodecTypeVideo, + Capability: webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypeVP9, + ClockRate: 90000, + Channels: 0, + SDPFmtpLine: "profile-id=0", + RTCPFeedback: nil, + }, + } +} + +// TODO: Profile ID. +func H264() RTPCodec { + return RTPCodec{ + Name: "h264", + PayloadType: 102, + Type: webrtc.RTPCodecTypeVideo, + Capability: webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypeH264, + ClockRate: 90000, + Channels: 0, + SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", + RTCPFeedback: nil, + }, + } +} + +func Opus() RTPCodec { + return RTPCodec{ + Name: "opus", + PayloadType: 111, + Type: webrtc.RTPCodecTypeAudio, + Capability: webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypeOpus, + ClockRate: 48000, + Channels: 2, + SDPFmtpLine: "", + RTCPFeedback: nil, + }, + } +} + +func G722() RTPCodec { + return RTPCodec{ + Name: "g722", + PayloadType: 9, + Type: webrtc.RTPCodecTypeAudio, + Capability: webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypeG722, + ClockRate: 8000, + Channels: 0, + SDPFmtpLine: "", + RTCPFeedback: nil, + }, + } +} + +func PCMU() RTPCodec { + return RTPCodec{ + Name: "pcmu", + PayloadType: 0, + Type: webrtc.RTPCodecTypeAudio, + Capability: webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypePCMU, + ClockRate: 8000, + Channels: 0, + SDPFmtpLine: "", + RTCPFeedback: nil, + }, + } +} + +func PCMA() RTPCodec { + return RTPCodec{ + Name: "pcma", + PayloadType: 8, + Type: webrtc.RTPCodecTypeAudio, + Capability: webrtc.RTPCodecCapability{ + MimeType: webrtc.MimeTypePCMA, + ClockRate: 8000, + Channels: 0, + SDPFmtpLine: "", + RTCPFeedback: nil, + }, + } +} diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index cfc3c344..96bb8f3a 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -28,8 +28,8 @@ type WebRTCManagerCtx struct { logger zerolog.Logger videoTrack *webrtc.TrackLocalStaticSample audioTrack *webrtc.TrackLocalStaticSample - videoCodec codec.RTP - audioCodec codec.RTP + videoCodec codec.RTPCodec + audioCodec codec.RTPCodec desktop types.DesktopManager capture types.CaptureManager config *config.WebRTC From e152ee295bdd8bb69487ddb9e4741ace2f6910ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 2 Feb 2021 18:21:07 +0100 Subject: [PATCH 324/876] lint fix. --- internal/capture/gst/gst.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 135f5443..6914b0d7 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -29,9 +29,9 @@ var pipelinesLock sync.Mutex var registry *C.GstRegistry const ( - videoSrc = "ximagesrc display-name=%s show-pointer=false use-damage=false ! video/x-raw ! videoconvert ! queue ! " - audioSrc = "pulsesrc device=%s ! audio/x-raw,channels=2 ! audioconvert ! " - appSink = " ! appsink name=appsink" + videoSrc = "ximagesrc display-name=%s show-pointer=false use-damage=false ! video/x-raw ! videoconvert ! queue ! " + audioSrc = "pulsesrc device=%s ! audio/x-raw,channels=2 ! audioconvert ! " + appSink = " ! appsink name=appsink" ) func init() { From 91f17277237edada14f1331e0dd9d88ea313a4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 2 Feb 2021 18:28:32 +0100 Subject: [PATCH 325/876] lint remove whitespaces. --- internal/api/room/broadcast.go | 2 +- internal/api/room/control.go | 2 +- internal/api/room/handler.go | 2 +- internal/api/room/screen.go | 2 +- internal/capture/broadcast.go | 2 +- internal/capture/manager.go | 2 +- internal/capture/screencast.go | 2 +- internal/desktop/clipboard.go | 2 +- internal/desktop/xorg/xorg.go | 2 +- internal/webrtc/peer.go | 2 +- internal/websocket/manager.go | 2 +- runtime/xorg.conf | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index 817c07b7..21a14b90 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -59,7 +59,7 @@ func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { utils.HttpUnprocessableEntity(w, "Server is not broadcasting.") return } - + broadcast.Stop() h.sessions.AdminBroadcast( diff --git a/internal/api/room/control.go b/internal/api/room/control.go index de7648c4..92a47571 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -74,7 +74,7 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { h.desktop.ResetKeys() h.sessions.ClearHost() - + h.sessions.Broadcast( message.ControlHost{ Event: event.CONTROL_HOST, diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 1045cd96..9da74aca 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -46,7 +46,7 @@ func (h *RoomHandler) Route(r chi.Router) { // and this content is sent back to client as text in another // clipboard update. Therefore endpoint is not usable! //r.Post("/image", h.clipboardSetImage) - + // TODO: Refactor. If there would be implemented custom target // retrieval, this endpoint would be useful. //r.Get("/targets", h.clipboardGetTargets) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index e79531c6..ddd7a398 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -61,7 +61,7 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R func (h *RoomHandler) screenConfigurationsList(w http.ResponseWriter, r *http.Request) { list := []ScreenConfigurationPayload{} - + ScreenConfigurations := h.desktop.ScreenConfigurations() for _, size := range ScreenConfigurations { for _, fps := range size.Rates { diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 4fd4c20e..50d6eb65 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -52,7 +52,7 @@ func (manager *BroacastManagerCtx) createPipeline() error { Str("video_display", manager.config.Display). Str("broadcast_pipeline", manager.config.BroadcastPipeline). Msgf("creating pipeline") - + manager.pipeline, err = gst.CreateRTMPPipeline( manager.config.Device, manager.config.Display, diff --git a/internal/capture/manager.go b/internal/capture/manager.go index e217119f..61734d22 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -105,7 +105,7 @@ func (manager *CaptureManagerCtx) Start() { func (manager *CaptureManagerCtx) Shutdown() error { manager.logger.Info().Msgf("capture shutting down") - + if manager.Streaming() { manager.StopStream() } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index f08a05ab..56d8ea72 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -128,7 +128,7 @@ func (manager *ScreencastManagerCtx) createPipeline() error { Str("video_display", manager.config.Display). Str("screencast_pipeline", manager.config.ScreencastPipeline). Msgf("creating pipeline") - + manager.pipeline, err = gst.CreateJPEGPipeline( manager.config.Display, manager.config.ScreencastPipeline, diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index f60a3c1f..ec6876e6 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -104,7 +104,7 @@ func (manager *DesktopManagerCtx) ClipboardGetTargets() ([]string, error) { if !strings.Contains(target, "/") { continue } - + response = append(response, target) } diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index bc41b0e9..d924a892 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -57,7 +57,7 @@ func DisplayOpen(display string) error { func DisplayClose() { mu.Lock() defer mu.Unlock() - + C.XDisplayClose() } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index bd211ffd..325a3af2 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -23,6 +23,6 @@ func (webrtc_peer *WebRTCPeerCtx) Destroy() error { if webrtc_peer.connection == nil || webrtc_peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { return nil } - + return webrtc_peer.connection.Close() } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index a90c7720..4c6c17de 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -242,7 +242,7 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types. } else { ws.logger.Debug().Err(err).Msg("read message error") } - + close(cancel) break } diff --git a/runtime/xorg.conf b/runtime/xorg.conf index eab523cb..071a48f5 100644 --- a/runtime/xorg.conf +++ b/runtime/xorg.conf @@ -55,7 +55,7 @@ Section "Monitor" Modeline "960x720_60.00" 55.86 960 1008 1104 1248 720 721 724 746 -HSync +Vsync # 800x600 @ 60.00 Hz (GTF) hsync: 37.32 kHz; pclk: 38.22 MHz Modeline "800x600_60.00" 38.22 800 832 912 1024 600 601 604 622 -HSync +Vsync - + # 1920x1080 @ 60.00 Hz (GTF) hsync: 67.08 kHz; pclk: 172.80 MHz Modeline "1920x1080_60.00" 172.80 1920 2040 2248 2576 1080 1081 1084 1118 -HSync +Vsync # 1920x1080 @ 30.00 Hz (GTF) hsync: 32.97 kHz; pclk: 80.18 MHz From ace7b254a3e0a4c2d6bcbf3968b1662f1f3224b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 2 Feb 2021 19:21:48 +0100 Subject: [PATCH 326/876] split webrtc ConnectPeer function. --- internal/types/webrtc.go | 8 +- internal/webrtc/manager.go | 144 ++++++++++++++++----------- internal/webrtc/peer.go | 4 +- internal/websocket/handler/signal.go | 8 +- 4 files changed, 98 insertions(+), 66 deletions(-) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 88a01932..8052f335 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -1,5 +1,7 @@ package types +import "github.com/pion/webrtc/v3" + type WebRTCPeer interface { SignalAnswer(sdp string) error Destroy() error @@ -8,5 +10,9 @@ type WebRTCPeer interface { type WebRTCManager interface { Start() Shutdown() error - CreatePeer(session Session) (string, bool, []string, error) + + ICELite() bool + ICEServers() []string + + CreatePeer(session Session) (*webrtc.SessionDescription, error) } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 96bb8f3a..35eb2ff5 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -77,84 +77,48 @@ func (manager *WebRTCManagerCtx) Shutdown() error { return nil } -func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool, []string, error) { - configuration := &webrtc.Configuration{ - ICEServers: []webrtc.ICEServer{ - { - URLs: manager.config.ICEServers, - }, - }, - SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, - } +func (manager *WebRTCManagerCtx) ICELite() bool { + return manager.config.ICELite +} - settings := webrtc.SettingEngine{ - LoggerFactory: loggerFactory{ - logger: manager.logger.With().Str("id", session.ID()).Logger(), - }, - } - - if manager.config.ICELite { - configuration = &webrtc.Configuration{ - SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, - } - - settings.SetLite(true) - } - - err := settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) - if err != nil { - return "", manager.config.ICELite, manager.config.ICEServers, err - } - - settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) +func (manager *WebRTCManagerCtx) ICEServers() []string { + return manager.config.ICEServers +} +func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.SessionDescription, error) { // Create MediaEngine - engine := &webrtc.MediaEngine{} - - if err := manager.videoCodec.Register(engine); err != nil { - return "", manager.config.ICELite, manager.config.ICEServers, err + engine, err := manager.mediaEngine() + if err != nil { + return nil, err } - if err := manager.audioCodec.Register(engine); err != nil { - return "", manager.config.ICELite, manager.config.ICEServers, err - } + // Custom settings & configuration + settings := manager.apiSettings(session) + configuration := manager.apiConfiguration() // Create NewAPI with MediaEngine and SettingEngine - api := webrtc.NewAPI(webrtc.WithMediaEngine(engine), webrtc.WithSettingEngine(settings)) + api := webrtc.NewAPI(webrtc.WithMediaEngine(engine), webrtc.WithSettingEngine(*settings)) // Create NewPeerConnection connection, err := api.NewPeerConnection(*configuration) if err != nil { - return "", manager.config.ICELite, manager.config.ICEServers, err + return nil, err } - _, err = connection.CreateDataChannel("data", nil) - if err != nil { - return "", manager.config.ICELite, manager.config.ICEServers, err - } - - if _, err = connection.AddTransceiverFromTrack(manager.videoTrack, webrtc.RtpTransceiverInit{ - Direction: webrtc.RTPTransceiverDirectionSendonly, - }); err != nil { - return "", manager.config.ICELite, manager.config.ICEServers, err - } - - if _, err = connection.AddTransceiverFromTrack(manager.audioTrack, webrtc.RtpTransceiverInit{ - Direction: webrtc.RTPTransceiverDirectionSendonly, - }); err != nil { - return "", manager.config.ICELite, manager.config.ICEServers, err - } + // Register video, audio & data tracks + manager.registerTracks(connection) + // Create Offer offer, err := connection.CreateOffer(nil) if err != nil { - return "", manager.config.ICELite, manager.config.ICEServers, err + return nil, err } // TODO: Refactor, send request to client. gatherComplete := webrtc.GatheringCompletePromise(connection) if err := connection.SetLocalDescription(offer); err != nil { - return "", manager.config.ICELite, manager.config.ICEServers, err + return nil, err } <-gatherComplete @@ -187,10 +151,74 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (string, bool session.SetWebRTCPeer(&WebRTCPeerCtx{ api: api, engine: engine, - settings: &settings, + settings: settings, connection: connection, configuration: configuration, }) - return connection.LocalDescription().SDP, manager.config.ICELite, manager.config.ICEServers, nil + return connection.LocalDescription(), nil +} + +func (manager *WebRTCManagerCtx) mediaEngine() (*webrtc.MediaEngine, error) { + // Create MediaEngine + engine := &webrtc.MediaEngine{} + + if err := manager.videoCodec.Register(engine); err != nil { + return nil, err + } + + if err := manager.audioCodec.Register(engine); err != nil { + return nil, err + } + + return engine, nil +} + +func (manager *WebRTCManagerCtx) apiSettings(session types.Session) *webrtc.SettingEngine { + settings := &webrtc.SettingEngine{ + LoggerFactory: loggerFactory{ + logger: manager.logger.With().Str("id", session.ID()).Logger(), + }, + } + + //nolint + settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) + settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) + settings.SetLite(manager.config.ICELite) + + return settings +} + +func (manager *WebRTCManagerCtx) apiConfiguration() *webrtc.Configuration { + if manager.config.ICELite { + return &webrtc.Configuration{ + SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, + } + } + + return &webrtc.Configuration{ + ICEServers: []webrtc.ICEServer{ + { + URLs: manager.config.ICEServers, + }, + }, + SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, + } +} + +func (manager *WebRTCManagerCtx) registerTracks(connection *webrtc.PeerConnection) error { + if _, err := connection.AddTransceiverFromTrack(manager.videoTrack, webrtc.RtpTransceiverInit{ + Direction: webrtc.RTPTransceiverDirectionSendonly, + }); err != nil { + return err + } + + if _, err := connection.AddTransceiverFromTrack(manager.audioTrack, webrtc.RtpTransceiverInit{ + Direction: webrtc.RTPTransceiverDirectionSendonly, + }); err != nil { + return err + } + + _, err := connection.CreateDataChannel("data", nil) + return err } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 325a3af2..7cc9f0e1 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -1,8 +1,6 @@ package webrtc -import ( - "github.com/pion/webrtc/v3" -) +import "github.com/pion/webrtc/v3" type WebRTCPeerCtx struct { api *webrtc.API diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 612281a1..22ebd577 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -11,7 +11,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { return nil } - sdp, lite, ice, err := h.webrtc.CreatePeer(session) + offer, err := h.webrtc.CreatePeer(session) if err != nil { return err } @@ -19,9 +19,9 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { return session.Send( message.SignalProvide{ Event: event.SIGNAL_PROVIDE, - SDP: sdp, - Lite: lite, - ICE: ice, + SDP: offer.SDP, + Lite: h.webrtc.ICELite(), + ICE: h.webrtc.ICEServers(), }) } From dd4c67a6c41b265aa19eba719bc9dd4c2fe44e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 2 Feb 2021 19:36:11 +0100 Subject: [PATCH 327/876] registerTracks check for err. --- internal/webrtc/manager.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 35eb2ff5..a37c4f28 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -106,7 +106,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess } // Register video, audio & data tracks - manager.registerTracks(connection) + if err := manager.registerTracks(connection); err != nil { + return nil, err + } // Create Offer offer, err := connection.CreateOffer(nil) From cae8201908b51cdf9294cfe321f03f88d0ce4e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 2 Feb 2021 20:43:33 +0100 Subject: [PATCH 328/876] add Trickle ICE support. --- internal/session/session.go | 9 ++++++ internal/types/event/events.go | 7 +++-- internal/types/message/messages.go | 7 +++++ internal/types/session.go | 7 ++++- internal/types/webrtc.go | 2 ++ internal/webrtc/manager.go | 40 ++++++++++++++++++--------- internal/webrtc/peer.go | 4 +++ internal/websocket/handler/handler.go | 5 ++++ internal/websocket/handler/signal.go | 4 +++ 9 files changed, 68 insertions(+), 17 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 60642a0c..1e607a1a 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -2,6 +2,7 @@ package session import ( "github.com/rs/zerolog" + "github.com/pion/webrtc/v3" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" @@ -195,3 +196,11 @@ func (session *SessionCtx) SignalAnswer(sdp string) error { return session.webrtc_peer.SignalAnswer(sdp) } + +func (session *SessionCtx) SignalCandidate(candidate webrtc.ICECandidateInit) error { + if session.webrtc_peer == nil { + return nil + } + + return session.webrtc_peer.SignalCandidate(candidate) +} diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 5541571f..1f6cc26e 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -7,9 +7,10 @@ const ( ) const ( - SIGNAL_REQUEST = "signal/request" - SIGNAL_ANSWER = "signal/answer" - SIGNAL_PROVIDE = "signal/provide" + SIGNAL_REQUEST = "signal/request" + SIGNAL_ANSWER = "signal/answer" + SIGNAL_PROVIDE = "signal/provide" + SIGNAL_CANDIDATE = "signal/candidate" ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index a0476739..fff6313b 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -1,6 +1,8 @@ package message import ( + "github.com/pion/webrtc/v3" + "demodesk/neko/internal/types" ) @@ -45,6 +47,11 @@ type SignalProvide struct { ICE []string `json:"ice"` } +type SignalCandidate struct { + Event string `json:"event,omitempty"` + *webrtc.ICECandidateInit +} + type SignalAnswer struct { Event string `json:"event,omitempty"` SDP string `json:"sdp"` diff --git a/internal/types/session.go b/internal/types/session.go index ae6494b9..9c74d905 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -1,6 +1,10 @@ package types -import "net/http" +import ( + "net/http" + + "github.com/pion/webrtc/v3" +) type MemberProfile struct { Secret string `json:"secret,omitempty"` @@ -58,6 +62,7 @@ type Session interface { SetWebRTCPeer(webrtc_peer WebRTCPeer) SetWebRTCConnected(connected bool) SignalAnswer(sdp string) error + SignalCandidate(candidate webrtc.ICECandidateInit) error } type SessionManager interface { diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 8052f335..9c0bca3f 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -4,6 +4,8 @@ import "github.com/pion/webrtc/v3" type WebRTCPeer interface { SignalAnswer(sdp string) error + SignalCandidate(candidate webrtc.ICECandidateInit) error + Destroy() error } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index a37c4f28..bb9b822c 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -12,6 +12,8 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/types/codec" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" "demodesk/neko/internal/config" ) @@ -86,45 +88,57 @@ func (manager *WebRTCManagerCtx) ICEServers() []string { } func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.SessionDescription, error) { - // Create MediaEngine + logger := manager.logger.With().Str("id", session.ID()).Logger() + engine, err := manager.mediaEngine() if err != nil { return nil, err } // Custom settings & configuration - settings := manager.apiSettings(session) + settings := manager.apiSettings(logger) configuration := manager.apiConfiguration() // Create NewAPI with MediaEngine and SettingEngine api := webrtc.NewAPI(webrtc.WithMediaEngine(engine), webrtc.WithSettingEngine(*settings)) - // Create NewPeerConnection connection, err := api.NewPeerConnection(*configuration) if err != nil { return nil, err } - // Register video, audio & data tracks + // Asynchronously send local ICE Candidates + connection.OnICECandidate(func(candidate *webrtc.ICECandidate) { + if candidate == nil { + logger.Debug().Msg("all local ice candidates sent") + return + } + + ICECandidateInit := candidate.ToJSON() + err := session.Send( + message.SignalCandidate{ + Event: event.SIGNAL_CANDIDATE, + ICECandidateInit: &ICECandidateInit, + }) + + if err != nil { + logger.Warn().Err(err).Msg("sending ice candidate failed") + } + }) + if err := manager.registerTracks(connection); err != nil { return nil, err } - // Create Offer offer, err := connection.CreateOffer(nil) if err != nil { return nil, err } - // TODO: Refactor, send request to client. - gatherComplete := webrtc.GatheringCompletePromise(connection) - if err := connection.SetLocalDescription(offer); err != nil { return nil, err } - <-gatherComplete - connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: @@ -145,7 +159,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess } if err = manager.handle(message); err != nil { - manager.logger.Warn().Err(err).Msg("data handle failed") + logger.Warn().Err(err).Msg("data handle failed") } }) }) @@ -176,10 +190,10 @@ func (manager *WebRTCManagerCtx) mediaEngine() (*webrtc.MediaEngine, error) { return engine, nil } -func (manager *WebRTCManagerCtx) apiSettings(session types.Session) *webrtc.SettingEngine { +func (manager *WebRTCManagerCtx) apiSettings(logger zerolog.Logger) *webrtc.SettingEngine { settings := &webrtc.SettingEngine{ LoggerFactory: loggerFactory{ - logger: manager.logger.With().Str("id", session.ID()).Logger(), + logger: logger, }, } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 7cc9f0e1..e6e8e05f 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -17,6 +17,10 @@ func (webrtc_peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { }) } +func (webrtc_peer *WebRTCPeerCtx) SignalCandidate(candidate webrtc.ICECandidateInit) error { + return webrtc_peer.connection.AddICECandidate(candidate) +} + func (webrtc_peer *WebRTCPeerCtx) Destroy() error { if webrtc_peer.connection == nil || webrtc_peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { return nil diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 1601a42b..2a1ef34a 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -54,6 +54,11 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { err = utils.Unmarshal(payload, raw, func() error { return h.signalAnswer(session, payload) }) + case event.SIGNAL_CANDIDATE: + payload := &message.SignalCandidate{} + err = utils.Unmarshal(payload, raw, func() error { + return h.signalCandidate(session, payload) + }) // Control Events case event.CONTROL_RELEASE: diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 22ebd577..d7cfc62d 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -28,3 +28,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { return session.SignalAnswer(payload.SDP) } + +func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *message.SignalCandidate) error { + return session.SignalCandidate(*payload.ICECandidateInit) +} From c2553b150ca387fb25f72a819067c5f25dfb6214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 2 Feb 2021 21:12:11 +0100 Subject: [PATCH 329/876] ICETrickle in config. --- internal/config/webrtc.go | 7 ++++++ internal/webrtc/manager.go | 50 ++++++++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index faa23768..f8419d5f 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -12,6 +12,7 @@ import ( type WebRTC struct { ICELite bool + ICETrickle bool ICEServers []string EphemeralMin uint16 EphemeralMax uint16 @@ -39,11 +40,17 @@ func (WebRTC) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("icetrickle", true, "configures whether cadidates should be sent asynchronously using Trickle ICE") + if err := viper.BindPFlag("icetrickle", cmd.PersistentFlags().Lookup("icetrickle")); err != nil { + return err + } + return nil } func (s *WebRTC) Set() { s.ICELite = viper.GetBool("icelite") + s.ICETrickle = viper.GetBool("icetrickle") s.ICEServers = viper.GetStringSlice("iceserver") s.NAT1To1IPs = viper.GetStringSlice("nat1to1") diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index bb9b822c..a7e836d8 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -68,6 +68,7 @@ func (manager *WebRTCManagerCtx) Start() { manager.logger.Info(). Str("ice_lite", fmt.Sprintf("%t", manager.config.ICELite)). + Str("ice_trickle", fmt.Sprintf("%t", manager.config.ICETrickle)). Str("ice_servers", strings.Join(manager.config.ICEServers, ",")). Str("ephemeral_port_range", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)). Str("nat_ips", strings.Join(manager.config.NAT1To1IPs, ",")). @@ -108,23 +109,25 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess } // Asynchronously send local ICE Candidates - connection.OnICECandidate(func(candidate *webrtc.ICECandidate) { - if candidate == nil { - logger.Debug().Msg("all local ice candidates sent") - return - } + if manager.config.ICETrickle { + connection.OnICECandidate(func(candidate *webrtc.ICECandidate) { + if candidate == nil { + logger.Debug().Msg("all local ice candidates sent") + return + } - ICECandidateInit := candidate.ToJSON() - err := session.Send( - message.SignalCandidate{ - Event: event.SIGNAL_CANDIDATE, - ICECandidateInit: &ICECandidateInit, - }) + ICECandidateInit := candidate.ToJSON() + err := session.Send( + message.SignalCandidate{ + Event: event.SIGNAL_CANDIDATE, + ICECandidateInit: &ICECandidateInit, + }) - if err != nil { - logger.Warn().Err(err).Msg("sending ice candidate failed") - } - }) + if err != nil { + logger.Warn().Err(err).Msg("sending ice candidate failed") + } + }) + } if err := manager.registerTracks(connection); err != nil { return nil, err @@ -135,8 +138,19 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess return nil, err } - if err := connection.SetLocalDescription(offer); err != nil { - return nil, err + if !manager.config.ICETrickle { + // Create channel that is blocked until ICE Gathering is complete + gatherComplete := webrtc.GatheringCompletePromise(connection) + + if err := connection.SetLocalDescription(offer); err != nil { + return nil, err + } + + <-gatherComplete + } else { + if err := connection.SetLocalDescription(offer); err != nil { + return nil, err + } } connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { @@ -201,7 +215,7 @@ func (manager *WebRTCManagerCtx) apiSettings(logger zerolog.Logger) *webrtc.Sett settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) settings.SetLite(manager.config.ICELite) - + return settings } From 7e7a0c06171642db5ae071a84efc11776f389840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 3 Feb 2021 21:04:48 +0100 Subject: [PATCH 330/876] tune gst pipelines. --- internal/capture/gst/gst.go | 42 +++++++++++++++---------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 6914b0d7..4446aed0 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -72,42 +72,38 @@ func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineS switch codecRTP.Name { case "vp8": - // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html?gi-language=c + // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html // gstreamer1.0-plugins-good - // vp8enc error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true cpu-used=5 deadline=1 if err := CheckPlugins([]string{"ximagesrc", "vpx"}); err != nil { return nil, err } - pipelineStr = fmt.Sprintf(videoSrc + "vp8enc cpu-used=8 threads=2 deadline=1 error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true" + appSink, pipelineDevice) + pipelineStr = fmt.Sprintf(videoSrc + "vp8enc cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20" + appSink, pipelineDevice) case "vp9": - // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html?gi-language=c + // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html // gstreamer1.0-plugins-good - // vp9enc if err := CheckPlugins([]string{"ximagesrc", "vpx"}); err != nil { return nil, err } pipelineStr = fmt.Sprintf(videoSrc + "vp9enc" + appSink, pipelineDevice) case "h264": - if err := CheckPlugins([]string{"ximagesrc"}); err != nil { + var err error + if err = CheckPlugins([]string{"ximagesrc"}); err != nil { return nil, err } - var err error - // https://gstreamer.freedesktop.org/documentation/openh264/openh264enc.html?gi-language=c#openh264enc - // gstreamer1.0-plugins-bad - // openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 - if err = CheckPlugins([]string{"openh264"}); err == nil { - pipelineStr = fmt.Sprintf(videoSrc + "openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream" + appSink, pipelineDevice) + // https://gstreamer.freedesktop.org/documentation/x264/index.html + // gstreamer1.0-plugins-ugly + if err = CheckPlugins([]string{"x264"}); err == nil { + pipelineStr = fmt.Sprintf(videoSrc + "video/x-raw,format=I420 ! x264enc threads=4 bitrate=4096 key-int-max=15 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream" + appSink, pipelineDevice) break } - // https://gstreamer.freedesktop.org/documentation/x264/index.html?gi-language=c - // gstreamer1.0-plugins-ugly - // video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream - if err = CheckPlugins([]string{"x264"}); err == nil { - pipelineStr = fmt.Sprintf(videoSrc + "video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream" + appSink, pipelineDevice) + // https://gstreamer.freedesktop.org/documentation/openh264/openh264enc.html + // gstreamer1.0-plugins-bad + if err = CheckPlugins([]string{"openh264"}); err == nil { + pipelineStr = fmt.Sprintf(videoSrc + "openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream" + appSink, pipelineDevice) break } @@ -115,34 +111,30 @@ func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineS case "opus": // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html // gstreamer1.0-plugins-base - // opusenc if err := CheckPlugins([]string{"pulseaudio", "opus"}); err != nil { return nil, err } - pipelineStr = fmt.Sprintf(audioSrc + "opusenc" + appSink, pipelineDevice) + pipelineStr = fmt.Sprintf(audioSrc + "opusenc bitrate=128000" + appSink, pipelineDevice) case "g722": - // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html?gi-language=c + // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html // gstreamer1.0-libav - // avenc_g722 if err := CheckPlugins([]string{"pulseaudio", "libav"}); err != nil { return nil, err } pipelineStr = fmt.Sprintf(audioSrc + "avenc_g722" + appSink, pipelineDevice) case "pcmu": - // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html?gi-language=c + // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html // gstreamer1.0-plugins-good - // audio/x-raw, rate=8000 ! mulawenc if err := CheckPlugins([]string{"pulseaudio", "mulaw"}); err != nil { return nil, err } pipelineStr = fmt.Sprintf(audioSrc + "audio/x-raw, rate=8000 ! mulawenc" + appSink, pipelineDevice) case "pcma": - // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html?gi-language=c + // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html // gstreamer1.0-plugins-good - // audio/x-raw, rate=8000 ! alawenc if err := CheckPlugins([]string{"pulseaudio", "alaw"}); err != nil { return nil, err } From b488f01b16b1e3697780ab275b8cedabc6bd7754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 4 Feb 2021 13:52:32 +0100 Subject: [PATCH 331/876] vp9enc add properties from vp8enc. --- internal/capture/gst/gst.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 4446aed0..48a17ba7 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -86,7 +86,7 @@ func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineS return nil, err } - pipelineStr = fmt.Sprintf(videoSrc + "vp9enc" + appSink, pipelineDevice) + pipelineStr = fmt.Sprintf(videoSrc + "vp9enc cpu-used=16 threads=4 deadline=1 keyframe-max-dist=15 static-threshold=20" + appSink, pipelineDevice) case "h264": var err error if err = CheckPlugins([]string{"ximagesrc"}); err != nil { From 7902d7b1f11c58301f6161f9871b59d432a015da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 4 Feb 2021 20:39:48 +0000 Subject: [PATCH 332/876] Implement Audio & Video using custom StreamManager. --- internal/capture/manager.go | 181 +++++++----------------------------- internal/capture/stream.go | 126 +++++++++++++++++++++++++ internal/types/capture.go | 19 ++-- internal/webrtc/manager.go | 79 ++++++++-------- internal/webrtc/peer.go | 20 +++- 5 files changed, 229 insertions(+), 196 deletions(-) create mode 100644 internal/capture/stream.go diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 61734d22..2f2b660a 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -3,45 +3,36 @@ package capture import ( "sync" - "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" "demodesk/neko/internal/config" - "demodesk/neko/internal/capture/gst" ) type CaptureManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - video *gst.Pipeline - audio *gst.Pipeline - config *config.Capture - emit_update chan bool - emit_stop chan bool - video_sample chan types.Sample - audio_sample chan types.Sample - emmiter events.EventEmmiter - streaming bool - desktop types.DesktopManager - broadcast *BroacastManagerCtx - screencast *ScreencastManagerCtx + logger zerolog.Logger + mu sync.Mutex + config *config.Capture + desktop types.DesktopManager + streaming bool + broadcast *BroacastManagerCtx + screencast *ScreencastManagerCtx + audio *StreamManagerCtx + video *StreamManagerCtx } func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { return &CaptureManagerCtx{ - logger: log.With().Str("module", "capture").Logger(), - mu: sync.Mutex{}, - emit_update: make(chan bool), - emit_stop: make(chan bool), - emmiter: events.New(), - config: config, - streaming: false, - desktop: desktop, - broadcast: broadcastNew(config), - screencast: screencastNew(config), + logger: log.With().Str("module", "capture").Logger(), + mu: sync.Mutex{}, + config: config, + desktop: desktop, + streaming: false, + broadcast: broadcastNew(config), + screencast: screencastNew(config), + audio: streamNew(config.AudioCodec, config.Device, config.AudioParams), + video: streamNew(config.VideoCodec, config.Display, config.VideoParams), } } @@ -53,8 +44,8 @@ func (manager *CaptureManagerCtx) Start() { } manager.desktop.OnBeforeScreenSizeChange(func() { - if manager.Streaming() { - manager.destroyVideoPipeline() + if manager.video.Enabled() { + manager.video.destroyPipeline() } if manager.broadcast.Enabled() { @@ -67,8 +58,10 @@ func (manager *CaptureManagerCtx) Start() { }) manager.desktop.OnAfterScreenSizeChange(func() { - if manager.Streaming() { - manager.createVideoPipeline() + if manager.video.Enabled() { + if err := manager.video.createPipeline(); err != nil { + manager.logger.Panic().Err(err).Msg("unable to recreate video pipeline") + } } if manager.broadcast.Enabled() { @@ -83,38 +76,16 @@ func (manager *CaptureManagerCtx) Start() { } } }) - - go func() { - manager.logger.Debug().Msg("started emitting samples") - - for { - select { - case <-manager.emit_stop: - manager.logger.Debug().Msg("stopped emitting samples") - return - case <-manager.emit_update: - manager.logger.Debug().Msg("update emitting samples") - case sample := <-manager.video_sample: - manager.emmiter.Emit("video", sample) - case sample := <-manager.audio_sample: - manager.emmiter.Emit("audio", sample) - } - } - }() } func (manager *CaptureManagerCtx) Shutdown() error { manager.logger.Info().Msgf("capture shutting down") - if manager.Streaming() { - manager.StopStream() - } - manager.broadcast.destroyPipeline() manager.screencast.destroyPipeline() - - manager.emit_stop <- true manager.screencast.shutdown <- true + manager.audio.Shutdown() + manager.video.Shutdown() return nil } @@ -126,34 +97,22 @@ func (manager *CaptureManagerCtx) Screencast() types.ScreencastManager { return manager.screencast } -func (manager *CaptureManagerCtx) VideoCodec() codec.RTPCodec { - return manager.config.VideoCodec +func (manager *CaptureManagerCtx) Audio() types.StreamManager { + return manager.audio } -func (manager *CaptureManagerCtx) AudioCodec() codec.RTPCodec { - return manager.config.AudioCodec -} - -func (manager *CaptureManagerCtx) OnVideoFrame(listener func(sample types.Sample)) { - manager.emmiter.On("video", func(payload ...interface{}) { - listener(payload[0].(types.Sample)) - }) -} - -func (manager *CaptureManagerCtx) OnAudioFrame(listener func(sample types.Sample)) { - manager.emmiter.On("audio", func(payload ...interface{}) { - listener(payload[0].(types.Sample)) - }) +func (manager *CaptureManagerCtx) Video() types.StreamManager { + return manager.video } func (manager *CaptureManagerCtx) StartStream() { manager.mu.Lock() defer manager.mu.Unlock() - manager.logger.Info().Msgf("starting pipelines") + manager.logger.Info().Msgf("starting stream pipelines") - manager.createVideoPipeline() - manager.createAudioPipeline() + manager.Video().Start() + manager.Audio().Start() manager.streaming = true } @@ -161,10 +120,10 @@ func (manager *CaptureManagerCtx) StopStream() { manager.mu.Lock() defer manager.mu.Unlock() - manager.logger.Info().Msgf("stopping pipelines") + manager.logger.Info().Msgf("stopping stream pipelines") - manager.destroyVideoPipeline() - manager.destroyAudioPipeline() + manager.Video().Stop() + manager.Audio().Stop() manager.streaming = false } @@ -174,71 +133,3 @@ func (manager *CaptureManagerCtx) Streaming() bool { return manager.streaming } - -func (manager *CaptureManagerCtx) createVideoPipeline() { - var err error - - manager.logger.Info(). - Str("video_codec", manager.config.VideoCodec.Name). - Str("video_display", manager.config.Display). - Str("video_params", manager.config.VideoParams). - Msgf("creating video pipeline") - - manager.video, err = gst.CreateAppPipeline( - manager.config.VideoCodec, - manager.config.Display, - manager.config.VideoParams, - ) - - if err != nil { - manager.logger.Panic().Err(err).Msg("unable to create video pipeline") - } - - manager.logger.Info(). - Str("src", manager.video.Src). - Msgf("starting video pipeline") - - manager.video.Start() - - manager.video_sample = manager.video.Sample - manager.emit_update <-true -} - -func (manager *CaptureManagerCtx) destroyVideoPipeline() { - manager.logger.Info().Msgf("stopping video pipeline") - manager.video.Stop() -} - -func (manager *CaptureManagerCtx) createAudioPipeline() { - var err error - - manager.logger.Info(). - Str("audio_codec", manager.config.AudioCodec.Name). - Str("audio_display", manager.config.Device). - Str("audio_params", manager.config.AudioParams). - Msgf("creating audio pipeline") - - manager.audio, err = gst.CreateAppPipeline( - manager.config.AudioCodec, - manager.config.Device, - manager.config.AudioParams, - ) - - if err != nil { - manager.logger.Panic().Err(err).Msg("unable to create audio pipeline") - } - - manager.logger.Info(). - Str("src", manager.audio.Src). - Msgf("starting audio pipeline") - - manager.audio.Start() - - manager.audio_sample = manager.audio.Sample - manager.emit_update <-true -} - -func (manager *CaptureManagerCtx) destroyAudioPipeline() { - manager.logger.Info().Msgf("stopping audio pipeline") - manager.audio.Stop() -} diff --git a/internal/capture/stream.go b/internal/capture/stream.go new file mode 100644 index 00000000..e5494a2d --- /dev/null +++ b/internal/capture/stream.go @@ -0,0 +1,126 @@ +package capture + +import ( + "sync" + + "github.com/kataras/go-events" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/codec" + "demodesk/neko/internal/capture/gst" +) + +type StreamManagerCtx struct { + logger zerolog.Logger + mu sync.Mutex + codec codec.RTPCodec + pipelineDevice string + pipelineSrc string + pipeline *gst.Pipeline + sample chan types.Sample + emmiter events.EventEmmiter + emitUpdate chan bool + emitStop chan bool + enabled bool +} + +func streamNew(codec codec.RTPCodec, pipelineDevice string, pipelineSrc string) *StreamManagerCtx { + manager := &StreamManagerCtx{ + logger: log.With().Str("module", "capture").Str("submodule", "stream").Logger(), + mu: sync.Mutex{}, + codec: codec, + pipelineDevice: pipelineDevice, + pipelineSrc: pipelineSrc, + emmiter: events.New(), + emitUpdate: make(chan bool), + emitStop: make(chan bool), + enabled: false, + } + + go func() { + manager.logger.Debug().Msg("started emitting samples") + + for { + select { + case <-manager.emitStop: + manager.logger.Debug().Msg("stopped emitting samples") + return + case <-manager.emitUpdate: + manager.logger.Debug().Msg("update emitting samples") + case sample := <-manager.sample: + manager.emmiter.Emit("sample", sample) + } + } + }() + + return manager +} + +func (manager *StreamManagerCtx) Shutdown() { + manager.logger.Info().Msgf("shutting down") + + manager.destroyPipeline() + manager.emitStop <- true +} + +func (manager *StreamManagerCtx) Codec() codec.RTPCodec { + return manager.codec +} + +func (manager *StreamManagerCtx) OnSample(listener func(sample types.Sample)) { + manager.emmiter.On("sample", func(payload ...interface{}) { + listener(payload[0].(types.Sample)) + }) +} + +func (manager *StreamManagerCtx) Start() { + manager.enabled = true + manager.createPipeline() +} + +func (manager *StreamManagerCtx) Stop() { + manager.enabled = false + manager.destroyPipeline() +} + +func (manager *StreamManagerCtx) Enabled() bool { + return manager.enabled +} + +func (manager *StreamManagerCtx) createPipeline() error { + var err error + + codec := manager.Codec() + manager.logger.Info(). + Str("codec", codec.Name). + Str("device", manager.pipelineDevice). + Str("src", manager.pipelineSrc). + Msgf("creating pipeline") + + manager.pipeline, err = gst.CreateAppPipeline(codec, manager.pipelineDevice, manager.pipelineSrc) + if err != nil { + return err + } + + manager.logger.Info(). + Str("src", manager.pipeline.Src). + Msgf("starting pipeline") + + manager.pipeline.Start() + + manager.sample = manager.pipeline.Sample + manager.emitUpdate <-true + return nil +} + +func (manager *StreamManagerCtx) destroyPipeline() { + if manager.pipeline == nil { + return + } + + manager.pipeline.Stop() + manager.logger.Info().Msgf("stopping pipeline") + manager.pipeline = nil +} diff --git a/internal/types/capture.go b/internal/types/capture.go index 030a8ea9..bc61813d 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -21,18 +21,25 @@ type ScreencastManager interface { Image() ([]byte, error) } +type StreamManager interface { + Shutdown() + + Codec() codec.RTPCodec + OnSample(listener func(sample Sample)) + + Start() + Stop() + Enabled() bool +} + type CaptureManager interface { Start() Shutdown() error Broadcast() BroadcastManager Screencast() ScreencastManager - - VideoCodec() codec.RTPCodec - AudioCodec() codec.RTPCodec - - OnVideoFrame(listener func(sample Sample)) - OnAudioFrame(listener func(sample Sample)) + Audio() StreamManager + Video() StreamManager StartStream() StopStream() diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index a7e836d8..f8e0f0a2 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -19,48 +19,48 @@ import ( func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ - logger: log.With().Str("module", "webrtc").Logger(), - desktop: desktop, - capture: capture, - config: config, + logger: log.With().Str("module", "webrtc").Logger(), + videoCodec: capture.Video().Codec(), + audioCodec: capture.Audio().Codec(), + desktop: desktop, + capture: capture, + config: config, } } type WebRTCManagerCtx struct { - logger zerolog.Logger - videoTrack *webrtc.TrackLocalStaticSample - audioTrack *webrtc.TrackLocalStaticSample - videoCodec codec.RTPCodec - audioCodec codec.RTPCodec - desktop types.DesktopManager - capture types.CaptureManager - config *config.WebRTC + logger zerolog.Logger + videoTrack *webrtc.TrackLocalStaticSample + audioTrack *webrtc.TrackLocalStaticSample + videoCodec codec.RTPCodec + audioCodec codec.RTPCodec + desktop types.DesktopManager + capture types.CaptureManager + config *config.WebRTC } func (manager *WebRTCManagerCtx) Start() { var err error // create audio track - manager.audioCodec = manager.capture.AudioCodec() manager.audioTrack, err = webrtc.NewTrackLocalStaticSample(manager.audioCodec.Capability, "audio", "stream") if err != nil { manager.logger.Panic().Err(err).Msg("unable to create audio track") } - manager.capture.OnAudioFrame(func(sample types.Sample) { + manager.capture.Audio().OnSample(func(sample types.Sample) { if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") } }) // create video track - manager.videoCodec = manager.capture.VideoCodec() manager.videoTrack, err = webrtc.NewTrackLocalStaticSample(manager.videoCodec.Capability, "video", "stream") if err != nil { manager.logger.Panic().Err(err).Msg("unable to create video track") } - manager.capture.OnVideoFrame(func(sample types.Sample) { + manager.capture.Video().OnSample(func(sample types.Sample) { if err := manager.videoTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Msg("video pipeline failed to write") } @@ -91,6 +91,7 @@ func (manager *WebRTCManagerCtx) ICEServers() []string { func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.SessionDescription, error) { logger := manager.logger.With().Str("id", session.ID()).Logger() + // Create MediaEngine engine, err := manager.mediaEngine() if err != nil { return nil, err @@ -129,7 +130,21 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess }) } - if err := manager.registerTracks(connection); err != nil { + audioTransceiver, err := connection.AddTransceiverFromTrack(manager.audioTrack, webrtc.RtpTransceiverInit{ + Direction: webrtc.RTPTransceiverDirectionSendonly, + }) + if err != nil { + return nil, err + } + + videoTransceiver, err := connection.AddTransceiverFromTrack(manager.videoTrack, webrtc.RtpTransceiverInit{ + Direction: webrtc.RTPTransceiverDirectionSendonly, + }) + if err != nil { + return nil, err + } + + if _, err := connection.CreateDataChannel("data", nil); err != nil { return nil, err } @@ -179,18 +194,19 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess }) session.SetWebRTCPeer(&WebRTCPeerCtx{ - api: api, - engine: engine, - settings: settings, - connection: connection, - configuration: configuration, + api: api, + engine: engine, + settings: settings, + connection: connection, + configuration: configuration, + audioTransceiver: audioTransceiver, + videoTransceiver: videoTransceiver, }) return connection.LocalDescription(), nil } func (manager *WebRTCManagerCtx) mediaEngine() (*webrtc.MediaEngine, error) { - // Create MediaEngine engine := &webrtc.MediaEngine{} if err := manager.videoCodec.Register(engine); err != nil { @@ -235,20 +251,3 @@ func (manager *WebRTCManagerCtx) apiConfiguration() *webrtc.Configuration { SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, } } - -func (manager *WebRTCManagerCtx) registerTracks(connection *webrtc.PeerConnection) error { - if _, err := connection.AddTransceiverFromTrack(manager.videoTrack, webrtc.RtpTransceiverInit{ - Direction: webrtc.RTPTransceiverDirectionSendonly, - }); err != nil { - return err - } - - if _, err := connection.AddTransceiverFromTrack(manager.audioTrack, webrtc.RtpTransceiverInit{ - Direction: webrtc.RTPTransceiverDirectionSendonly, - }); err != nil { - return err - } - - _, err := connection.CreateDataChannel("data", nil) - return err -} diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index e6e8e05f..f4240cac 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -3,11 +3,13 @@ package webrtc import "github.com/pion/webrtc/v3" type WebRTCPeerCtx struct { - api *webrtc.API - engine *webrtc.MediaEngine - settings *webrtc.SettingEngine - connection *webrtc.PeerConnection - configuration *webrtc.Configuration + api *webrtc.API + engine *webrtc.MediaEngine + settings *webrtc.SettingEngine + connection *webrtc.PeerConnection + configuration *webrtc.Configuration + audioTransceiver *webrtc.RTPTransceiver + videoTransceiver *webrtc.RTPTransceiver } func (webrtc_peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { @@ -21,6 +23,14 @@ func (webrtc_peer *WebRTCPeerCtx) SignalCandidate(candidate webrtc.ICECandidateI return webrtc_peer.connection.AddICECandidate(candidate) } +func (webrtc_peer *WebRTCPeerCtx) ReplaceAudioTrack(track webrtc.TrackLocal) error { + return webrtc_peer.audioTransceiver.Sender().ReplaceTrack(track) +} + +func (webrtc_peer *WebRTCPeerCtx) ReplaceVideoTrack(track webrtc.TrackLocal) error { + return webrtc_peer.videoTransceiver.Sender().ReplaceTrack(track) +} + func (webrtc_peer *WebRTCPeerCtx) Destroy() error { if webrtc_peer.connection == nil || webrtc_peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { return nil From 58ea3665b0550c3d181693ee275c3f7cfe0c9bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 12:18:46 +0100 Subject: [PATCH 333/876] unify capture shutdown. --- internal/capture/broadcast.go | 6 ++++ internal/capture/manager.go | 10 +++---- internal/capture/screencast.go | 53 +++++++++++++++++++--------------- internal/capture/stream.go | 2 +- internal/types/capture.go | 2 -- 5 files changed, 42 insertions(+), 31 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 50d6eb65..3bcd8ca3 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -25,6 +25,12 @@ func broadcastNew(config *config.Capture) *BroacastManagerCtx { } } +func (manager *BroacastManagerCtx) shutdown() { + manager.logger.Info().Msgf("shutting down") + + manager.destroyPipeline() +} + func (manager *BroacastManagerCtx) Start(url string) error { manager.url = url manager.enabled = true diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 2f2b660a..cf76adde 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -81,11 +81,11 @@ func (manager *CaptureManagerCtx) Start() { func (manager *CaptureManagerCtx) Shutdown() error { manager.logger.Info().Msgf("capture shutting down") - manager.broadcast.destroyPipeline() - manager.screencast.destroyPipeline() - manager.screencast.shutdown <- true - manager.audio.Shutdown() - manager.video.Shutdown() + manager.broadcast.shutdown() + manager.screencast.shutdown() + + manager.audio.shutdown() + manager.video.shutdown() return nil } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 56d8ea72..8b210b7c 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -15,27 +15,27 @@ import ( ) type ScreencastManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - config *config.Capture - pipeline *gst.Pipeline - enabled bool - started bool - shutdown chan bool - refresh chan bool - expired int32 - sample chan types.Sample - image types.Sample + logger zerolog.Logger + mu sync.Mutex + config *config.Capture + pipeline *gst.Pipeline + enabled bool + started bool + emitStop chan bool + emitUpdate chan bool + expired int32 + sample chan types.Sample + image types.Sample } func screencastNew(config *config.Capture) *ScreencastManagerCtx { manager := &ScreencastManagerCtx{ - logger: log.With().Str("module", "capture").Str("submodule", "screencast").Logger(), - config: config, - enabled: config.Screencast, - started: false, - shutdown: make(chan bool), - refresh: make(chan bool), + logger: log.With().Str("module", "capture").Str("submodule", "screencast").Logger(), + config: config, + enabled: config.Screencast, + started: false, + emitStop: make(chan bool), + emitUpdate: make(chan bool), } if !manager.enabled { @@ -44,16 +44,16 @@ func screencastNew(config *config.Capture) *ScreencastManagerCtx { go func() { ticker := time.NewTicker(5 * time.Second) - manager.logger.Debug().Msg("subroutine started") + manager.logger.Debug().Msg("started emitting samples") for { select { - case <-manager.shutdown: - manager.logger.Debug().Msg("shutting down") + case <-manager.emitStop: + manager.logger.Debug().Msg("stopped emitting samples") ticker.Stop() return - case <-manager.refresh: - manager.logger.Debug().Msg("subroutine updated") + case <-manager.emitUpdate: + manager.logger.Debug().Msg("update emitting samples") case sample := <-manager.sample: manager.image = sample case <-ticker.C: @@ -67,6 +67,13 @@ func screencastNew(config *config.Capture) *ScreencastManagerCtx { return manager } +func (manager *ScreencastManagerCtx) shutdown() { + manager.logger.Info().Msgf("shutting down") + + manager.destroyPipeline() + manager.emitStop <- true +} + func (manager *ScreencastManagerCtx) Enabled() bool { return manager.enabled } @@ -144,7 +151,7 @@ func (manager *ScreencastManagerCtx) createPipeline() error { manager.logger.Info().Msgf("starting pipeline") manager.sample = manager.pipeline.Sample - manager.refresh <-true + manager.emitUpdate <-true return nil } diff --git a/internal/capture/stream.go b/internal/capture/stream.go index e5494a2d..b98722a4 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -58,7 +58,7 @@ func streamNew(codec codec.RTPCodec, pipelineDevice string, pipelineSrc string) return manager } -func (manager *StreamManagerCtx) Shutdown() { +func (manager *StreamManagerCtx) shutdown() { manager.logger.Info().Msgf("shutting down") manager.destroyPipeline() diff --git a/internal/types/capture.go b/internal/types/capture.go index bc61813d..0fa0737d 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -22,8 +22,6 @@ type ScreencastManager interface { } type StreamManager interface { - Shutdown() - Codec() codec.RTPCodec OnSample(listener func(sample Sample)) From 2b72f43c9e8398c44e15329672912b88e8e227e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 12:41:02 +0100 Subject: [PATCH 334/876] do not start pipeline when error. --- internal/capture/broadcast.go | 7 ++++++- internal/capture/manager.go | 13 +++++++++++-- internal/capture/screencast.go | 6 ++++-- internal/capture/stream.go | 9 +++++++-- internal/types/capture.go | 2 +- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 3bcd8ca3..10ad3574 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -32,9 +32,14 @@ func (manager *BroacastManagerCtx) shutdown() { } func (manager *BroacastManagerCtx) Start(url string) error { + err := manager.createPipeline() + if err != nil { + return err + } + manager.url = url manager.enabled = true - return manager.createPipeline() + return nil } func (manager *BroacastManagerCtx) Stop() { diff --git a/internal/capture/manager.go b/internal/capture/manager.go index cf76adde..e729aab2 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -111,8 +111,17 @@ func (manager *CaptureManagerCtx) StartStream() { manager.logger.Info().Msgf("starting stream pipelines") - manager.Video().Start() - manager.Audio().Start() + var err error + err = manager.Video().Start() + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to start video pipeline") + } + + err = manager.Audio().Start() + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to start audio pipeline") + } + manager.streaming = true } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 8b210b7c..c092d3c4 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -147,9 +147,11 @@ func (manager *ScreencastManagerCtx) createPipeline() error { return err } - manager.pipeline.Start() - manager.logger.Info().Msgf("starting pipeline") + manager.logger.Info(). + Str("src", manager.pipeline.Src). + Msgf("starting pipeline") + manager.pipeline.Start() manager.sample = manager.pipeline.Sample manager.emitUpdate <-true return nil diff --git a/internal/capture/stream.go b/internal/capture/stream.go index b98722a4..e390377d 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -75,9 +75,14 @@ func (manager *StreamManagerCtx) OnSample(listener func(sample types.Sample)) { }) } -func (manager *StreamManagerCtx) Start() { +func (manager *StreamManagerCtx) Start() error { + err := manager.createPipeline() + if err != nil { + return err + } + manager.enabled = true - manager.createPipeline() + return nil } func (manager *StreamManagerCtx) Stop() { diff --git a/internal/types/capture.go b/internal/types/capture.go index 0fa0737d..9a979e5e 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -25,7 +25,7 @@ type StreamManager interface { Codec() codec.RTPCodec OnSample(listener func(sample Sample)) - Start() + Start() error Stop() Enabled() bool } From 3515c670457d8fcfc76bf4d0b0e5b3f17f0cb23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 12:49:02 +0100 Subject: [PATCH 335/876] capture add mutexes. --- internal/capture/broadcast.go | 15 +++++++++++++++ internal/capture/screencast.go | 14 +++++++++----- internal/capture/stream.go | 11 +++++++++++ 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 10ad3574..d481b07c 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -1,6 +1,9 @@ package capture import ( + "fmt" + "sync" + "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -10,6 +13,7 @@ import ( type BroacastManagerCtx struct { logger zerolog.Logger + mu sync.Mutex config *config.Capture pipeline *gst.Pipeline enabled bool @@ -19,6 +23,7 @@ type BroacastManagerCtx struct { func broadcastNew(config *config.Capture) *BroacastManagerCtx { return &BroacastManagerCtx{ logger: log.With().Str("module", "capture").Str("submodule", "broadcast").Logger(), + mu: sync.Mutex{}, config: config, enabled: false, url: "", @@ -32,6 +37,9 @@ func (manager *BroacastManagerCtx) shutdown() { } func (manager *BroacastManagerCtx) Start(url string) error { + manager.mu.Lock() + defer manager.mu.Unlock() + err := manager.createPipeline() if err != nil { return err @@ -43,6 +51,9 @@ func (manager *BroacastManagerCtx) Start(url string) error { } func (manager *BroacastManagerCtx) Stop() { + manager.mu.Lock() + defer manager.mu.Unlock() + manager.enabled = false manager.destroyPipeline() } @@ -56,6 +67,10 @@ func (manager *BroacastManagerCtx) Url() string { } func (manager *BroacastManagerCtx) createPipeline() error { + if manager.pipeline != nil { + return fmt.Errorf("pipeline already running") + } + var err error manager.logger.Info(). diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index c092d3c4..bbac4766 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -107,6 +107,9 @@ func (manager *ScreencastManagerCtx) Image() ([]byte, error) { } func (manager *ScreencastManagerCtx) start() error { + manager.mu.Lock() + defer manager.mu.Unlock() + if !manager.enabled { return fmt.Errorf("screenshot pipeline not enabled") } @@ -121,13 +124,17 @@ func (manager *ScreencastManagerCtx) start() error { } func (manager *ScreencastManagerCtx) stop() { + manager.mu.Lock() + defer manager.mu.Unlock() + manager.started = false manager.destroyPipeline() } func (manager *ScreencastManagerCtx) createPipeline() error { - manager.mu.Lock() - defer manager.mu.Unlock() + if manager.pipeline != nil { + return fmt.Errorf("pipeline already running") + } var err error @@ -158,9 +165,6 @@ func (manager *ScreencastManagerCtx) createPipeline() error { } func (manager *ScreencastManagerCtx) destroyPipeline() { - manager.mu.Lock() - defer manager.mu.Unlock() - if manager.pipeline == nil { return } diff --git a/internal/capture/stream.go b/internal/capture/stream.go index e390377d..b374b032 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -1,6 +1,7 @@ package capture import ( + "fmt" "sync" "github.com/kataras/go-events" @@ -76,6 +77,9 @@ func (manager *StreamManagerCtx) OnSample(listener func(sample types.Sample)) { } func (manager *StreamManagerCtx) Start() error { + manager.mu.Lock() + defer manager.mu.Unlock() + err := manager.createPipeline() if err != nil { return err @@ -86,6 +90,9 @@ func (manager *StreamManagerCtx) Start() error { } func (manager *StreamManagerCtx) Stop() { + manager.mu.Lock() + defer manager.mu.Unlock() + manager.enabled = false manager.destroyPipeline() } @@ -95,6 +102,10 @@ func (manager *StreamManagerCtx) Enabled() bool { } func (manager *StreamManagerCtx) createPipeline() error { + if manager.pipeline != nil { + return fmt.Errorf("pipeline already running") + } + var err error codec := manager.Codec() From 18b6fa0a032bc17ad7b0f7367875ba788ccc80c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 13:58:02 +0100 Subject: [PATCH 336/876] remove config from capture managers. --- internal/capture/broadcast.go | 47 +++++++++++-------------- internal/capture/gst/gst.go | 53 +++++++++++++--------------- internal/capture/manager.go | 49 +++++++++++++++++++++----- internal/capture/screencast.go | 64 +++++++++++++--------------------- internal/capture/stream.go | 52 ++++++++++++--------------- 5 files changed, 133 insertions(+), 132 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index d481b07c..e28ac174 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -3,30 +3,29 @@ package capture import ( "fmt" "sync" + "strings" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" "demodesk/neko/internal/capture/gst" ) type BroacastManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - config *config.Capture - pipeline *gst.Pipeline - enabled bool - url string + logger zerolog.Logger + mu sync.Mutex + pipelineStr string + pipeline *gst.Pipeline + enabled bool + url string } -func broadcastNew(config *config.Capture) *BroacastManagerCtx { +func broadcastNew(pipelineStr string) *BroacastManagerCtx { return &BroacastManagerCtx{ - logger: log.With().Str("module", "capture").Str("submodule", "broadcast").Logger(), - mu: sync.Mutex{}, - config: config, - enabled: false, - url: "", + logger: log.With().Str("module", "capture").Str("submodule", "broadcast").Logger(), + pipelineStr: pipelineStr, + enabled: false, + url: "", } } @@ -68,30 +67,24 @@ func (manager *BroacastManagerCtx) Url() string { func (manager *BroacastManagerCtx) createPipeline() error { if manager.pipeline != nil { - return fmt.Errorf("pipeline already running") + return fmt.Errorf("pipeline already exists") } var err error + // replace {url} with valid URL + pipelineStr := strings.Replace(manager.pipelineStr, "{url}", manager.url, 1) + manager.logger.Info(). - Str("audio_device", manager.config.Device). - Str("video_display", manager.config.Display). - Str("broadcast_pipeline", manager.config.BroadcastPipeline). - Msgf("creating pipeline") - - manager.pipeline, err = gst.CreateRTMPPipeline( - manager.config.Device, - manager.config.Display, - manager.config.BroadcastPipeline, - manager.url, - ) + Str("str", pipelineStr). + Msgf("starting pipeline") + manager.pipeline, err = gst.CreatePipeline(pipelineStr) if err != nil { return err } manager.pipeline.Play() - manager.logger.Info().Msgf("starting pipeline") return nil } @@ -101,6 +94,6 @@ func (manager *BroacastManagerCtx) destroyPipeline() { } manager.pipeline.Stop() - manager.logger.Info().Msgf("stopping pipeline") + manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil } diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 48a17ba7..c439528c 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -39,35 +39,36 @@ func init() { registry = C.gst_registry_get() } -// CreateRTMPPipeline creates a GStreamer Pipeline -func CreateRTMPPipeline(pipelineDevice string, pipelineDisplay string, pipelineSrc string, pipelineRTMP string) (*Pipeline, error) { - video := fmt.Sprintf(videoSrc, pipelineDisplay) - audio := fmt.Sprintf(audioSrc, pipelineDevice) +func GetRTMPPipeline(audioDevice string, videoDisplay string, pipelineSrc string) string { + video := fmt.Sprintf(videoSrc, videoDisplay) + audio := fmt.Sprintf(audioSrc, audioDevice) var pipelineStr string if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc, pipelineRTMP, pipelineDevice, pipelineDisplay) + pipelineStr = fmt.Sprintf(pipelineSrc, audioDevice, videoDisplay) } else { - pipelineStr = fmt.Sprintf("flvmux name=mux ! rtmpsink location='%s live=1' %s audio/x-raw,channels=2 ! audioconvert ! voaacenc ! mux. %s x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! mux.", pipelineRTMP, audio, video) + pipelineStr = fmt.Sprintf("flvmux name=mux ! rtmpsink location='{url} live=1' %s audio/x-raw,channels=2 ! audioconvert ! voaacenc ! mux. %s x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! mux.", audio, video) } - return CreatePipeline(pipelineStr) + return pipelineStr } -// CreateJPEGPipeline creates a GStreamer Pipeline -func CreateJPEGPipeline(pipelineDisplay string, pipelineSrc string, rate string, quality string) (*Pipeline, error) { +func GetJPEGPipeline(videoDisplay string, pipelineSrc string, rate string, quality string) string { var pipelineStr string if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc, pipelineDisplay) + pipelineStr = fmt.Sprintf(pipelineSrc, videoDisplay) } else { - pipelineStr = fmt.Sprintf("ximagesrc display-name=%s show-pointer=true use-damage=false ! videoconvert ! videoscale ! videorate ! video/x-raw,framerate=%s ! jpegenc quality=%s" + appSink, pipelineDisplay, rate, quality) + pipelineStr = fmt.Sprintf("ximagesrc display-name=%s show-pointer=true use-damage=false ! videoconvert ! videoscale ! videorate ! video/x-raw,framerate=%s ! jpegenc quality=%s" + appSink, videoDisplay, rate, quality) } - return CreatePipeline(pipelineStr) + return pipelineStr } -// CreateAppPipeline creates a GStreamer Pipeline -func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineSrc string) (*Pipeline, error) { +func GetAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineSrc string) (string, error) { + if pipelineSrc != "" { + return fmt.Sprintf(pipelineSrc + appSink, pipelineDevice), nil + } + var pipelineStr string switch codecRTP.Name { @@ -75,7 +76,7 @@ func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineS // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html // gstreamer1.0-plugins-good if err := CheckPlugins([]string{"ximagesrc", "vpx"}); err != nil { - return nil, err + return "", err } pipelineStr = fmt.Sprintf(videoSrc + "vp8enc cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20" + appSink, pipelineDevice) @@ -83,14 +84,14 @@ func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineS // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html // gstreamer1.0-plugins-good if err := CheckPlugins([]string{"ximagesrc", "vpx"}); err != nil { - return nil, err + return "", err } pipelineStr = fmt.Sprintf(videoSrc + "vp9enc cpu-used=16 threads=4 deadline=1 keyframe-max-dist=15 static-threshold=20" + appSink, pipelineDevice) case "h264": var err error if err = CheckPlugins([]string{"ximagesrc"}); err != nil { - return nil, err + return "", err } // https://gstreamer.freedesktop.org/documentation/x264/index.html @@ -107,12 +108,12 @@ func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineS break } - return nil, err + return "", err case "opus": // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html // gstreamer1.0-plugins-base if err := CheckPlugins([]string{"pulseaudio", "opus"}); err != nil { - return nil, err + return "", err } pipelineStr = fmt.Sprintf(audioSrc + "opusenc bitrate=128000" + appSink, pipelineDevice) @@ -120,7 +121,7 @@ func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineS // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html // gstreamer1.0-libav if err := CheckPlugins([]string{"pulseaudio", "libav"}); err != nil { - return nil, err + return "", err } pipelineStr = fmt.Sprintf(audioSrc + "avenc_g722" + appSink, pipelineDevice) @@ -128,7 +129,7 @@ func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineS // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html // gstreamer1.0-plugins-good if err := CheckPlugins([]string{"pulseaudio", "mulaw"}); err != nil { - return nil, err + return "", err } pipelineStr = fmt.Sprintf(audioSrc + "audio/x-raw, rate=8000 ! mulawenc" + appSink, pipelineDevice) @@ -136,19 +137,15 @@ func CreateAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineS // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html // gstreamer1.0-plugins-good if err := CheckPlugins([]string{"pulseaudio", "alaw"}); err != nil { - return nil, err + return "", err } pipelineStr = fmt.Sprintf(audioSrc + "audio/x-raw, rate=8000 ! alawenc" + appSink, pipelineDevice) default: - return nil, fmt.Errorf("unknown codec %s", codecRTP.Name) + return "", fmt.Errorf("unknown codec %s", codecRTP.Name) } - if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc + appSink, pipelineDevice) - } - - return CreatePipeline(pipelineStr) + return pipelineStr, nil } // CreatePipeline creates a GStreamer Pipeline diff --git a/internal/capture/manager.go b/internal/capture/manager.go index e729aab2..a75434af 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -8,12 +8,12 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/config" + "demodesk/neko/internal/capture/gst" ) type CaptureManagerCtx struct { logger zerolog.Logger mu sync.Mutex - config *config.Capture desktop types.DesktopManager streaming bool broadcast *BroacastManagerCtx @@ -23,16 +23,49 @@ type CaptureManagerCtx struct { } func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { + logger := log.With().Str("module", "capture").Logger() + + broadcastPipeline := gst.GetRTMPPipeline( + config.Device, + config.Display, + config.BroadcastPipeline, + ) + + screencastPipeline := gst.GetJPEGPipeline( + config.Display, + config.ScreencastPipeline, + config.ScreencastRate, + config.ScreencastQuality, + ) + + audioPipeline, err := gst.GetAppPipeline( + config.AudioCodec, + config.Device, + config.AudioParams, + ) + + if err != nil { + logger.Panic().Err(err).Msg("unable to get pipeline") + } + + videoPipeline, err := gst.GetAppPipeline( + config.VideoCodec, + config.Display, + config.VideoParams, + ) + + if err != nil { + logger.Panic().Err(err).Msg("unable to get pipeline") + } + return &CaptureManagerCtx{ - logger: log.With().Str("module", "capture").Logger(), - mu: sync.Mutex{}, - config: config, + logger: logger, desktop: desktop, streaming: false, - broadcast: broadcastNew(config), - screencast: screencastNew(config), - audio: streamNew(config.AudioCodec, config.Device, config.AudioParams), - video: streamNew(config.VideoCodec, config.Display, config.VideoParams), + broadcast: broadcastNew(broadcastPipeline), + screencast: screencastNew(config.Screencast, screencastPipeline), + audio: streamNew(config.AudioCodec, audioPipeline), + video: streamNew(config.VideoCodec, videoPipeline), } } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index bbac4766..cfce69f9 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -9,41 +9,38 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" "demodesk/neko/internal/types" "demodesk/neko/internal/capture/gst" ) type ScreencastManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - config *config.Capture - pipeline *gst.Pipeline - enabled bool - started bool - emitStop chan bool - emitUpdate chan bool - expired int32 - sample chan types.Sample - image types.Sample + logger zerolog.Logger + mu sync.Mutex + pipelineStr string + pipeline *gst.Pipeline + enabled bool + started bool + emitStop chan bool + emitUpdate chan bool + expired int32 + sample chan types.Sample + image types.Sample } -func screencastNew(config *config.Capture) *ScreencastManagerCtx { - manager := &ScreencastManagerCtx{ - logger: log.With().Str("module", "capture").Str("submodule", "screencast").Logger(), - config: config, - enabled: config.Screencast, - started: false, - emitStop: make(chan bool), - emitUpdate: make(chan bool), - } +const screencastTimeout = 5 * time.Second - if !manager.enabled { - return manager +func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { + manager := &ScreencastManagerCtx{ + logger: log.With().Str("module", "capture").Str("submodule", "screencast").Logger(), + pipelineStr: pipelineStr, + enabled: enabled, + started: false, + emitStop: make(chan bool), + emitUpdate: make(chan bool), } go func() { - ticker := time.NewTicker(5 * time.Second) + ticker := time.NewTicker(screencastTimeout) manager.logger.Debug().Msg("started emitting samples") for { @@ -133,31 +130,20 @@ func (manager *ScreencastManagerCtx) stop() { func (manager *ScreencastManagerCtx) createPipeline() error { if manager.pipeline != nil { - return fmt.Errorf("pipeline already running") + return fmt.Errorf("pipeline already exists") } var err error manager.logger.Info(). - Str("video_display", manager.config.Display). - Str("screencast_pipeline", manager.config.ScreencastPipeline). + Str("str", manager.pipelineStr). Msgf("creating pipeline") - manager.pipeline, err = gst.CreateJPEGPipeline( - manager.config.Display, - manager.config.ScreencastPipeline, - manager.config.ScreencastRate, - manager.config.ScreencastQuality, - ) - + manager.pipeline, err = gst.CreatePipeline(manager.pipelineStr) if err != nil { return err } - manager.logger.Info(). - Str("src", manager.pipeline.Src). - Msgf("starting pipeline") - manager.pipeline.Start() manager.sample = manager.pipeline.Sample manager.emitUpdate <-true @@ -170,6 +156,6 @@ func (manager *ScreencastManagerCtx) destroyPipeline() { } manager.pipeline.Stop() - manager.logger.Info().Msgf("stopping pipeline") + manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil } diff --git a/internal/capture/stream.go b/internal/capture/stream.go index b374b032..5c7df80e 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -14,30 +14,27 @@ import ( ) type StreamManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - codec codec.RTPCodec - pipelineDevice string - pipelineSrc string - pipeline *gst.Pipeline - sample chan types.Sample - emmiter events.EventEmmiter - emitUpdate chan bool - emitStop chan bool - enabled bool + logger zerolog.Logger + mu sync.Mutex + codec codec.RTPCodec + pipelineStr string + pipeline *gst.Pipeline + sample chan types.Sample + emmiter events.EventEmmiter + emitUpdate chan bool + emitStop chan bool + enabled bool } -func streamNew(codec codec.RTPCodec, pipelineDevice string, pipelineSrc string) *StreamManagerCtx { +func streamNew(codec codec.RTPCodec, pipelineStr string) *StreamManagerCtx { manager := &StreamManagerCtx{ - logger: log.With().Str("module", "capture").Str("submodule", "stream").Logger(), - mu: sync.Mutex{}, - codec: codec, - pipelineDevice: pipelineDevice, - pipelineSrc: pipelineSrc, - emmiter: events.New(), - emitUpdate: make(chan bool), - emitStop: make(chan bool), - enabled: false, + logger: log.With().Str("module", "capture").Str("submodule", "stream").Logger(), + codec: codec, + pipelineStr: pipelineStr, + emmiter: events.New(), + emitUpdate: make(chan bool), + emitStop: make(chan bool), + enabled: false, } go func() { @@ -103,7 +100,7 @@ func (manager *StreamManagerCtx) Enabled() bool { func (manager *StreamManagerCtx) createPipeline() error { if manager.pipeline != nil { - return fmt.Errorf("pipeline already running") + return fmt.Errorf("pipeline already exists") } var err error @@ -111,19 +108,14 @@ func (manager *StreamManagerCtx) createPipeline() error { codec := manager.Codec() manager.logger.Info(). Str("codec", codec.Name). - Str("device", manager.pipelineDevice). - Str("src", manager.pipelineSrc). + Str("src", manager.pipelineStr). Msgf("creating pipeline") - manager.pipeline, err = gst.CreateAppPipeline(codec, manager.pipelineDevice, manager.pipelineSrc) + manager.pipeline, err = gst.CreatePipeline(manager.pipelineStr) if err != nil { return err } - manager.logger.Info(). - Str("src", manager.pipeline.Src). - Msgf("starting pipeline") - manager.pipeline.Start() manager.sample = manager.pipeline.Sample @@ -137,6 +129,6 @@ func (manager *StreamManagerCtx) destroyPipeline() { } manager.pipeline.Stop() - manager.logger.Info().Msgf("stopping pipeline") + manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil } From 36b7eca43c312372b594fd6a25d30407340aa1f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 14:03:53 +0100 Subject: [PATCH 337/876] name confusion Enabled -> Started. --- internal/api/room/broadcast.go | 10 +++++----- internal/capture/broadcast.go | 12 ++++++------ internal/capture/manager.go | 10 +++++----- internal/capture/stream.go | 12 ++++++------ internal/types/capture.go | 4 ++-- internal/websocket/handler/system.go | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index 21a14b90..a8f7e84c 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -16,7 +16,7 @@ type BroadcastStatusPayload struct { func (h *RoomHandler) broadcastStatus(w http.ResponseWriter, r *http.Request) { broadcast := h.capture.Broadcast() utils.HttpSuccess(w, BroadcastStatusPayload{ - IsActive: broadcast.Enabled(), + IsActive: broadcast.Started(), URL: broadcast.Url(), }) } @@ -33,7 +33,7 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { } broadcast := h.capture.Broadcast() - if broadcast.Enabled() { + if broadcast.Started() { utils.HttpUnprocessableEntity(w, "Server is already broadcasting.") return } @@ -46,7 +46,7 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { h.sessions.AdminBroadcast( message.BroadcastStatus{ Event: event.BORADCAST_STATUS, - IsActive: broadcast.Enabled(), + IsActive: broadcast.Started(), URL: broadcast.Url(), }, nil) @@ -55,7 +55,7 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { broadcast := h.capture.Broadcast() - if !broadcast.Enabled() { + if !broadcast.Started() { utils.HttpUnprocessableEntity(w, "Server is not broadcasting.") return } @@ -65,7 +65,7 @@ func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { h.sessions.AdminBroadcast( message.BroadcastStatus{ Event: event.BORADCAST_STATUS, - IsActive: broadcast.Enabled(), + IsActive: broadcast.Started(), URL: broadcast.Url(), }, nil) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index e28ac174..7bcce951 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -16,7 +16,7 @@ type BroacastManagerCtx struct { mu sync.Mutex pipelineStr string pipeline *gst.Pipeline - enabled bool + started bool url string } @@ -24,7 +24,7 @@ func broadcastNew(pipelineStr string) *BroacastManagerCtx { return &BroacastManagerCtx{ logger: log.With().Str("module", "capture").Str("submodule", "broadcast").Logger(), pipelineStr: pipelineStr, - enabled: false, + started: false, url: "", } } @@ -45,7 +45,7 @@ func (manager *BroacastManagerCtx) Start(url string) error { } manager.url = url - manager.enabled = true + manager.started = true return nil } @@ -53,12 +53,12 @@ func (manager *BroacastManagerCtx) Stop() { manager.mu.Lock() defer manager.mu.Unlock() - manager.enabled = false + manager.started = false manager.destroyPipeline() } -func (manager *BroacastManagerCtx) Enabled() bool { - return manager.enabled +func (manager *BroacastManagerCtx) Started() bool { + return manager.started } func (manager *BroacastManagerCtx) Url() string { diff --git a/internal/capture/manager.go b/internal/capture/manager.go index a75434af..f551c641 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -70,18 +70,18 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt } func (manager *CaptureManagerCtx) Start() { - if manager.broadcast.Enabled() { + if manager.broadcast.Started() { if err := manager.broadcast.createPipeline(); err != nil { manager.logger.Panic().Err(err).Msg("unable to create broadcast pipeline") } } manager.desktop.OnBeforeScreenSizeChange(func() { - if manager.video.Enabled() { + if manager.video.Started() { manager.video.destroyPipeline() } - if manager.broadcast.Enabled() { + if manager.broadcast.Started() { manager.broadcast.destroyPipeline() } @@ -91,13 +91,13 @@ func (manager *CaptureManagerCtx) Start() { }) manager.desktop.OnAfterScreenSizeChange(func() { - if manager.video.Enabled() { + if manager.video.Started() { if err := manager.video.createPipeline(); err != nil { manager.logger.Panic().Err(err).Msg("unable to recreate video pipeline") } } - if manager.broadcast.Enabled() { + if manager.broadcast.Started() { if err := manager.broadcast.createPipeline(); err != nil { manager.logger.Panic().Err(err).Msg("unable to recreate broadcast pipeline") } diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 5c7df80e..1a34cbc7 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -23,7 +23,7 @@ type StreamManagerCtx struct { emmiter events.EventEmmiter emitUpdate chan bool emitStop chan bool - enabled bool + started bool } func streamNew(codec codec.RTPCodec, pipelineStr string) *StreamManagerCtx { @@ -34,7 +34,7 @@ func streamNew(codec codec.RTPCodec, pipelineStr string) *StreamManagerCtx { emmiter: events.New(), emitUpdate: make(chan bool), emitStop: make(chan bool), - enabled: false, + started: false, } go func() { @@ -82,7 +82,7 @@ func (manager *StreamManagerCtx) Start() error { return err } - manager.enabled = true + manager.started = true return nil } @@ -90,12 +90,12 @@ func (manager *StreamManagerCtx) Stop() { manager.mu.Lock() defer manager.mu.Unlock() - manager.enabled = false + manager.started = false manager.destroyPipeline() } -func (manager *StreamManagerCtx) Enabled() bool { - return manager.enabled +func (manager *StreamManagerCtx) Started() bool { + return manager.started } func (manager *StreamManagerCtx) createPipeline() error { diff --git a/internal/types/capture.go b/internal/types/capture.go index 9a979e5e..7cde4ed4 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -11,7 +11,7 @@ type Sample media.Sample type BroadcastManager interface { Start(url string) error Stop() - Enabled() bool + Started() bool Url() string } @@ -27,7 +27,7 @@ type StreamManager interface { Start() error Stop() - Enabled() bool + Started() bool } type CaptureManager interface { diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index ae82707c..fe1ea104 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -81,7 +81,7 @@ func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { Event: event.SYSTEM_ADMIN, ScreenSizesList: screenSizesList, BroadcastStatus: message.BroadcastStatus{ - IsActive: broadcast.Enabled(), + IsActive: broadcast.Started(), URL: broadcast.Url(), }, }) From ebd7e7c065007c0ec0a77e3d25bddaf755025b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 15:10:41 +0100 Subject: [PATCH 338/876] move gst pipelines to codec. --- internal/capture/gst/gst.go | 121 --------------------------------- internal/capture/manager.go | 80 ++++++++++++++-------- internal/config/capture.go | 28 ++++---- internal/types/codec/codecs.go | 25 +++++++ 4 files changed, 92 insertions(+), 162 deletions(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index c439528c..33ffe629 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -13,10 +13,8 @@ import ( "unsafe" "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" ) -// Pipeline is a wrapper for a GStreamer Pipeline type Pipeline struct { Pipeline *C.GstElement Sample chan types.Sample @@ -28,127 +26,11 @@ var pipelines = make(map[int]*Pipeline) var pipelinesLock sync.Mutex var registry *C.GstRegistry -const ( - videoSrc = "ximagesrc display-name=%s show-pointer=false use-damage=false ! video/x-raw ! videoconvert ! queue ! " - audioSrc = "pulsesrc device=%s ! audio/x-raw,channels=2 ! audioconvert ! " - appSink = " ! appsink name=appsink" -) - func init() { C.gstreamer_init() registry = C.gst_registry_get() } -func GetRTMPPipeline(audioDevice string, videoDisplay string, pipelineSrc string) string { - video := fmt.Sprintf(videoSrc, videoDisplay) - audio := fmt.Sprintf(audioSrc, audioDevice) - - var pipelineStr string - if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc, audioDevice, videoDisplay) - } else { - pipelineStr = fmt.Sprintf("flvmux name=mux ! rtmpsink location='{url} live=1' %s audio/x-raw,channels=2 ! audioconvert ! voaacenc ! mux. %s x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! mux.", audio, video) - } - - return pipelineStr -} - -func GetJPEGPipeline(videoDisplay string, pipelineSrc string, rate string, quality string) string { - var pipelineStr string - if pipelineSrc != "" { - pipelineStr = fmt.Sprintf(pipelineSrc, videoDisplay) - } else { - pipelineStr = fmt.Sprintf("ximagesrc display-name=%s show-pointer=true use-damage=false ! videoconvert ! videoscale ! videorate ! video/x-raw,framerate=%s ! jpegenc quality=%s" + appSink, videoDisplay, rate, quality) - } - - return pipelineStr -} - -func GetAppPipeline(codecRTP codec.RTPCodec, pipelineDevice string, pipelineSrc string) (string, error) { - if pipelineSrc != "" { - return fmt.Sprintf(pipelineSrc + appSink, pipelineDevice), nil - } - - var pipelineStr string - - switch codecRTP.Name { - case "vp8": - // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html - // gstreamer1.0-plugins-good - if err := CheckPlugins([]string{"ximagesrc", "vpx"}); err != nil { - return "", err - } - - pipelineStr = fmt.Sprintf(videoSrc + "vp8enc cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20" + appSink, pipelineDevice) - case "vp9": - // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html - // gstreamer1.0-plugins-good - if err := CheckPlugins([]string{"ximagesrc", "vpx"}); err != nil { - return "", err - } - - pipelineStr = fmt.Sprintf(videoSrc + "vp9enc cpu-used=16 threads=4 deadline=1 keyframe-max-dist=15 static-threshold=20" + appSink, pipelineDevice) - case "h264": - var err error - if err = CheckPlugins([]string{"ximagesrc"}); err != nil { - return "", err - } - - // https://gstreamer.freedesktop.org/documentation/x264/index.html - // gstreamer1.0-plugins-ugly - if err = CheckPlugins([]string{"x264"}); err == nil { - pipelineStr = fmt.Sprintf(videoSrc + "video/x-raw,format=I420 ! x264enc threads=4 bitrate=4096 key-int-max=15 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream" + appSink, pipelineDevice) - break - } - - // https://gstreamer.freedesktop.org/documentation/openh264/openh264enc.html - // gstreamer1.0-plugins-bad - if err = CheckPlugins([]string{"openh264"}); err == nil { - pipelineStr = fmt.Sprintf(videoSrc + "openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream" + appSink, pipelineDevice) - break - } - - return "", err - case "opus": - // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html - // gstreamer1.0-plugins-base - if err := CheckPlugins([]string{"pulseaudio", "opus"}); err != nil { - return "", err - } - - pipelineStr = fmt.Sprintf(audioSrc + "opusenc bitrate=128000" + appSink, pipelineDevice) - case "g722": - // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html - // gstreamer1.0-libav - if err := CheckPlugins([]string{"pulseaudio", "libav"}); err != nil { - return "", err - } - - pipelineStr = fmt.Sprintf(audioSrc + "avenc_g722" + appSink, pipelineDevice) - case "pcmu": - // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html - // gstreamer1.0-plugins-good - if err := CheckPlugins([]string{"pulseaudio", "mulaw"}); err != nil { - return "", err - } - - pipelineStr = fmt.Sprintf(audioSrc + "audio/x-raw, rate=8000 ! mulawenc" + appSink, pipelineDevice) - case "pcma": - // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html - // gstreamer1.0-plugins-good - if err := CheckPlugins([]string{"pulseaudio", "alaw"}); err != nil { - return "", err - } - - pipelineStr = fmt.Sprintf(audioSrc + "audio/x-raw, rate=8000 ! alawenc" + appSink, pipelineDevice) - default: - return "", fmt.Errorf("unknown codec %s", codecRTP.Name) - } - - return pipelineStr, nil -} - -// CreatePipeline creates a GStreamer Pipeline func CreatePipeline(pipelineStr string) (*Pipeline, error) { pipelineStrUnsafe := C.CString(pipelineStr) defer C.free(unsafe.Pointer(pipelineStrUnsafe)) @@ -177,17 +59,14 @@ func CreatePipeline(pipelineStr string) (*Pipeline, error) { return p, nil } -// Start starts the GStreamer Pipeline func (p *Pipeline) Start() { C.gstreamer_send_start_pipeline(p.Pipeline, C.int(p.id)) } -// Play starts the GStreamer Pipeline func (p *Pipeline) Play() { C.gstreamer_send_play_pipeline(p.Pipeline) } -// Stop stops the GStreamer Pipeline func (p *Pipeline) Stop() { C.gstreamer_send_stop_pipeline(p.Pipeline) } diff --git a/internal/capture/manager.go b/internal/capture/manager.go index f551c641..69408572 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -1,6 +1,7 @@ package capture import ( + "fmt" "sync" "github.com/rs/zerolog" @@ -8,7 +9,6 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/config" - "demodesk/neko/internal/capture/gst" ) type CaptureManagerCtx struct { @@ -25,37 +25,59 @@ type CaptureManagerCtx struct { func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { logger := log.With().Str("module", "capture").Logger() - broadcastPipeline := gst.GetRTMPPipeline( - config.Device, - config.Display, - config.BroadcastPipeline, - ) - - screencastPipeline := gst.GetJPEGPipeline( - config.Display, - config.ScreencastPipeline, - config.ScreencastRate, - config.ScreencastQuality, - ) - - audioPipeline, err := gst.GetAppPipeline( - config.AudioCodec, - config.Device, - config.AudioParams, - ) - - if err != nil { - logger.Panic().Err(err).Msg("unable to get pipeline") + broadcastPipeline := config.BroadcastPipeline + if broadcastPipeline == "" { + broadcastPipeline = fmt.Sprintf( + "flvmux name=mux ! rtmpsink location='{url} live=1' " + + "pulsesrc device=%s " + + "! audio/x-raw,channels=2 " + + "! audioconvert " + + "! queue " + + "! voaacenc " + + "! mux. " + + "ximagesrc display-name=%s show-pointer=true use-damage=false " + + "! video/x-raw " + + "! videoconvert " + + "! queue " + + "! x264enc threads=4 bitrate=4096 key-int-max=15 byte-stream=true byte-stream=true tune=zerolatency speed-preset=veryfast " + + "! mux.", config.Device, config.Display, + ) } - videoPipeline, err := gst.GetAppPipeline( - config.VideoCodec, - config.Display, - config.VideoParams, - ) + screencastPipeline := config.ScreencastPipeline + if screencastPipeline == "" { + screencastPipeline = fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=true use-damage=false " + + "! video/x-raw,framerate=%s " + + "! videoconvert " + + "! queue " + + "! jpegenc quality=%s " + + "! appsink name=appsink", config.Display, config.ScreencastRate, config.ScreencastQuality, + ) + } - if err != nil { - logger.Panic().Err(err).Msg("unable to get pipeline") + audioPipeline := config.AudioPipeline + if audioPipeline == "" { + audioPipeline = fmt.Sprintf( + "pulsesrc device=%s " + + "! audio/x-raw,channels=2 " + + "! audioconvert " + + "! queue " + + "! %s " + + "! appsink name=appsink", config.Device, config.AudioCodec.Pipeline, + ) + } + + videoPipeline := config.VideoPipeline + if videoPipeline == "" { + videoPipeline = fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=false use-damage=false " + + "! video/x-raw " + + "! videoconvert " + + "! queue " + + "! %s " + + "! appsink name=appsink", config.Display, config.VideoCodec.Pipeline, + ) } return &CaptureManagerCtx{ diff --git a/internal/config/capture.go b/internal/config/capture.go index 5c1334b0..0d87af6f 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -8,17 +8,19 @@ import ( ) type Capture struct { - Display string - Device string - AudioCodec codec.RTPCodec - AudioParams string - VideoCodec codec.RTPCodec - VideoParams string + Device string + AudioCodec codec.RTPCodec + AudioPipeline string - BroadcastPipeline string - Screencast bool - ScreencastRate string - ScreencastQuality string + Display string + VideoCodec codec.RTPCodec + VideoPipeline string + + BroadcastPipeline string + + Screencast bool + ScreencastRate string + ScreencastQuality string ScreencastPipeline string } @@ -139,12 +141,14 @@ func (s *Capture) Set() { s.Device = viper.GetString("device") s.AudioCodec = audioCodec - s.AudioParams = viper.GetString("audio") + s.AudioPipeline = viper.GetString("audio") + s.Display = viper.GetString("display") s.VideoCodec = videoCodec - s.VideoParams = viper.GetString("video") + s.VideoPipeline = viper.GetString("video") s.BroadcastPipeline = viper.GetString("broadcast_pipeline") + s.Screencast = viper.GetBool("screencast") s.ScreencastRate = viper.GetString("screencast_rate") s.ScreencastQuality = viper.GetString("screencast_quality") diff --git a/internal/types/codec/codecs.go b/internal/types/codec/codecs.go index e902dd10..023cbaca 100644 --- a/internal/types/codec/codecs.go +++ b/internal/types/codec/codecs.go @@ -7,6 +7,7 @@ type RTPCodec struct { PayloadType webrtc.PayloadType Type webrtc.RTPCodecType Capability webrtc.RTPCodecCapability + Pipeline string } func (codec *RTPCodec) Register(engine *webrtc.MediaEngine) error { @@ -28,6 +29,9 @@ func VP8() RTPCodec { SDPFmtpLine: "", RTCPFeedback: nil, }, + // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html + // gstreamer1.0-plugins-good + Pipeline: "vp8enc cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20", } } @@ -44,6 +48,9 @@ func VP9() RTPCodec { SDPFmtpLine: "profile-id=0", RTCPFeedback: nil, }, + // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html + // gstreamer1.0-plugins-good + Pipeline: "vp9enc cpu-used=16 threads=4 deadline=1 keyframe-max-dist=15 static-threshold=20", } } @@ -60,6 +67,12 @@ func H264() RTPCodec { SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", RTCPFeedback: nil, }, + // https://gstreamer.freedesktop.org/documentation/x264/index.html + // gstreamer1.0-plugins-ugly + Pipeline: "video/x-raw,format=I420 ! x264enc threads=4 bitrate=4096 key-int-max=15 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream", + // https://gstreamer.freedesktop.org/documentation/openh264/openh264enc.html + // gstreamer1.0-plugins-bad + //Pipeline: "openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream", } } @@ -75,6 +88,9 @@ func Opus() RTPCodec { SDPFmtpLine: "", RTCPFeedback: nil, }, + // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html + // gstreamer1.0-plugins-base + Pipeline: "opusenc bitrate=128000", } } @@ -90,6 +106,9 @@ func G722() RTPCodec { SDPFmtpLine: "", RTCPFeedback: nil, }, + // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html + // gstreamer1.0-libav + Pipeline: "avenc_g722", } } @@ -105,6 +124,9 @@ func PCMU() RTPCodec { SDPFmtpLine: "", RTCPFeedback: nil, }, + // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html + // gstreamer1.0-plugins-good + Pipeline: "audio/x-raw, rate=8000 ! mulawenc", } } @@ -120,5 +142,8 @@ func PCMA() RTPCodec { SDPFmtpLine: "", RTCPFeedback: nil, }, + // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html + // gstreamer1.0-plugins-good + Pipeline: "audio/x-raw, rate=8000 ! alawenc", } } From aa7a131da2af209451ebad4b03c13789cf0966e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 17:40:29 +0100 Subject: [PATCH 339/876] refactor single video track to an array. --- internal/capture/manager.go | 54 ++++++++++++++++++++---------- internal/types/capture.go | 3 +- internal/webrtc/manager.go | 66 +++++++++++++++++++++---------------- 3 files changed, 76 insertions(+), 47 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 69408572..51d95425 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -19,7 +19,8 @@ type CaptureManagerCtx struct { broadcast *BroacastManagerCtx screencast *ScreencastManagerCtx audio *StreamManagerCtx - video *StreamManagerCtx + videos map[string]*StreamManagerCtx + videoIDs []string } func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { @@ -87,7 +88,10 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt broadcast: broadcastNew(broadcastPipeline), screencast: screencastNew(config.Screencast, screencastPipeline), audio: streamNew(config.AudioCodec, audioPipeline), - video: streamNew(config.VideoCodec, videoPipeline), + videos: map[string]*StreamManagerCtx{ + "hq": streamNew(config.VideoCodec, videoPipeline), + }, + videoIDs: []string{ "hq" }, } } @@ -99,8 +103,10 @@ func (manager *CaptureManagerCtx) Start() { } manager.desktop.OnBeforeScreenSizeChange(func() { - if manager.video.Started() { - manager.video.destroyPipeline() + for _, video := range manager.videos { + if video.Started() { + video.destroyPipeline() + } } if manager.broadcast.Started() { @@ -113,9 +119,11 @@ func (manager *CaptureManagerCtx) Start() { }) manager.desktop.OnAfterScreenSizeChange(func() { - if manager.video.Started() { - if err := manager.video.createPipeline(); err != nil { - manager.logger.Panic().Err(err).Msg("unable to recreate video pipeline") + for _, video := range manager.videos { + if video.Started() { + if err := video.createPipeline(); err != nil { + manager.logger.Panic().Err(err).Msg("unable to recreate video pipeline") + } } } @@ -140,7 +148,11 @@ func (manager *CaptureManagerCtx) Shutdown() error { manager.screencast.shutdown() manager.audio.shutdown() - manager.video.shutdown() + + for _, video := range manager.videos { + video.shutdown() + } + return nil } @@ -156,8 +168,12 @@ func (manager *CaptureManagerCtx) Audio() types.StreamManager { return manager.audio } -func (manager *CaptureManagerCtx) Video() types.StreamManager { - return manager.video +func (manager *CaptureManagerCtx) Video(videoID string) types.StreamManager { + return manager.videos[videoID] +} + +func (manager *CaptureManagerCtx) VideoIDs() []string { + return manager.videoIDs } func (manager *CaptureManagerCtx) StartStream() { @@ -166,14 +182,13 @@ func (manager *CaptureManagerCtx) StartStream() { manager.logger.Info().Msgf("starting stream pipelines") - var err error - err = manager.Video().Start() - if err != nil { - manager.logger.Panic().Err(err).Msg("unable to start video pipeline") + for _, video := range manager.videos { + if err := video.Start(); err != nil { + manager.logger.Panic().Err(err).Msg("unable to start video pipeline") + } } - err = manager.Audio().Start() - if err != nil { + if err := manager.audio.Start(); err != nil { manager.logger.Panic().Err(err).Msg("unable to start audio pipeline") } @@ -186,8 +201,11 @@ func (manager *CaptureManagerCtx) StopStream() { manager.logger.Info().Msgf("stopping stream pipelines") - manager.Video().Stop() - manager.Audio().Stop() + for _, video := range manager.videos { + video.Stop() + } + + manager.audio.Stop() manager.streaming = false } diff --git a/internal/types/capture.go b/internal/types/capture.go index 7cde4ed4..575e52b6 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -37,7 +37,8 @@ type CaptureManager interface { Broadcast() BroadcastManager Screencast() ScreencastManager Audio() StreamManager - Video() StreamManager + Video(videoID string) StreamManager + VideoIDs() []string StartStream() StopStream() diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index f8e0f0a2..912b8a67 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -19,52 +19,59 @@ import ( func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ - logger: log.With().Str("module", "webrtc").Logger(), - videoCodec: capture.Video().Codec(), - audioCodec: capture.Audio().Codec(), - desktop: desktop, - capture: capture, - config: config, + logger: log.With().Str("module", "webrtc").Logger(), + defaultVideoID: capture.VideoIDs()[0], + desktop: desktop, + capture: capture, + config: config, } } type WebRTCManagerCtx struct { - logger zerolog.Logger - videoTrack *webrtc.TrackLocalStaticSample - audioTrack *webrtc.TrackLocalStaticSample - videoCodec codec.RTPCodec - audioCodec codec.RTPCodec - desktop types.DesktopManager - capture types.CaptureManager - config *config.WebRTC + logger zerolog.Logger + videoTracks map[string]*webrtc.TrackLocalStaticSample + audioTrack *webrtc.TrackLocalStaticSample + defaultVideoID string + audioCodec codec.RTPCodec + desktop types.DesktopManager + capture types.CaptureManager + config *config.WebRTC } func (manager *WebRTCManagerCtx) Start() { var err error // create audio track - manager.audioTrack, err = webrtc.NewTrackLocalStaticSample(manager.audioCodec.Capability, "audio", "stream") + audio := manager.capture.Audio() + manager.audioTrack, err = webrtc.NewTrackLocalStaticSample(audio.Codec().Capability, "audio", "stream") if err != nil { manager.logger.Panic().Err(err).Msg("unable to create audio track") } - manager.capture.Audio().OnSample(func(sample types.Sample) { + audio.OnSample(func(sample types.Sample) { if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") } }) - // create video track - manager.videoTrack, err = webrtc.NewTrackLocalStaticSample(manager.videoCodec.Capability, "video", "stream") - if err != nil { - manager.logger.Panic().Err(err).Msg("unable to create video track") - } + videoIDs := manager.capture.VideoIDs() + manager.videoTracks = map[string]*webrtc.TrackLocalStaticSample{} + for _, videoID := range videoIDs { + video := manager.capture.Video(videoID) - manager.capture.Video().OnSample(func(sample types.Sample) { - if err := manager.videoTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { - manager.logger.Warn().Err(err).Msg("video pipeline failed to write") + track, err := webrtc.NewTrackLocalStaticSample(video.Codec().Capability, "video", "stream") + if err != nil { + manager.logger.Panic().Err(err).Msgf("unable to create video (%s) track", videoID) } - }) + + video.OnSample(func(sample types.Sample) { + if err := track.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { + manager.logger.Warn().Err(err).Msgf("video (%s) pipeline failed to write", videoID) + } + }) + + manager.videoTracks[videoID] = track + } manager.logger.Info(). Str("ice_lite", fmt.Sprintf("%t", manager.config.ICELite)). @@ -137,7 +144,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess return nil, err } - videoTransceiver, err := connection.AddTransceiverFromTrack(manager.videoTrack, webrtc.RtpTransceiverInit{ + videoTransceiver, err := connection.AddTransceiverFromTrack(manager.videoTracks[manager.defaultVideoID], webrtc.RtpTransceiverInit{ Direction: webrtc.RTPTransceiverDirectionSendonly, }) if err != nil { @@ -209,11 +216,14 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess func (manager *WebRTCManagerCtx) mediaEngine() (*webrtc.MediaEngine, error) { engine := &webrtc.MediaEngine{} - if err := manager.videoCodec.Register(engine); err != nil { + // all videos must have the same codec + videoCodec := manager.capture.Video(manager.defaultVideoID).Codec() + if err := videoCodec.Register(engine); err != nil { return nil, err } - if err := manager.audioCodec.Register(engine); err != nil { + audioCodec := manager.capture.Audio().Codec() + if err := audioCodec.Register(engine); err != nil { return nil, err } From f62d36ac4feddacfeb3c84655af64726cafa0403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 17:57:33 +0100 Subject: [PATCH 340/876] WebRTC SetVideoID. --- internal/types/webrtc.go | 1 + internal/webrtc/manager.go | 7 ++++--- internal/webrtc/peer.go | 17 +++++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 9c0bca3f..8564edcf 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -5,6 +5,7 @@ import "github.com/pion/webrtc/v3" type WebRTCPeer interface { SignalAnswer(sdp string) error SignalCandidate(candidate webrtc.ICECandidateInit) error + SetVideoID(videoID string) error Destroy() error } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 912b8a67..c854048c 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -137,7 +137,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess }) } - audioTransceiver, err := connection.AddTransceiverFromTrack(manager.audioTrack, webrtc.RtpTransceiverInit{ + _, err = connection.AddTransceiverFromTrack(manager.audioTrack, webrtc.RtpTransceiverInit{ Direction: webrtc.RTPTransceiverDirectionSendonly, }) if err != nil { @@ -151,7 +151,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess return nil, err } - if _, err := connection.CreateDataChannel("data", nil); err != nil { + _, err = connection.CreateDataChannel("data", nil) + if err != nil { return nil, err } @@ -206,7 +207,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess settings: settings, connection: connection, configuration: configuration, - audioTransceiver: audioTransceiver, + videoTracks: manager.videoTracks, videoTransceiver: videoTransceiver, }) diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index f4240cac..2c72e048 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -1,6 +1,10 @@ package webrtc -import "github.com/pion/webrtc/v3" +import ( + "fmt" + + "github.com/pion/webrtc/v3" +) type WebRTCPeerCtx struct { api *webrtc.API @@ -8,7 +12,7 @@ type WebRTCPeerCtx struct { settings *webrtc.SettingEngine connection *webrtc.PeerConnection configuration *webrtc.Configuration - audioTransceiver *webrtc.RTPTransceiver + videoTracks map[string]*webrtc.TrackLocalStaticSample videoTransceiver *webrtc.RTPTransceiver } @@ -23,11 +27,12 @@ func (webrtc_peer *WebRTCPeerCtx) SignalCandidate(candidate webrtc.ICECandidateI return webrtc_peer.connection.AddICECandidate(candidate) } -func (webrtc_peer *WebRTCPeerCtx) ReplaceAudioTrack(track webrtc.TrackLocal) error { - return webrtc_peer.audioTransceiver.Sender().ReplaceTrack(track) -} +func (webrtc_peer *WebRTCPeerCtx) SetVideoID(videoID string) error { + track, ok := webrtc_peer.videoTracks[videoID] + if !ok { + return fmt.Errorf("videoID not found in available tracks") + } -func (webrtc_peer *WebRTCPeerCtx) ReplaceVideoTrack(track webrtc.TrackLocal) error { return webrtc_peer.videoTransceiver.Sender().ReplaceTrack(track) } From 761f6d8a8f6ea8e76e57bee1e051fe62edd90521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 18:07:58 +0100 Subject: [PATCH 341/876] add Video error return. --- internal/capture/manager.go | 5 +++-- internal/types/capture.go | 2 +- internal/webrtc/manager.go | 13 +++++++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 51d95425..40570d73 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -168,8 +168,9 @@ func (manager *CaptureManagerCtx) Audio() types.StreamManager { return manager.audio } -func (manager *CaptureManagerCtx) Video(videoID string) types.StreamManager { - return manager.videos[videoID] +func (manager *CaptureManagerCtx) Video(videoID string) (types.StreamManager, bool) { + video, ok := manager.videos[videoID] + return video, ok } func (manager *CaptureManagerCtx) VideoIDs() []string { diff --git a/internal/types/capture.go b/internal/types/capture.go index 575e52b6..ead74036 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -37,7 +37,7 @@ type CaptureManager interface { Broadcast() BroadcastManager Screencast() ScreencastManager Audio() StreamManager - Video(videoID string) StreamManager + Video(videoID string) (StreamManager, bool) VideoIDs() []string StartStream() diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index c854048c..0b59c9cd 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -57,7 +57,11 @@ func (manager *WebRTCManagerCtx) Start() { videoIDs := manager.capture.VideoIDs() manager.videoTracks = map[string]*webrtc.TrackLocalStaticSample{} for _, videoID := range videoIDs { - video := manager.capture.Video(videoID) + video, ok := manager.capture.Video(videoID) + if !ok { + manager.logger.Warn().Str("videoID", videoID).Msg("video stream not found, skipping") + continue + } track, err := webrtc.NewTrackLocalStaticSample(video.Codec().Capability, "video", "stream") if err != nil { @@ -218,7 +222,12 @@ func (manager *WebRTCManagerCtx) mediaEngine() (*webrtc.MediaEngine, error) { engine := &webrtc.MediaEngine{} // all videos must have the same codec - videoCodec := manager.capture.Video(manager.defaultVideoID).Codec() + video, ok := manager.capture.Video(manager.defaultVideoID) + if !ok { + return nil, fmt.Errorf("default video track not found") + } + + videoCodec := video.Codec() if err := videoCodec.Register(engine); err != nil { return nil, err } From c81bca9b2fa6f3bc5b5ac3263c4c7039c64cad26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 18:14:45 +0100 Subject: [PATCH 342/876] session GetWebRTCPeer. --- internal/session/session.go | 17 ++--------------- internal/types/session.go | 9 ++------- internal/websocket/handler/signal.go | 16 ++++++++++++++-- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 1e607a1a..8b667a15 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -2,7 +2,6 @@ package session import ( "github.com/rs/zerolog" - "github.com/pion/webrtc/v3" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" @@ -189,18 +188,6 @@ func (session *SessionCtx) SetWebRTCConnected(connected bool) { } } -func (session *SessionCtx) SignalAnswer(sdp string) error { - if session.webrtc_peer == nil { - return nil - } - - return session.webrtc_peer.SignalAnswer(sdp) -} - -func (session *SessionCtx) SignalCandidate(candidate webrtc.ICECandidateInit) error { - if session.webrtc_peer == nil { - return nil - } - - return session.webrtc_peer.SignalCandidate(candidate) +func (session *SessionCtx) GetWebRTCPeer() types.WebRTCPeer { + return session.webrtc_peer } diff --git a/internal/types/session.go b/internal/types/session.go index 9c74d905..92a2feaa 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -1,10 +1,6 @@ package types -import ( - "net/http" - - "github.com/pion/webrtc/v3" -) +import "net/http" type MemberProfile struct { Secret string `json:"secret,omitempty"` @@ -61,8 +57,7 @@ type Session interface { // webrtc SetWebRTCPeer(webrtc_peer WebRTCPeer) SetWebRTCConnected(connected bool) - SignalAnswer(sdp string) error - SignalCandidate(candidate webrtc.ICECandidateInit) error + GetWebRTCPeer() WebRTCPeer } type SessionManager interface { diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index d7cfc62d..b85f78e8 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -26,9 +26,21 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { - return session.SignalAnswer(payload.SDP) + peer := session.GetWebRTCPeer() + if peer == nil { + h.logger.Debug().Msg("webRTC peer does not exist") + return nil + } + + return peer.SignalAnswer(payload.SDP) } func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *message.SignalCandidate) error { - return session.SignalCandidate(*payload.ICECandidateInit) + peer := session.GetWebRTCPeer() + if peer == nil { + h.logger.Debug().Msg("webRTC peer does not exist") + return nil + } + + return peer.SignalCandidate(*payload.ICECandidateInit) } From 6756114e3040a4ac67cf2e2b2f3eb1779cb29b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 5 Feb 2021 20:35:30 +0100 Subject: [PATCH 343/876] replace video track on demand. --- internal/types/event/events.go | 1 + internal/types/message/messages.go | 5 +++++ internal/webrtc/manager.go | 28 +++++++++++++-------------- internal/webrtc/peer.go | 16 +++++++-------- internal/websocket/handler/handler.go | 5 +++++ internal/websocket/handler/signal.go | 10 ++++++++++ 6 files changed, 42 insertions(+), 23 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 1f6cc26e..3d767960 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -11,6 +11,7 @@ const ( SIGNAL_ANSWER = "signal/answer" SIGNAL_PROVIDE = "signal/provide" SIGNAL_CANDIDATE = "signal/candidate" + SIGNAL_VIDEO = "signal/video" ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index fff6313b..7c6d7aaf 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -57,6 +57,11 @@ type SignalAnswer struct { SDP string `json:"sdp"` } +type SignalVideo struct { + Event string `json:"event,omitempty"` + VideoID string `json:"video_id"` +} + ///////////////////////////// // Member ///////////////////////////// diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 0b59c9cd..aaf9d81c 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -57,6 +57,8 @@ func (manager *WebRTCManagerCtx) Start() { videoIDs := manager.capture.VideoIDs() manager.videoTracks = map[string]*webrtc.TrackLocalStaticSample{} for _, videoID := range videoIDs { + videoID := videoID + video, ok := manager.capture.Video(videoID) if !ok { manager.logger.Warn().Str("videoID", videoID).Msg("video stream not found, skipping") @@ -65,12 +67,12 @@ func (manager *WebRTCManagerCtx) Start() { track, err := webrtc.NewTrackLocalStaticSample(video.Codec().Capability, "video", "stream") if err != nil { - manager.logger.Panic().Err(err).Msgf("unable to create video (%s) track", videoID) + manager.logger.Panic().Err(err).Str("videoID", videoID).Msg("unable to create video track") } video.OnSample(func(sample types.Sample) { if err := track.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { - manager.logger.Warn().Err(err).Msgf("video (%s) pipeline failed to write", videoID) + manager.logger.Warn().Err(err).Str("videoID", videoID).Msg("vide pipeline failed to write") } }) @@ -141,16 +143,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess }) } - _, err = connection.AddTransceiverFromTrack(manager.audioTrack, webrtc.RtpTransceiverInit{ - Direction: webrtc.RTPTransceiverDirectionSendonly, - }) + _, err = connection.AddTrack(manager.audioTrack) if err != nil { return nil, err } - videoTransceiver, err := connection.AddTransceiverFromTrack(manager.videoTracks[manager.defaultVideoID], webrtc.RtpTransceiverInit{ - Direction: webrtc.RTPTransceiverDirectionSendonly, - }) + videoSender, err := connection.AddTrack(manager.videoTracks[manager.defaultVideoID]) if err != nil { return nil, err } @@ -206,13 +204,13 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess }) session.SetWebRTCPeer(&WebRTCPeerCtx{ - api: api, - engine: engine, - settings: settings, - connection: connection, - configuration: configuration, - videoTracks: manager.videoTracks, - videoTransceiver: videoTransceiver, + api: api, + engine: engine, + settings: settings, + connection: connection, + configuration: configuration, + videoTracks: manager.videoTracks, + videoSender: videoSender, }) return connection.LocalDescription(), nil diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 2c72e048..284f1a10 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -7,13 +7,13 @@ import ( ) type WebRTCPeerCtx struct { - api *webrtc.API - engine *webrtc.MediaEngine - settings *webrtc.SettingEngine - connection *webrtc.PeerConnection - configuration *webrtc.Configuration - videoTracks map[string]*webrtc.TrackLocalStaticSample - videoTransceiver *webrtc.RTPTransceiver + api *webrtc.API + engine *webrtc.MediaEngine + settings *webrtc.SettingEngine + connection *webrtc.PeerConnection + configuration *webrtc.Configuration + videoTracks map[string]*webrtc.TrackLocalStaticSample + videoSender *webrtc.RTPSender } func (webrtc_peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { @@ -33,7 +33,7 @@ func (webrtc_peer *WebRTCPeerCtx) SetVideoID(videoID string) error { return fmt.Errorf("videoID not found in available tracks") } - return webrtc_peer.videoTransceiver.Sender().ReplaceTrack(track) + return webrtc_peer.videoSender.ReplaceTrack(track) } func (webrtc_peer *WebRTCPeerCtx) Destroy() error { diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 2a1ef34a..95e59c2f 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -59,6 +59,11 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { err = utils.Unmarshal(payload, raw, func() error { return h.signalCandidate(session, payload) }) + case event.SIGNAL_VIDEO: + payload := &message.SignalVideo{} + err = utils.Unmarshal(payload, raw, func() error { + return h.signalVideo(session, payload) + }) // Control Events case event.CONTROL_RELEASE: diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index b85f78e8..ecf25b56 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -44,3 +44,13 @@ func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *mess return peer.SignalCandidate(*payload.ICECandidateInit) } + +func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message.SignalVideo) error { + peer := session.GetWebRTCPeer() + if peer == nil { + h.logger.Debug().Msg("webRTC peer does not exist") + return nil + } + + return peer.SetVideoID(payload.VideoID) +} From f05889bd567a159930972d2eca206b929390acab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 6 Feb 2021 12:52:02 +0100 Subject: [PATCH 344/876] Capture stream: Add- and RemoveListener. --- internal/capture/stream.go | 31 +++++++++++++++++++++++-------- internal/types/capture.go | 3 ++- internal/webrtc/manager.go | 8 ++++++-- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 1a34cbc7..1fb615c6 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -3,8 +3,8 @@ package capture import ( "fmt" "sync" + "reflect" - "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -20,7 +20,8 @@ type StreamManagerCtx struct { pipelineStr string pipeline *gst.Pipeline sample chan types.Sample - emmiter events.EventEmmiter + listeners map[uintptr]func(sample types.Sample) + emitMu sync.Mutex emitUpdate chan bool emitStop chan bool started bool @@ -31,7 +32,7 @@ func streamNew(codec codec.RTPCodec, pipelineStr string) *StreamManagerCtx { logger: log.With().Str("module", "capture").Str("submodule", "stream").Logger(), codec: codec, pipelineStr: pipelineStr, - emmiter: events.New(), + listeners: map[uintptr]func(sample types.Sample){}, emitUpdate: make(chan bool), emitStop: make(chan bool), started: false, @@ -48,7 +49,11 @@ func streamNew(codec codec.RTPCodec, pipelineStr string) *StreamManagerCtx { case <-manager.emitUpdate: manager.logger.Debug().Msg("update emitting samples") case sample := <-manager.sample: - manager.emmiter.Emit("sample", sample) + manager.emitMu.Lock() + for _, emit := range manager.listeners { + emit(sample) + } + manager.emitMu.Unlock() } } }() @@ -67,10 +72,20 @@ func (manager *StreamManagerCtx) Codec() codec.RTPCodec { return manager.codec } -func (manager *StreamManagerCtx) OnSample(listener func(sample types.Sample)) { - manager.emmiter.On("sample", func(payload ...interface{}) { - listener(payload[0].(types.Sample)) - }) +func (manager *StreamManagerCtx) AddListener(listener func(sample types.Sample)) { + manager.emitMu.Lock() + defer manager.emitMu.Unlock() + + ptr := reflect.ValueOf(listener).Pointer() + manager.listeners[ptr] = listener +} + +func (manager *StreamManagerCtx) RemoveListener(listener func(sample types.Sample)) { + manager.emitMu.Lock() + defer manager.emitMu.Unlock() + + ptr := reflect.ValueOf(listener).Pointer() + delete(manager.listeners, ptr) } func (manager *StreamManagerCtx) Start() error { diff --git a/internal/types/capture.go b/internal/types/capture.go index ead74036..9527ec22 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -23,7 +23,8 @@ type ScreencastManager interface { type StreamManager interface { Codec() codec.RTPCodec - OnSample(listener func(sample Sample)) + AddListener(listener func(sample Sample)) + RemoveListener(listener func(sample Sample)) Start() error Stop() diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index aaf9d81c..e50699d5 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -48,7 +48,7 @@ func (manager *WebRTCManagerCtx) Start() { manager.logger.Panic().Err(err).Msg("unable to create audio track") } - audio.OnSample(func(sample types.Sample) { + audio.AddListener(func(sample types.Sample) { if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") } @@ -70,7 +70,7 @@ func (manager *WebRTCManagerCtx) Start() { manager.logger.Panic().Err(err).Str("videoID", videoID).Msg("unable to create video track") } - video.OnSample(func(sample types.Sample) { + video.AddListener(func(sample types.Sample) { if err := track.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Str("videoID", videoID).Msg("vide pipeline failed to write") } @@ -178,6 +178,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess } } + connection.OnNegotiationNeeded(func() { + logger.Warn().Msg("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!negotiation needed!") + }) + connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: From 5d66dcdb7b772c3e9e9204a467a8c3d5e153d9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 6 Feb 2021 12:59:57 +0100 Subject: [PATCH 345/876] unsubscribe listeners on shutdown. --- internal/webrtc/manager.go | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index e50699d5..17748467 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -31,6 +31,7 @@ type WebRTCManagerCtx struct { logger zerolog.Logger videoTracks map[string]*webrtc.TrackLocalStaticSample audioTrack *webrtc.TrackLocalStaticSample + unsubscribe []func() defaultVideoID string audioCodec codec.RTPCodec desktop types.DesktopManager @@ -48,10 +49,15 @@ func (manager *WebRTCManagerCtx) Start() { manager.logger.Panic().Err(err).Msg("unable to create audio track") } - audio.AddListener(func(sample types.Sample) { + listener := func(sample types.Sample) { if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") } + } + + audio.AddListener(listener) + manager.unsubscribe = append(manager.unsubscribe, func(){ + audio.RemoveListener(listener) }) videoIDs := manager.capture.VideoIDs() @@ -69,11 +75,16 @@ func (manager *WebRTCManagerCtx) Start() { if err != nil { manager.logger.Panic().Err(err).Str("videoID", videoID).Msg("unable to create video track") } - - video.AddListener(func(sample types.Sample) { + + listener := func(sample types.Sample) { if err := track.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Str("videoID", videoID).Msg("vide pipeline failed to write") } + } + + video.AddListener(listener) + manager.unsubscribe = append(manager.unsubscribe, func(){ + video.RemoveListener(listener) }) manager.videoTracks[videoID] = track @@ -90,6 +101,11 @@ func (manager *WebRTCManagerCtx) Start() { func (manager *WebRTCManagerCtx) Shutdown() error { manager.logger.Info().Msgf("webrtc shutting down") + + for _, unsubscribe := range manager.unsubscribe { + unsubscribe() + } + return nil } From 417a3d169228d7309c270436b4966e854738bd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 6 Feb 2021 17:05:25 +0100 Subject: [PATCH 346/876] stream listeners as pointers. --- internal/capture/stream.go | 22 +++++++++++++--------- internal/types/capture.go | 4 ++-- internal/webrtc/manager.go | 8 ++++---- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 1fb615c6..03cf3f0d 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -20,7 +20,7 @@ type StreamManagerCtx struct { pipelineStr string pipeline *gst.Pipeline sample chan types.Sample - listeners map[uintptr]func(sample types.Sample) + listeners map[uintptr]*func(sample types.Sample) emitMu sync.Mutex emitUpdate chan bool emitStop chan bool @@ -32,7 +32,7 @@ func streamNew(codec codec.RTPCodec, pipelineStr string) *StreamManagerCtx { logger: log.With().Str("module", "capture").Str("submodule", "stream").Logger(), codec: codec, pipelineStr: pipelineStr, - listeners: map[uintptr]func(sample types.Sample){}, + listeners: map[uintptr]*func(sample types.Sample){}, emitUpdate: make(chan bool), emitStop: make(chan bool), started: false, @@ -51,7 +51,7 @@ func streamNew(codec codec.RTPCodec, pipelineStr string) *StreamManagerCtx { case sample := <-manager.sample: manager.emitMu.Lock() for _, emit := range manager.listeners { - emit(sample) + (*emit)(sample) } manager.emitMu.Unlock() } @@ -72,20 +72,24 @@ func (manager *StreamManagerCtx) Codec() codec.RTPCodec { return manager.codec } -func (manager *StreamManagerCtx) AddListener(listener func(sample types.Sample)) { +func (manager *StreamManagerCtx) AddListener(listener *func(sample types.Sample)) { manager.emitMu.Lock() defer manager.emitMu.Unlock() - ptr := reflect.ValueOf(listener).Pointer() - manager.listeners[ptr] = listener + if listener != nil { + ptr := reflect.ValueOf(listener).Pointer() + manager.listeners[ptr] = listener + } } -func (manager *StreamManagerCtx) RemoveListener(listener func(sample types.Sample)) { +func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Sample)) { manager.emitMu.Lock() defer manager.emitMu.Unlock() - ptr := reflect.ValueOf(listener).Pointer() - delete(manager.listeners, ptr) + if listener != nil { + ptr := reflect.ValueOf(listener).Pointer() + delete(manager.listeners, ptr) + } } func (manager *StreamManagerCtx) Start() error { diff --git a/internal/types/capture.go b/internal/types/capture.go index 9527ec22..71afa6f1 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -23,8 +23,8 @@ type ScreencastManager interface { type StreamManager interface { Codec() codec.RTPCodec - AddListener(listener func(sample Sample)) - RemoveListener(listener func(sample Sample)) + AddListener(listener *func(sample Sample)) + RemoveListener(listener *func(sample Sample)) Start() error Stop() diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 17748467..decdc992 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -55,9 +55,9 @@ func (manager *WebRTCManagerCtx) Start() { } } - audio.AddListener(listener) + audio.AddListener(&listener) manager.unsubscribe = append(manager.unsubscribe, func(){ - audio.RemoveListener(listener) + audio.RemoveListener(&listener) }) videoIDs := manager.capture.VideoIDs() @@ -82,9 +82,9 @@ func (manager *WebRTCManagerCtx) Start() { } } - video.AddListener(listener) + video.AddListener(&listener) manager.unsubscribe = append(manager.unsubscribe, func(){ - video.RemoveListener(listener) + video.RemoveListener(&listener) }) manager.videoTracks[videoID] = track From eb88c8dc62f42c1ea7dd298ea0c3824470efb64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 6 Feb 2021 18:16:24 +0100 Subject: [PATCH 347/876] independent tracks for users & stream switching. --- internal/capture/manager.go | 40 ----------- internal/capture/stream.go | 7 ++ internal/types/capture.go | 6 +- internal/webrtc/manager.go | 99 +++++++++++++++++---------- internal/webrtc/peer.go | 16 +---- internal/websocket/handler/session.go | 14 ++-- 6 files changed, 84 insertions(+), 98 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 40570d73..2af9144a 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -176,43 +176,3 @@ func (manager *CaptureManagerCtx) Video(videoID string) (types.StreamManager, bo func (manager *CaptureManagerCtx) VideoIDs() []string { return manager.videoIDs } - -func (manager *CaptureManagerCtx) StartStream() { - manager.mu.Lock() - defer manager.mu.Unlock() - - manager.logger.Info().Msgf("starting stream pipelines") - - for _, video := range manager.videos { - if err := video.Start(); err != nil { - manager.logger.Panic().Err(err).Msg("unable to start video pipeline") - } - } - - if err := manager.audio.Start(); err != nil { - manager.logger.Panic().Err(err).Msg("unable to start audio pipeline") - } - - manager.streaming = true -} - -func (manager *CaptureManagerCtx) StopStream() { - manager.mu.Lock() - defer manager.mu.Unlock() - - manager.logger.Info().Msgf("stopping stream pipelines") - - for _, video := range manager.videos { - video.Stop() - } - - manager.audio.Stop() - manager.streaming = false -} - -func (manager *CaptureManagerCtx) Streaming() bool { - manager.mu.Lock() - defer manager.mu.Unlock() - - return manager.streaming -} diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 03cf3f0d..e4c366cf 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -92,6 +92,13 @@ func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Samp } } +func (manager *StreamManagerCtx) ListenersCount() int { + manager.emitMu.Lock() + defer manager.emitMu.Unlock() + + return len(manager.listeners) +} + func (manager *StreamManagerCtx) Start() error { manager.mu.Lock() defer manager.mu.Unlock() diff --git a/internal/types/capture.go b/internal/types/capture.go index 71afa6f1..e8ea6877 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -23,8 +23,10 @@ type ScreencastManager interface { type StreamManager interface { Codec() codec.RTPCodec + AddListener(listener *func(sample Sample)) RemoveListener(listener *func(sample Sample)) + ListenersCount() int Start() error Stop() @@ -40,8 +42,4 @@ type CaptureManager interface { Audio() StreamManager Video(videoID string) (StreamManager, bool) VideoIDs() []string - - StartStream() - StopStream() - Streaming() bool } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index decdc992..7c401daa 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -19,7 +19,7 @@ import ( func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ - logger: log.With().Str("module", "webrtc").Logger(), + logger: log.With().Str("module", "webrtc").Logger(), defaultVideoID: capture.VideoIDs()[0], desktop: desktop, capture: capture, @@ -29,7 +29,6 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con type WebRTCManagerCtx struct { logger zerolog.Logger - videoTracks map[string]*webrtc.TrackLocalStaticSample audioTrack *webrtc.TrackLocalStaticSample unsubscribe []func() defaultVideoID string @@ -60,36 +59,6 @@ func (manager *WebRTCManagerCtx) Start() { audio.RemoveListener(&listener) }) - videoIDs := manager.capture.VideoIDs() - manager.videoTracks = map[string]*webrtc.TrackLocalStaticSample{} - for _, videoID := range videoIDs { - videoID := videoID - - video, ok := manager.capture.Video(videoID) - if !ok { - manager.logger.Warn().Str("videoID", videoID).Msg("video stream not found, skipping") - continue - } - - track, err := webrtc.NewTrackLocalStaticSample(video.Codec().Capability, "video", "stream") - if err != nil { - manager.logger.Panic().Err(err).Str("videoID", videoID).Msg("unable to create video track") - } - - listener := func(sample types.Sample) { - if err := track.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { - manager.logger.Warn().Err(err).Str("videoID", videoID).Msg("vide pipeline failed to write") - } - } - - video.AddListener(&listener) - manager.unsubscribe = append(manager.unsubscribe, func(){ - video.RemoveListener(&listener) - }) - - manager.videoTracks[videoID] = track - } - manager.logger.Info(). Str("ice_lite", fmt.Sprintf("%t", manager.config.ICELite)). Str("ice_trickle", fmt.Sprintf("%t", manager.config.ICETrickle)). @@ -159,12 +128,67 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess }) } + // create video track + videoStream, ok := manager.capture.Video(manager.defaultVideoID) + if !ok { + manager.logger.Warn().Str("videoID", manager.defaultVideoID).Msg("default video stream not found") + return nil, err + } + + videoTrack, err := webrtc.NewTrackLocalStaticSample(videoStream.Codec().Capability, "video", "stream") + if err != nil { + manager.logger.Warn().Err(err).Msg("unable to create video track") + return nil, err + } + + listener := func(sample types.Sample) { + if err := videoTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { + manager.logger.Warn().Err(err).Msg("video pipeline failed to write") + } + } + + // should be stream started + if videoStream.ListenersCount() == 0 { + if err := videoStream.Start(); err != nil { + manager.logger.Warn().Err(err).Msg("unable to start video pipeline") + return nil, err + } + } + + videoStream.AddListener(&listener) + + changeVideo := func(videoID string) error { + newVideoStream, ok := manager.capture.Video(videoID) + if !ok { + return fmt.Errorf("video stream not found") + } + + // should be new stream started + if newVideoStream.ListenersCount() == 0 { + if err := newVideoStream.Start(); err != nil { + return err + } + } + + // switch listeners + videoStream.RemoveListener(&listener) + newVideoStream.AddListener(&listener) + + // should be old stream stopped + if videoStream.ListenersCount() == 0 { + videoStream.Stop() + } + + videoStream = newVideoStream + return nil + } + _, err = connection.AddTrack(manager.audioTrack) if err != nil { return nil, err } - videoSender, err := connection.AddTrack(manager.videoTracks[manager.defaultVideoID]) + _, err = connection.AddTrack(videoTrack) if err != nil { return nil, err } @@ -208,6 +232,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess connection.Close() case webrtc.PeerConnectionStateClosed: session.SetWebRTCConnected(false) + videoStream.RemoveListener(&listener) + + // should be stream stopped + if videoStream.ListenersCount() == 0 { + videoStream.Stop() + } } }) @@ -229,8 +259,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess settings: settings, connection: connection, configuration: configuration, - videoTracks: manager.videoTracks, - videoSender: videoSender, + changeVideo: changeVideo, }) return connection.LocalDescription(), nil diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 284f1a10..be46f150 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -1,10 +1,6 @@ package webrtc -import ( - "fmt" - - "github.com/pion/webrtc/v3" -) +import "github.com/pion/webrtc/v3" type WebRTCPeerCtx struct { api *webrtc.API @@ -12,8 +8,7 @@ type WebRTCPeerCtx struct { settings *webrtc.SettingEngine connection *webrtc.PeerConnection configuration *webrtc.Configuration - videoTracks map[string]*webrtc.TrackLocalStaticSample - videoSender *webrtc.RTPSender + changeVideo func(videoID string) error } func (webrtc_peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { @@ -28,12 +23,7 @@ func (webrtc_peer *WebRTCPeerCtx) SignalCandidate(candidate webrtc.ICECandidateI } func (webrtc_peer *WebRTCPeerCtx) SetVideoID(videoID string) error { - track, ok := webrtc_peer.videoTracks[videoID] - if !ok { - return fmt.Errorf("videoID not found in available tracks") - } - - return webrtc_peer.videoSender.ReplaceTrack(track) + return webrtc_peer.changeVideo(videoID) } func (webrtc_peer *WebRTCPeerCtx) Destroy() error { diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 664a7986..e430813e 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -29,9 +29,11 @@ func (h *MessageHandlerCtx) SessionDeleted(session types.Session) error { } func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { - // start streaming, when first member connects - if !h.capture.Streaming() { - h.capture.StartStream() + // start audio, when first member connects + if !h.capture.Audio().Started() { + if err := h.capture.Audio().Start(); err != nil { + return err + } } if err := h.systemInit(session); err != nil { @@ -48,9 +50,9 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { } func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { - // Stop streaming, if last member disonnects - if h.capture.Streaming() && !h.sessions.HasConnectedMembers() { - h.capture.StopStream() + // stop audio, if last member disonnects + if h.capture.Audio().Started() && !h.sessions.HasConnectedMembers() { + h.capture.Audio().Stop() } // clear host if exists From 1838a7421364556cfc24f0caa9844f523f1348d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 6 Feb 2021 18:18:49 +0100 Subject: [PATCH 348/876] switch to VP8 with multiple qualities. --- internal/capture/manager.go | 48 +++++++++++++++++++-------- internal/config/capture.go | 66 ++++++++++++++++++------------------- 2 files changed, 67 insertions(+), 47 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 2af9144a..792ce787 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -8,6 +8,7 @@ import ( "github.com/rs/zerolog/log" "demodesk/neko/internal/types" + "demodesk/neko/internal/types/codec" "demodesk/neko/internal/config" ) @@ -69,18 +70,6 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt ) } - videoPipeline := config.VideoPipeline - if videoPipeline == "" { - videoPipeline = fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw " + - "! videoconvert " + - "! queue " + - "! %s " + - "! appsink name=appsink", config.Display, config.VideoCodec.Pipeline, - ) - } - return &CaptureManagerCtx{ logger: logger, desktop: desktop, @@ -89,9 +78,40 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt screencast: screencastNew(config.Screencast, screencastPipeline), audio: streamNew(config.AudioCodec, audioPipeline), videos: map[string]*StreamManagerCtx{ - "hq": streamNew(config.VideoCodec, videoPipeline), + "hd": streamNew(codec.VP8(), fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=false use-damage=false " + + "! video/x-raw " + + "! videoconvert " + + "! queue " + + "! vp8enc target-bitrate=8192000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + + "! appsink name=appsink", config.Display, + )), + "hq": streamNew(codec.VP8(), fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=false use-damage=false " + + "! video/x-raw " + + "! videoconvert " + + "! queue " + + "! vp8enc target-bitrate=4096000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + + "! appsink name=appsink", config.Display, + )), + "mq": streamNew(codec.VP8(), fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=false use-damage=false " + + "! video/x-raw " + + "! videoconvert " + + "! queue " + + "! vp8enc target-bitrate=2048000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + + "! appsink name=appsink", config.Display, + )), + "lq": streamNew(codec.VP8(), fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=false use-damage=false " + + "! video/x-raw " + + "! videoconvert " + + "! queue " + + "! vp8enc target-bitrate=1024000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + + "! appsink name=appsink", config.Display, + )), }, - videoIDs: []string{ "hq" }, + videoIDs: []string{ "hd", "hq", "mq", "lq" }, } } diff --git a/internal/config/capture.go b/internal/config/capture.go index 0d87af6f..e0df9036 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -13,8 +13,8 @@ type Capture struct { AudioPipeline string Display string - VideoCodec codec.RTPCodec - VideoPipeline string + //VideoCodec codec.RTPCodec + //VideoPipeline string BroadcastPipeline string @@ -40,26 +40,26 @@ func (Capture) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().String("video", "", "video codec parameters to use for streaming") - if err := viper.BindPFlag("video", cmd.PersistentFlags().Lookup("video")); err != nil { - return err - } + //cmd.PersistentFlags().String("video", "", "video codec parameters to use for streaming") + //if err := viper.BindPFlag("video", cmd.PersistentFlags().Lookup("video")); err != nil { + // return err + //} // video codecs - cmd.PersistentFlags().Bool("vp8", false, "use VP8 video codec") - if err := viper.BindPFlag("vp8", cmd.PersistentFlags().Lookup("vp8")); err != nil { - return err - } - - cmd.PersistentFlags().Bool("vp9", false, "use VP9 video codec") - if err := viper.BindPFlag("vp9", cmd.PersistentFlags().Lookup("vp9")); err != nil { - return err - } - - cmd.PersistentFlags().Bool("h264", false, "use H264 video codec") - if err := viper.BindPFlag("h264", cmd.PersistentFlags().Lookup("h264")); err != nil { - return err - } + //cmd.PersistentFlags().Bool("vp8", false, "use VP8 video codec") + //if err := viper.BindPFlag("vp8", cmd.PersistentFlags().Lookup("vp8")); err != nil { + // return err + //} + // + //cmd.PersistentFlags().Bool("vp9", false, "use VP9 video codec") + //if err := viper.BindPFlag("vp9", cmd.PersistentFlags().Lookup("vp9")); err != nil { + // return err + //} + // + //cmd.PersistentFlags().Bool("h264", false, "use H264 video codec") + //if err := viper.BindPFlag("h264", cmd.PersistentFlags().Lookup("h264")); err != nil { + // return err + //} // audio codecs cmd.PersistentFlags().Bool("opus", false, "use Opus audio codec") @@ -113,17 +113,17 @@ func (Capture) Init(cmd *cobra.Command) error { } func (s *Capture) Set() { - var videoCodec codec.RTPCodec - if viper.GetBool("vp8") { - videoCodec = codec.VP8() - } else if viper.GetBool("vp9") { - videoCodec = codec.VP9() - } else if viper.GetBool("h264") { - videoCodec = codec.H264() - } else { - // default - videoCodec = codec.VP8() - } + //var videoCodec codec.RTPCodec + //if viper.GetBool("vp8") { + // videoCodec = codec.VP8() + //} else if viper.GetBool("vp9") { + // videoCodec = codec.VP9() + //} else if viper.GetBool("h264") { + // videoCodec = codec.H264() + //} else { + // // default + // videoCodec = codec.VP8() + //} var audioCodec codec.RTPCodec if viper.GetBool("opus") { @@ -144,8 +144,8 @@ func (s *Capture) Set() { s.AudioPipeline = viper.GetString("audio") s.Display = viper.GetString("display") - s.VideoCodec = videoCodec - s.VideoPipeline = viper.GetString("video") + //s.VideoCodec = videoCodec + //s.VideoPipeline = viper.GetString("video") s.BroadcastPipeline = viper.GetString("broadcast_pipeline") From 5cdb6e074e33455bf0a773d9f247f243f1c8d648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 7 Feb 2021 16:52:30 +0100 Subject: [PATCH 349/876] send video IDs with signal provide. --- internal/types/message/messages.go | 9 +++++---- internal/websocket/handler/signal.go | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 7c6d7aaf..110ce4a1 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -41,10 +41,11 @@ type SystemDisconnect struct { ///////////////////////////// type SignalProvide struct { - Event string `json:"event,omitempty"` - SDP string `json:"sdp"` - Lite bool `json:"lite"` - ICE []string `json:"ice"` + Event string `json:"event,omitempty"` + SDP string `json:"sdp"` + Lite bool `json:"lite"` + ICE []string `json:"ice"` + Videos []string `json:"videos"` } type SignalCandidate struct { diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index ecf25b56..8e036d22 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -18,10 +18,11 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { return session.Send( message.SignalProvide{ - Event: event.SIGNAL_PROVIDE, - SDP: offer.SDP, - Lite: h.webrtc.ICELite(), - ICE: h.webrtc.ICEServers(), + Event: event.SIGNAL_PROVIDE, + SDP: offer.SDP, + Lite: h.webrtc.ICELite(), + ICE: h.webrtc.ICEServers(), + Videos: h.capture.VideoIDs(), }) } From dd2ca0395510e0735b0ea569b36efbe44ee696d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 7 Feb 2021 17:07:55 +0100 Subject: [PATCH 350/876] choose video with CreatePeer. --- internal/types/message/messages.go | 1 + internal/types/webrtc.go | 2 +- internal/webrtc/manager.go | 45 +++++++++++++--------------- internal/websocket/handler/signal.go | 8 +++-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 110ce4a1..51a4130b 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -46,6 +46,7 @@ type SignalProvide struct { Lite bool `json:"lite"` ICE []string `json:"ice"` Videos []string `json:"videos"` + Video string `json:"video"` } type SignalCandidate struct { diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 8564edcf..637d15c3 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -17,5 +17,5 @@ type WebRTCManager interface { ICELite() bool ICEServers() []string - CreatePeer(session Session) (*webrtc.SessionDescription, error) + CreatePeer(session Session, videoID string) (*webrtc.SessionDescription, error) } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 7c401daa..db1e0c32 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -19,23 +19,21 @@ import ( func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ - logger: log.With().Str("module", "webrtc").Logger(), - defaultVideoID: capture.VideoIDs()[0], - desktop: desktop, - capture: capture, - config: config, + logger: log.With().Str("module", "webrtc").Logger(), + desktop: desktop, + capture: capture, + config: config, } } type WebRTCManagerCtx struct { - logger zerolog.Logger - audioTrack *webrtc.TrackLocalStaticSample - unsubscribe []func() - defaultVideoID string - audioCodec codec.RTPCodec - desktop types.DesktopManager - capture types.CaptureManager - config *config.WebRTC + logger zerolog.Logger + audioTrack *webrtc.TrackLocalStaticSample + audioCodec codec.RTPCodec + audioStop func() + desktop types.DesktopManager + capture types.CaptureManager + config *config.WebRTC } func (manager *WebRTCManagerCtx) Start() { @@ -55,9 +53,9 @@ func (manager *WebRTCManagerCtx) Start() { } audio.AddListener(&listener) - manager.unsubscribe = append(manager.unsubscribe, func(){ + manager.audioStop = func(){ audio.RemoveListener(&listener) - }) + } manager.logger.Info(). Str("ice_lite", fmt.Sprintf("%t", manager.config.ICELite)). @@ -71,10 +69,7 @@ func (manager *WebRTCManagerCtx) Start() { func (manager *WebRTCManagerCtx) Shutdown() error { manager.logger.Info().Msgf("webrtc shutting down") - for _, unsubscribe := range manager.unsubscribe { - unsubscribe() - } - + manager.audioStop() return nil } @@ -86,11 +81,11 @@ func (manager *WebRTCManagerCtx) ICEServers() []string { return manager.config.ICEServers } -func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.SessionDescription, error) { +func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) { logger := manager.logger.With().Str("id", session.ID()).Logger() // Create MediaEngine - engine, err := manager.mediaEngine() + engine, err := manager.mediaEngine(videoID) if err != nil { return nil, err } @@ -129,9 +124,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess } // create video track - videoStream, ok := manager.capture.Video(manager.defaultVideoID) + videoStream, ok := manager.capture.Video(videoID) if !ok { - manager.logger.Warn().Str("videoID", manager.defaultVideoID).Msg("default video stream not found") + manager.logger.Warn().Str("videoID", videoID).Msg("video stream not found") return nil, err } @@ -265,11 +260,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess return connection.LocalDescription(), nil } -func (manager *WebRTCManagerCtx) mediaEngine() (*webrtc.MediaEngine, error) { +func (manager *WebRTCManagerCtx) mediaEngine(videoID string) (*webrtc.MediaEngine, error) { engine := &webrtc.MediaEngine{} // all videos must have the same codec - video, ok := manager.capture.Video(manager.defaultVideoID) + video, ok := manager.capture.Video(videoID) if !ok { return nil, fmt.Errorf("default video track not found") } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 8e036d22..6d200c09 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -11,7 +11,10 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { return nil } - offer, err := h.webrtc.CreatePeer(session) + videos := h.capture.VideoIDs() + defaultVideo := videos[0] + + offer, err := h.webrtc.CreatePeer(session, defaultVideo) if err != nil { return err } @@ -22,7 +25,8 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { SDP: offer.SDP, Lite: h.webrtc.ICELite(), ICE: h.webrtc.ICEServers(), - Videos: h.capture.VideoIDs(), + Videos: videos, + Video: defaultVideo, }) } From 626164df893041e154410c688709d5faa9bdafd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 7 Feb 2021 17:29:40 +0100 Subject: [PATCH 351/876] SignalVideo reply. --- internal/types/message/messages.go | 4 ++-- internal/websocket/handler/signal.go | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 51a4130b..292e10f8 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -60,8 +60,8 @@ type SignalAnswer struct { } type SignalVideo struct { - Event string `json:"event,omitempty"` - VideoID string `json:"video_id"` + Event string `json:"event,omitempty"` + Video string `json:"video"` } ///////////////////////////// diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 6d200c09..5c32e15c 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -57,5 +57,14 @@ func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message. return nil } - return peer.SetVideoID(payload.VideoID) + err := peer.SetVideoID(payload.Video) + if err != nil { + return err + } + + return session.Send( + message.SignalVideo{ + Event: event.SIGNAL_VIDEO, + Video: payload.Video, + }) } From 2733d88d9feabec1c22c2bc42aa60338bdaa18b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 8 Feb 2021 22:21:01 +0100 Subject: [PATCH 352/876] edit xorg modelines. --- runtime/xorg.conf | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/runtime/xorg.conf b/runtime/xorg.conf index 071a48f5..3b883454 100644 --- a/runtime/xorg.conf +++ b/runtime/xorg.conf @@ -27,9 +27,9 @@ Section "Device" Identifier "dummy_videocard" Driver "dummy" Option "ConstantDPI" "true" - #VideoRam 4096000 + VideoRam 512000 #VideoRam 256000 - VideoRam 192000 + #VideoRam 192000 EndSection Section "Monitor" @@ -42,9 +42,8 @@ Section "Monitor" # for the dummy video card. # https://arachnoid.com/modelines/ - # 1280x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 33.78 MHz - Modeline "1280x720_30.00" 33.78 1280 1288 1408 1536 720 721 724 733 -HSync +Vsync - + # 1920x1080 @ 60.00 Hz (GTF) hsync: 67.08 kHz; pclk: 172.80 MHz + Modeline "1920x1080_60.00" 172.80 1920 2040 2248 2576 1080 1081 1084 1118 -HSync +Vsync # 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz Modeline "1280x720_60.00" 74.48 1280 1336 1472 1664 720 721 724 746 -HSync +Vsync # 1152x648 @ 60.00 Hz (GTF) hsync: 40.26 kHz; pclk: 59.91 MHz @@ -56,8 +55,8 @@ Section "Monitor" # 800x600 @ 60.00 Hz (GTF) hsync: 37.32 kHz; pclk: 38.22 MHz Modeline "800x600_60.00" 38.22 800 832 912 1024 600 601 604 622 -HSync +Vsync - # 1920x1080 @ 60.00 Hz (GTF) hsync: 67.08 kHz; pclk: 172.80 MHz - Modeline "1920x1080_60.00" 172.80 1920 2040 2248 2576 1080 1081 1084 1118 -HSync +Vsync + # 1280x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 33.78 MHz + Modeline "1280x720_30.00" 33.78 1280 1288 1408 1536 720 721 724 733 -HSync +Vsync # 1920x1080 @ 30.00 Hz (GTF) hsync: 32.97 kHz; pclk: 80.18 MHz Modeline "1920x1080_30.00" 80.18 1920 1984 2176 2432 1080 1081 1084 1099 -HSync +Vsync # 1152x648 @ 30.00 Hz (GTF) hsync: 19.80 kHz; pclk: 26.93 MHz @@ -68,6 +67,9 @@ Section "Monitor" Modeline "960x720_30.00" 25.33 960 960 1056 1152 720 721 724 733 -HSync +Vsync # 800x600 @ 30.00 Hz (GTF) hsync: 18.33 kHz; pclk: 17.01 MHz Modeline "800x600_30.00" 17.01 800 792 864 928 600 601 604 611 -HSync +Vsync + + # 1920x1080 @ 25.00 Hz (GTF) hsync: 27.40 kHz; pclk: 64.88 MHz + Modeline "1920x1080_25.00" 64.88 1920 1952 2144 2368 1080 1081 1084 1096 -HSync +Vsync EndSection Section "Screen" @@ -78,7 +80,7 @@ Section "Screen" SubSection "Display" Viewport 0 0 Depth 24 - Modes "1280x720_30.00" "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "1920x1080_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00" + Modes "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "1280x720_30.00" "1920x1080_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00" "1920x1080_25.00" EndSubSection EndSection From bac69a205f95b5c70e868f9838f50e28b078bca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 8 Feb 2021 22:21:21 +0100 Subject: [PATCH 353/876] update qualities pipelines with fps. --- internal/capture/manager.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 792ce787..a6c7267a 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -80,34 +80,34 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt videos: map[string]*StreamManagerCtx{ "hd": streamNew(codec.VP8(), fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw " + + "! video/x-raw,framerate=25/1 " + "! videoconvert " + "! queue " + - "! vp8enc target-bitrate=8192000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + + "! vp8enc target-bitrate=24576000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + "! appsink name=appsink", config.Display, )), "hq": streamNew(codec.VP8(), fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw " + + "! video/x-raw,framerate=25/1 " + "! videoconvert " + "! queue " + - "! vp8enc target-bitrate=4096000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + + "! vp8enc target-bitrate=16588800 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + "! appsink name=appsink", config.Display, )), "mq": streamNew(codec.VP8(), fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw " + + "! video/x-raw,framerate=125/10 " + "! videoconvert " + "! queue " + - "! vp8enc target-bitrate=2048000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + + "! vp8enc target-bitrate=9216000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + "! appsink name=appsink", config.Display, )), "lq": streamNew(codec.VP8(), fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw " + + "! video/x-raw,framerate=125/10 " + "! videoconvert " + "! queue " + - "! vp8enc target-bitrate=1024000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + + "! vp8enc target-bitrate=4608000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + "! appsink name=appsink", config.Display, )), }, From c0c14b3ac22b2fd6417d0a4f897d9d8e5edfea24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 9 Feb 2021 20:36:22 +0100 Subject: [PATCH 354/876] add screen-size aware pipelines. --- internal/capture/manager.go | 127 +++++++++++++++++++++++------------- internal/capture/stream.go | 9 +-- 2 files changed, 87 insertions(+), 49 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index a6c7267a..4bce6cdc 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -3,6 +3,7 @@ package capture import ( "fmt" "sync" + "math" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -58,58 +59,94 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt ) } - audioPipeline := config.AudioPipeline - if audioPipeline == "" { - audioPipeline = fmt.Sprintf( - "pulsesrc device=%s " + - "! audio/x-raw,channels=2 " + - "! audioconvert " + - "! queue " + - "! %s " + - "! appsink name=appsink", config.Device, config.AudioCodec.Pipeline, - ) - } - return &CaptureManagerCtx{ logger: logger, desktop: desktop, streaming: false, broadcast: broadcastNew(broadcastPipeline), screencast: screencastNew(config.Screencast, screencastPipeline), - audio: streamNew(config.AudioCodec, audioPipeline), + audio: streamNew(config.AudioCodec, func() string { + if config.AudioPipeline != "" { + return config.AudioPipeline + } + + return fmt.Sprintf( + "pulsesrc device=%s " + + "! audio/x-raw,channels=2 " + + "! audioconvert " + + "! queue " + + "! %s " + + "! appsink name=appsink", config.Device, config.AudioCodec.Pipeline, + ) + }), videos: map[string]*StreamManagerCtx{ - "hd": streamNew(codec.VP8(), fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw,framerate=25/1 " + - "! videoconvert " + - "! queue " + - "! vp8enc target-bitrate=24576000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + - "! appsink name=appsink", config.Display, - )), - "hq": streamNew(codec.VP8(), fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw,framerate=25/1 " + - "! videoconvert " + - "! queue " + - "! vp8enc target-bitrate=16588800 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + - "! appsink name=appsink", config.Display, - )), - "mq": streamNew(codec.VP8(), fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw,framerate=125/10 " + - "! videoconvert " + - "! queue " + - "! vp8enc target-bitrate=9216000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + - "! appsink name=appsink", config.Display, - )), - "lq": streamNew(codec.VP8(), fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw,framerate=125/10 " + - "! videoconvert " + - "! queue " + - "! vp8enc target-bitrate=4608000 cpu-used=16 threads=4 deadline=1 error-resilient=partitions keyframe-max-dist=15 static-threshold=20 " + - "! appsink name=appsink", config.Display, - )), + "hd": streamNew(codec.VP8(), func() string { + screen := desktop.GetScreenSize() + bitrate := screen.Width * screen.Height * 12 + + return fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=false use-damage=false " + + "! video/x-raw,framerate=25/1 " + + "! videoconvert " + + "! queue " + + "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 " + + "! appsink name=appsink", config.Display, bitrate, + ) + }), + "hq": streamNew(codec.VP8(), func() string { + screen := desktop.GetScreenSize() + width := int(math.Ceil(float64(screen.Width) / 6) * 5) + height := int(math.Ceil(float64(screen.Height) / 6) * 5) + bitrate := width * height * 12 + + return fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=false use-damage=false " + + "! video/x-raw,framerate=25/1 " + + "! videoconvert " + + "! queue " + + "! videoscale " + + "! video/x-raw,width=%d,height=%d " + + "! queue " + + "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 " + + "! appsink name=appsink", config.Display, width, height, bitrate, + ) + }), + "mq": streamNew(codec.VP8(), func() string { + screen := desktop.GetScreenSize() + width := int(math.Ceil(float64(screen.Width) / 6) * 4) + height := int(math.Ceil(float64(screen.Height) / 6) * 4) + bitrate := width * height * 8 + + return fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=false use-damage=false " + + "! video/x-raw,framerate=125/10 " + + "! videoconvert " + + "! queue " + + "! videoscale " + + "! video/x-raw,width=%d,height=%d " + + "! queue " + + "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 " + + "! appsink name=appsink", config.Display, width, height, bitrate, + ) + }), + "lq": streamNew(codec.VP8(), func() string { + screen := desktop.GetScreenSize() + width := int(math.Ceil(float64(screen.Width) / 6) * 3) + height := int(math.Ceil(float64(screen.Height) / 6) * 3) + bitrate := width * height * 4 + + return fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=false use-damage=false " + + "! video/x-raw,framerate=125/10 " + + "! videoconvert " + + "! queue " + + "! videoscale " + + "! video/x-raw,width=%d,height=%d " + + "! queue " + + "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 " + + "! appsink name=appsink", config.Display, width, height, bitrate, + ) + }), }, videoIDs: []string{ "hd", "hq", "mq", "lq" }, } diff --git a/internal/capture/stream.go b/internal/capture/stream.go index e4c366cf..61d6ef80 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -17,7 +17,7 @@ type StreamManagerCtx struct { logger zerolog.Logger mu sync.Mutex codec codec.RTPCodec - pipelineStr string + pipelineStr func() string pipeline *gst.Pipeline sample chan types.Sample listeners map[uintptr]*func(sample types.Sample) @@ -27,7 +27,7 @@ type StreamManagerCtx struct { started bool } -func streamNew(codec codec.RTPCodec, pipelineStr string) *StreamManagerCtx { +func streamNew(codec codec.RTPCodec, pipelineStr func() string) *StreamManagerCtx { manager := &StreamManagerCtx{ logger: log.With().Str("module", "capture").Str("submodule", "stream").Logger(), codec: codec, @@ -132,12 +132,13 @@ func (manager *StreamManagerCtx) createPipeline() error { var err error codec := manager.Codec() + pipelineStr := manager.pipelineStr() manager.logger.Info(). Str("codec", codec.Name). - Str("src", manager.pipelineStr). + Str("src", pipelineStr). Msgf("creating pipeline") - manager.pipeline, err = gst.CreatePipeline(manager.pipelineStr) + manager.pipeline, err = gst.CreatePipeline(pipelineStr) if err != nil { return err } From e8286dec96a0a2ce06634f3a8c2e5d2f5e567ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 10 Feb 2021 18:56:20 +0100 Subject: [PATCH 355/876] xorg: filter out all irrelevant screen rates. --- internal/desktop/xorg/xorg.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index d924a892..e3d6fa68 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -284,6 +284,13 @@ func goCreateScreenSize(index C.int, width C.int, height C.int, mwidth C.int, mh } //export goSetScreenRates -func goSetScreenRates(index C.int, rate_index C.int, rate C.short) { - ScreenConfigurations[int(index)].Rates[int(rate_index)] = int16(rate) +func goSetScreenRates(index C.int, rate_index C.int, rateC C.short) { + rate := int16(rateC) + + // filter out all irrelevant rates + if rate > 60 || (rate > 30 && rate % 10 != 0){ + return + } + + ScreenConfigurations[int(index)].Rates[int(rate_index)] = rate } From f22922191a0afd74e3c5592e7b9ccd0f4b6ccebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 11 Feb 2021 18:36:27 +0100 Subject: [PATCH 356/876] broadcast cursor position via WebSockets. --- internal/desktop/xorg.go | 8 ++++++ internal/types/desktop.go | 1 + internal/types/event/events.go | 3 ++- internal/types/message/messages.go | 7 +++++ internal/websocket/manager.go | 43 ++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 1 deletion(-) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index e68c3621..6ca07afe 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -9,8 +9,16 @@ import ( "demodesk/neko/internal/desktop/xorg" ) +var mousePosX int +var mousePosY int + func (manager *DesktopManagerCtx) Move(x, y int) { xorg.Move(x, y) + mousePosX, mousePosY = x, y +} + +func (manager *DesktopManagerCtx) GetMousePositon() (x, y int) { + return mousePosX, mousePosY } func (manager *DesktopManagerCtx) Scroll(x, y int) { diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 1501fc40..e1207b6f 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -48,6 +48,7 @@ type DesktopManager interface { // xorg Move(x, y int) + GetMousePositon() (x, y int) Scroll(x, y int) ButtonDown(code int) error KeyDown(code uint64) error diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 3d767960..4ec99b3c 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -47,7 +47,8 @@ const ( ) const ( - CURSOR_IMAGE = "cursor/image" + CURSOR_IMAGE = "cursor/image" + CURSOR_POSITION = "cursor/position" ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 292e10f8..0424a66c 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -172,6 +172,13 @@ type CursorImage struct { Y uint16 `json:"y"` } +type CursorPosition struct { + Event string `json:"event,omitempty"` + MemberId string `json:"member_id"` + X uint16 `json:"x"` + Y uint16 `json:"y"` +} + ///////////////////////////// // Broadcast ///////////////////////////// diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 4c6c17de..bd8803cb 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -41,6 +41,7 @@ type WebSocketManagerCtx struct { desktop types.DesktopManager handler *handler.MessageHandlerCtx handlers []types.HandlerFunction + shutdown chan bool } func (ws *WebSocketManagerCtx) Start() { @@ -133,9 +134,51 @@ func (ws *WebSocketManagerCtx) Start() { }) ws.fileChooserDialogEvents() + + go func() { + ws.logger.Debug().Msg("cursor position broadcast start") + + defer func() { + ws.logger.Debug().Msg("cursor position broadcast shutdown") + }() + + var posX int + var posY int + + for { + select { + case <-ws.shutdown: + return + default: + time.Sleep(40 * time.Millisecond) + + session := ws.sessions.GetHost() + if session == nil { + continue + } + + x, y := ws.desktop.GetMousePositon() + if posX == x && posY == y { + continue + } + + memberId := session.ID() + posX = x + posY = y + + ws.sessions.Broadcast(message.CursorPosition{ + Event: event.CURSOR_POSITION, + MemberId: memberId, + X: uint16(x), + Y: uint16(y), + }, []string{ memberId }) + } + } + }() } func (ws *WebSocketManagerCtx) Shutdown() error { + ws.shutdown <- true return nil } From c8200e3bb774c647f0ea08217075bbb91ad3492b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 12 Feb 2021 21:06:42 +0100 Subject: [PATCH 357/876] add WebRTC send function. --- internal/types/webrtc.go | 1 + internal/webrtc/manager.go | 20 ++++++++------------ internal/webrtc/peer.go | 12 +++++++++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 637d15c3..d727a887 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -7,6 +7,7 @@ type WebRTCPeer interface { SignalCandidate(candidate webrtc.ICECandidateInit) error SetVideoID(videoID string) error + Send(data []byte) error Destroy() error } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index db1e0c32..83713cb3 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -213,9 +213,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } } - connection.OnNegotiationNeeded(func() { - logger.Warn().Msg("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!negotiation needed!") - }) + peer := &WebRTCPeerCtx{ + api: api, + connection: connection, + changeVideo: changeVideo, + } connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { @@ -237,6 +239,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) connection.OnDataChannel(func(channel *webrtc.DataChannel) { + peer.dataChannel = channel + channel.OnMessage(func(message webrtc.DataChannelMessage) { if !session.IsHost() { return @@ -248,15 +252,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) }) - session.SetWebRTCPeer(&WebRTCPeerCtx{ - api: api, - engine: engine, - settings: settings, - connection: connection, - configuration: configuration, - changeVideo: changeVideo, - }) - + session.SetWebRTCPeer(peer) return connection.LocalDescription(), nil } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index be46f150..2754a4ef 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -4,10 +4,8 @@ import "github.com/pion/webrtc/v3" type WebRTCPeerCtx struct { api *webrtc.API - engine *webrtc.MediaEngine - settings *webrtc.SettingEngine connection *webrtc.PeerConnection - configuration *webrtc.Configuration + dataChannel *webrtc.DataChannel changeVideo func(videoID string) error } @@ -26,6 +24,14 @@ func (webrtc_peer *WebRTCPeerCtx) SetVideoID(videoID string) error { return webrtc_peer.changeVideo(videoID) } +func (webrtc_peer *WebRTCPeerCtx) Send(data []byte) error { + if webrtc_peer.dataChannel == nil { + return nil + } + + return webrtc_peer.dataChannel.Send(data) +} + func (webrtc_peer *WebRTCPeerCtx) Destroy() error { if webrtc_peer.connection == nil || webrtc_peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { return nil From c54703d7d758644f8c830c17ee307b4f3ec56a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 12 Feb 2021 21:48:47 +0100 Subject: [PATCH 358/876] destroy WS and WebRTC peers before assigning. --- internal/session/session.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/internal/session/session.go b/internal/session/session.go index 8b667a15..ba6c6f3e 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -118,6 +118,12 @@ func (session *SessionCtx) GetState() types.MemberState { // --- func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { + if session.websocket_peer != nil { + if err := session.websocket_peer.Destroy(); err != nil { + session.logger.Warn().Err(err).Msgf("websocket destroy has failed") + } + } + session.websocket_peer = websocket_peer } @@ -176,6 +182,12 @@ func (session *SessionCtx) Disconnect(reason string) error { // --- func (session *SessionCtx) SetWebRTCPeer(webrtc_peer types.WebRTCPeer) { + if session.webrtc_peer != nil { + if err := session.webrtc_peer.Destroy(); err != nil { + session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") + } + } + session.webrtc_peer = webrtc_peer } From af3a28274dd83ed3958e2f21bd758759842170fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 12 Feb 2021 22:13:55 +0100 Subject: [PATCH 359/876] add customized WebRTC send functions. --- internal/types/webrtc.go | 6 +- internal/webrtc/{handle.go => handler.go} | 0 internal/webrtc/peer.go | 8 --- internal/webrtc/send.go | 75 +++++++++++++++++++++++ 4 files changed, 79 insertions(+), 10 deletions(-) rename internal/webrtc/{handle.go => handler.go} (100%) create mode 100644 internal/webrtc/send.go diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index d727a887..3a19b837 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -5,9 +5,11 @@ import "github.com/pion/webrtc/v3" type WebRTCPeer interface { SignalAnswer(sdp string) error SignalCandidate(candidate webrtc.ICECandidateInit) error - SetVideoID(videoID string) error - Send(data []byte) error + SetVideoID(videoID string) error + SendCursorPosition(x, y int) error + SendCursorImage(cur *CursorImage) error + Destroy() error } diff --git a/internal/webrtc/handle.go b/internal/webrtc/handler.go similarity index 100% rename from internal/webrtc/handle.go rename to internal/webrtc/handler.go diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 2754a4ef..08e422eb 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -24,14 +24,6 @@ func (webrtc_peer *WebRTCPeerCtx) SetVideoID(videoID string) error { return webrtc_peer.changeVideo(videoID) } -func (webrtc_peer *WebRTCPeerCtx) Send(data []byte) error { - if webrtc_peer.dataChannel == nil { - return nil - } - - return webrtc_peer.dataChannel.Send(data) -} - func (webrtc_peer *WebRTCPeerCtx) Destroy() error { if webrtc_peer.connection == nil || webrtc_peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { return nil diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go new file mode 100644 index 00000000..1f22b0c4 --- /dev/null +++ b/internal/webrtc/send.go @@ -0,0 +1,75 @@ +package webrtc + +import ( + "bytes" + "encoding/binary" + + "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" +) + +const ( + OP_CURSOR_POSITION = 0x01 + OP_CURSOR_IMAGE = 0x02 +) + +type PayloadCursorPosition struct { + PayloadHeader + X uint16 + Y uint16 +} + +type PayloadCursorImage struct { + PayloadHeader + Width uint16 + Height uint16 + Xhot uint16 + Yhot uint16 + Uri string +} + +func (webrtc_peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { + if webrtc_peer.dataChannel == nil { + return nil + } + + data := PayloadCursorPosition{ + PayloadHeader: PayloadHeader{ + Event: OP_CURSOR_POSITION, + Length: 7, + }, + X: uint16(x), + Y: uint16(y), + } + + var buffer bytes.Buffer + binary.Write(&buffer, binary.LittleEndian, data) + return webrtc_peer.dataChannel.Send(buffer.Bytes()) +} + +func (webrtc_peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error { + if webrtc_peer.dataChannel == nil { + return nil + } + + uri, err := utils.GetCursorImageURI(cur) + if err != nil { + return err + } + + data := PayloadCursorImage{ + PayloadHeader: PayloadHeader{ + Event: OP_CURSOR_IMAGE, + Length: uint16(11 + len(uri)), + }, + Width: cur.Width, + Height: cur.Height, + Xhot: cur.Xhot, + Yhot: cur.Yhot, + Uri: uri, + } + + var buffer bytes.Buffer + binary.Write(&buffer, binary.LittleEndian, data) + return webrtc_peer.dataChannel.Send(buffer.Bytes()) +} From 90aa2ce51aacfacbef328cf90dd23e4787411038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 12 Feb 2021 23:43:52 +0100 Subject: [PATCH 360/876] cursor utils: split to URI and bytes. --- internal/utils/cursor.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/internal/utils/cursor.go b/internal/utils/cursor.go index 8f8d93ab..14fb350f 100644 --- a/internal/utils/cursor.go +++ b/internal/utils/cursor.go @@ -10,7 +10,7 @@ import ( "demodesk/neko/internal/types" ) -func GetCursorImageURI(cursor *types.CursorImage) (string, error) { +func GetCursorImage(cursor *types.CursorImage) ([]byte, error) { width := int(cursor.Width) height := int(cursor.Height) pixels := cursor.Pixels @@ -31,10 +31,19 @@ func GetCursorImageURI(cursor *types.CursorImage) (string, error) { out := new(bytes.Buffer) err := png.Encode(out, img) + if err != nil { + return nil, err + } + + return out.Bytes(), nil +} + +func GetCursorImageURI(cursor *types.CursorImage) (string, error) { + img, err := GetCursorImage(cursor) if err != nil { return "", err } - uri := "data:image/png;base64," + base64.StdEncoding.EncodeToString(out.Bytes()) + uri := "data:image/png;base64," + base64.StdEncoding.EncodeToString(img) return uri, nil } From 8a3b3f14cb1df276b4a7406ff8eb3a755774d65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 12 Feb 2021 23:45:16 +0100 Subject: [PATCH 361/876] WebRTC channel from server. --- internal/webrtc/manager.go | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 83713cb3..06722ebf 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -188,7 +188,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return nil, err } - _, err = connection.CreateDataChannel("data", nil) + dataChannel, err := connection.CreateDataChannel("data", nil) if err != nil { return nil, err } @@ -213,12 +213,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } } - peer := &WebRTCPeerCtx{ - api: api, - connection: connection, - changeVideo: changeVideo, - } - connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: @@ -238,21 +232,23 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } }) - connection.OnDataChannel(func(channel *webrtc.DataChannel) { - peer.dataChannel = channel + dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { + if !session.IsHost() { + return + } - channel.OnMessage(func(message webrtc.DataChannelMessage) { - if !session.IsHost() { - return - } - - if err = manager.handle(message); err != nil { - logger.Warn().Err(err).Msg("data handle failed") - } - }) + if err = manager.handle(message); err != nil { + logger.Warn().Err(err).Msg("data handle failed") + } + }) + + session.SetWebRTCPeer(&WebRTCPeerCtx{ + api: api, + connection: connection, + changeVideo: changeVideo, + dataChannel: dataChannel, }) - session.SetWebRTCPeer(peer) return connection.LocalDescription(), nil } From ed9f0276c717dc556b37602508a41a019a6ab284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 12 Feb 2021 23:46:57 +0100 Subject: [PATCH 362/876] fix WebRTC send: remove structures with dynamic size. --- internal/webrtc/send.go | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index 1f22b0c4..8da30083 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -1,6 +1,7 @@ package webrtc import ( + "fmt" "bytes" "encoding/binary" @@ -25,12 +26,11 @@ type PayloadCursorImage struct { Height uint16 Xhot uint16 Yhot uint16 - Uri string } func (webrtc_peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { if webrtc_peer.dataChannel == nil { - return nil + return fmt.Errorf("no data channel") } data := PayloadCursorPosition{ @@ -42,17 +42,20 @@ func (webrtc_peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { Y: uint16(y), } - var buffer bytes.Buffer - binary.Write(&buffer, binary.LittleEndian, data) + buffer := &bytes.Buffer{} + if err := binary.Write(buffer, binary.LittleEndian, data); err != nil { + return err + } + return webrtc_peer.dataChannel.Send(buffer.Bytes()) } func (webrtc_peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error { if webrtc_peer.dataChannel == nil { - return nil + return fmt.Errorf("no data channel") } - uri, err := utils.GetCursorImageURI(cur) + img, err := utils.GetCursorImage(cur) if err != nil { return err } @@ -60,16 +63,23 @@ func (webrtc_peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error data := PayloadCursorImage{ PayloadHeader: PayloadHeader{ Event: OP_CURSOR_IMAGE, - Length: uint16(11 + len(uri)), + Length: uint16(11 + len(img)), }, Width: cur.Width, Height: cur.Height, Xhot: cur.Xhot, Yhot: cur.Yhot, - Uri: uri, } - var buffer bytes.Buffer - binary.Write(&buffer, binary.LittleEndian, data) + buffer := &bytes.Buffer{} + + if err := binary.Write(buffer, binary.LittleEndian, data); err != nil { + return err + } + + if err := binary.Write(buffer, binary.LittleEndian, img); err != nil { + return err + } + return webrtc_peer.dataChannel.Send(buffer.Bytes()) } From 061fbe60cf6df91cf7874145d07b4c291c848e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Feb 2021 00:01:56 +0100 Subject: [PATCH 363/876] switch WebRTC to BigEndian. --- internal/webrtc/handler.go | 10 +++++----- internal/webrtc/send.go | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 50d0be71..acf336b2 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -47,7 +47,7 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { return err } - if err := binary.Read(bytes.NewBuffer(hbytes), binary.LittleEndian, header); err != nil { + if err := binary.Read(bytes.NewBuffer(hbytes), binary.BigEndian, header); err != nil { return err } @@ -56,14 +56,14 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { switch header.Event { case OP_MOVE: payload := &PayloadMove{} - if err := binary.Read(buffer, binary.LittleEndian, payload); err != nil { + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } manager.desktop.Move(int(payload.X), int(payload.Y)) case OP_SCROLL: payload := &PayloadScroll{} - if err := binary.Read(buffer, binary.LittleEndian, payload); err != nil { + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } @@ -76,7 +76,7 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { manager.desktop.Scroll(int(payload.X), int(payload.Y)) case OP_KEY_DOWN: payload := &PayloadKey{} - if err := binary.Read(buffer, binary.LittleEndian, payload); err != nil { + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } @@ -99,7 +99,7 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { } case OP_KEY_UP: payload := &PayloadKey{} - err := binary.Read(buffer, binary.LittleEndian, payload) + err := binary.Read(buffer, binary.BigEndian, payload) if err != nil { return err } diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index 8da30083..cd2fa64b 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -43,7 +43,7 @@ func (webrtc_peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { } buffer := &bytes.Buffer{} - if err := binary.Write(buffer, binary.LittleEndian, data); err != nil { + if err := binary.Write(buffer, binary.BigEndian, data); err != nil { return err } @@ -73,11 +73,11 @@ func (webrtc_peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error buffer := &bytes.Buffer{} - if err := binary.Write(buffer, binary.LittleEndian, data); err != nil { + if err := binary.Write(buffer, binary.BigEndian, data); err != nil { return err } - if err := binary.Write(buffer, binary.LittleEndian, img); err != nil { + if err := binary.Write(buffer, binary.BigEndian, img); err != nil { return err } From c9b2c93fb8ee545835e61a8d69b0e6604208d6ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Feb 2021 18:25:40 +0100 Subject: [PATCH 364/876] cursor image/position from WebRTC. --- internal/desktop/xorg.go | 15 +++-- internal/types/desktop.go | 2 +- internal/types/event/events.go | 5 -- internal/types/message/messages.go | 21 ------- internal/webrtc/manager.go | 89 ++++++++++++++++++++++------ internal/websocket/handler/system.go | 16 ----- internal/websocket/manager.go | 61 ------------------- 7 files changed, 82 insertions(+), 127 deletions(-) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 6ca07afe..3ad15dc1 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -9,16 +9,21 @@ import ( "demodesk/neko/internal/desktop/xorg" ) -var mousePosX int -var mousePosY int +// TODO: Refactor. +var cursorListeners []func(x, y int) func (manager *DesktopManagerCtx) Move(x, y int) { xorg.Move(x, y) - mousePosX, mousePosY = x, y + + // TODO: Refactor. + for _, listener := range cursorListeners { + listener(x, y) + } } -func (manager *DesktopManagerCtx) GetMousePositon() (x, y int) { - return mousePosX, mousePosY +// TODO: Refactor. +func (manager *DesktopManagerCtx) OnCursorPosition(listener func(x, y int)) { + cursorListeners = append(cursorListeners, listener) } func (manager *DesktopManagerCtx) Scroll(x, y int) { diff --git a/internal/types/desktop.go b/internal/types/desktop.go index e1207b6f..8fef3c70 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -48,7 +48,7 @@ type DesktopManager interface { // xorg Move(x, y int) - GetMousePositon() (x, y int) + OnCursorPosition(listener func(x, y int)) Scroll(x, y int) ButtonDown(code int) error KeyDown(code uint64) error diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 4ec99b3c..99c55a05 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -46,11 +46,6 @@ const ( KEYBOARD_MAP = "keyboard/map" ) -const ( - CURSOR_IMAGE = "cursor/image" - CURSOR_POSITION = "cursor/position" -) - const ( BORADCAST_STATUS = "broadcast/status" ) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 0424a66c..fef67b8e 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -22,7 +22,6 @@ type SystemInit struct { ScreenSize ScreenSize `json:"screen_size"` Members map[string]MemberData `json:"members"` ImplicitHosting bool `json:"implicit_hosting"` - CursorImage *CursorImage `json:"cursor_image"` } type SystemAdmin struct { @@ -159,26 +158,6 @@ type KeyboardModifiers struct { ScrollLock *bool `json:"scroll_lock"` } -///////////////////////////// -// Cursor -///////////////////////////// - -type CursorImage struct { - Event string `json:"event,omitempty"` - Uri string `json:"uri"` - Width uint16 `json:"width"` - Height uint16 `json:"height"` - X uint16 `json:"x"` - Y uint16 `json:"y"` -} - -type CursorPosition struct { - Event string `json:"event,omitempty"` - MemberId string `json:"member_id"` - X uint16 `json:"x"` - Y uint16 `json:"y"` -} - ///////////////////////////// // Broadcast ///////////////////////////// diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 06722ebf..a8a90424 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -4,6 +4,7 @@ import ( "fmt" "io" "strings" + "reflect" "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" @@ -19,21 +20,27 @@ import ( func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ - logger: log.With().Str("module", "webrtc").Logger(), - desktop: desktop, - capture: capture, - config: config, + logger: log.With().Str("module", "webrtc").Logger(), + desktop: desktop, + capture: capture, + config: config, + // TODO: Refactor. + curImgListeners: map[uintptr]*func(cur *types.CursorImage){}, + curPosListeners: map[uintptr]*func(x, y int){}, } } type WebRTCManagerCtx struct { - logger zerolog.Logger - audioTrack *webrtc.TrackLocalStaticSample - audioCodec codec.RTPCodec - audioStop func() - desktop types.DesktopManager - capture types.CaptureManager - config *config.WebRTC + logger zerolog.Logger + audioTrack *webrtc.TrackLocalStaticSample + audioCodec codec.RTPCodec + audioStop func() + desktop types.DesktopManager + capture types.CaptureManager + config *config.WebRTC + // TODO: Refactor. + curImgListeners map[uintptr]*func(cur *types.CursorImage) + curPosListeners map[uintptr]*func(x, y int) } func (manager *WebRTCManagerCtx) Start() { @@ -64,6 +71,21 @@ func (manager *WebRTCManagerCtx) Start() { Str("ephemeral_port_range", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)). Str("nat_ips", strings.Join(manager.config.NAT1To1IPs, ",")). Msgf("webrtc starting") + + // TODO: Refactor. + manager.desktop.OnCursorChanged(func(serial uint64) { + cur := manager.desktop.GetCursorImage() + for _, emit := range manager.curImgListeners { + (*emit)(cur) + } + }) + + // TODO: Refactor. + manager.desktop.OnCursorPosition(func(x, y int) { + for _, emit := range manager.curPosListeners { + (*emit)(x, y) + } + }) } func (manager *WebRTCManagerCtx) Shutdown() error { @@ -213,6 +235,33 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } } + peer := &WebRTCPeerCtx{ + api: api, + connection: connection, + changeVideo: changeVideo, + dataChannel: dataChannel, + } + + cursorChange := func(cur *types.CursorImage) { + if err := peer.SendCursorImage(cur); err != nil { + manager.logger.Warn().Err(err).Msg("could not send cursor image") + } + } + + cursorPosition := func(x, y int) { + if session.IsHost() { + return + } + + if err := peer.SendCursorPosition(x, y); err != nil { + manager.logger.Warn().Err(err).Msg("could not send cursor position") + } + } + + // TODO: Refactor. + cursorChangePtr := reflect.ValueOf(&cursorChange).Pointer() + cursorPositionPtr := reflect.ValueOf(&cursorPosition).Pointer() + connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: @@ -229,9 +278,19 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin if videoStream.ListenersCount() == 0 { videoStream.Stop() } + + // TODO: Refactor. + delete(manager.curImgListeners, cursorChangePtr) + delete(manager.curPosListeners, cursorPositionPtr) } }) + dataChannel.OnOpen(func() { + // TODO: Refactor. + manager.curImgListeners[cursorChangePtr] = &cursorChange + manager.curPosListeners[cursorPositionPtr] = &cursorPosition + }) + dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { if !session.IsHost() { return @@ -242,13 +301,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } }) - session.SetWebRTCPeer(&WebRTCPeerCtx{ - api: api, - connection: connection, - changeVideo: changeVideo, - dataChannel: dataChannel, - }) - + session.SetWebRTCPeer(peer) return connection.LocalDescription(), nil } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index fe1ea104..1f8f019b 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -4,7 +4,6 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" ) func (h *MessageHandlerCtx) systemInit(session types.Session) error { @@ -33,20 +32,6 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { } } - var cursorImage *message.CursorImage - cur := h.desktop.GetCursorImage() - uri, err := utils.GetCursorImageURI(cur) - if err == nil { - cursorImage = &message.CursorImage{ - Event: event.CURSOR_IMAGE, - Uri: uri, - Width: cur.Width, - Height: cur.Height, - X: cur.Xhot, - Y: cur.Yhot, - } - } - return session.Send( message.SystemInit{ Event: event.SYSTEM_INIT, @@ -59,7 +44,6 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { }, Members: members, ImplicitHosting: h.sessions.ImplicitHosting(), - CursorImage: cursorImage, }) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index bd8803cb..9d1430e9 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -12,7 +12,6 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" ) func New( @@ -93,25 +92,6 @@ func (ws *WebSocketManagerCtx) Start() { } }) - // TOOD: Throttle events. - ws.desktop.OnCursorChanged(func(serial uint64) { - cur := ws.desktop.GetCursorImage() - uri, err := utils.GetCursorImageURI(cur) - if err != nil { - ws.logger.Warn().Err(err).Msg("could create cursor image") - return - } - - ws.sessions.Broadcast(message.CursorImage{ - Event: event.CURSOR_IMAGE, - Uri: uri, - Width: cur.Width, - Height: cur.Height, - X: cur.Xhot, - Y: cur.Yhot, - }, nil) - }) - ws.desktop.OnClipboardUpdated(func() { session := ws.sessions.GetHost() if session == nil || !session.CanAccessClipboard() { @@ -134,47 +114,6 @@ func (ws *WebSocketManagerCtx) Start() { }) ws.fileChooserDialogEvents() - - go func() { - ws.logger.Debug().Msg("cursor position broadcast start") - - defer func() { - ws.logger.Debug().Msg("cursor position broadcast shutdown") - }() - - var posX int - var posY int - - for { - select { - case <-ws.shutdown: - return - default: - time.Sleep(40 * time.Millisecond) - - session := ws.sessions.GetHost() - if session == nil { - continue - } - - x, y := ws.desktop.GetMousePositon() - if posX == x && posY == y { - continue - } - - memberId := session.ID() - posX = x - posY = y - - ws.sessions.Broadcast(message.CursorPosition{ - Event: event.CURSOR_POSITION, - MemberId: memberId, - X: uint16(x), - Y: uint16(y), - }, []string{ memberId }) - } - } - }() } func (ws *WebSocketManagerCtx) Shutdown() error { From 732764991bddde1ab06052dbfe353a3abf066051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Feb 2021 14:23:33 +0100 Subject: [PATCH 365/876] fix linter errors. --- internal/capture/manager.go | 2 -- internal/webrtc/manager.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 4bce6cdc..94b0e5d7 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -2,7 +2,6 @@ package capture import ( "fmt" - "sync" "math" "github.com/rs/zerolog" @@ -15,7 +14,6 @@ import ( type CaptureManagerCtx struct { logger zerolog.Logger - mu sync.Mutex desktop types.DesktopManager streaming bool broadcast *BroacastManagerCtx diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index a8a90424..9981caf7 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -12,7 +12,6 @@ import ( "github.com/rs/zerolog/log" "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" "demodesk/neko/internal/config" @@ -33,7 +32,6 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con type WebRTCManagerCtx struct { logger zerolog.Logger audioTrack *webrtc.TrackLocalStaticSample - audioCodec codec.RTPCodec audioStop func() desktop types.DesktopManager capture types.CaptureManager From 45679f1b86c6e3356597d93c19693f53b86c4be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Feb 2021 14:40:17 +0100 Subject: [PATCH 366/876] format Go source code. --- cmd/serve.go | 2 +- internal/api/members/controler.go | 12 +- internal/api/members/handler.go | 2 +- internal/api/room/broadcast.go | 6 +- internal/api/room/clipboard.go | 2 +- internal/api/room/control.go | 8 +- internal/api/room/handler.go | 2 +- internal/api/room/keyboard.go | 14 +- internal/api/room/screen.go | 6 +- internal/api/room/upload.go | 8 +- internal/api/router.go | 2 +- internal/api/session.go | 30 ++-- internal/capture/broadcast.go | 22 +-- internal/capture/gst/gst.go | 22 +-- internal/capture/manager.go | 158 ++++++++++----------- internal/capture/screencast.go | 40 +++--- internal/capture/stream.go | 42 +++--- internal/config/capture.go | 14 +- internal/desktop/clipboard.go | 4 +- internal/desktop/drop.go | 6 +- internal/desktop/drop/drop.go | 2 +- internal/desktop/filechooserdialog.go | 34 ++--- internal/desktop/manager.go | 28 ++-- internal/desktop/xevent/xevent.go | 2 +- internal/desktop/xorg.go | 6 +- internal/desktop/xorg/xorg.go | 12 +- internal/http/manager.go | 6 +- internal/session/auth.go | 2 +- internal/session/database/dummy/adapter.go | 2 +- internal/session/database/file/adapter.go | 2 +- internal/session/database/manager.go | 2 +- internal/session/manager.go | 30 ++-- internal/types/codec/codecs.go | 84 +++++------ internal/types/desktop.go | 2 +- internal/types/event/events.go | 14 +- internal/types/message/messages.go | 14 +- internal/types/session.go | 6 +- internal/utils/cursor.go | 2 +- internal/utils/http.go | 6 +- internal/webrtc/handler.go | 8 +- internal/webrtc/logger.go | 16 +-- internal/webrtc/manager.go | 40 +++--- internal/webrtc/peer.go | 10 +- internal/webrtc/send.go | 16 +-- internal/websocket/filechooserdialog.go | 11 +- internal/websocket/handler/handler.go | 20 +-- internal/websocket/handler/keyboard.go | 5 +- internal/websocket/handler/screen.go | 4 +- internal/websocket/handler/send.go | 12 +- internal/websocket/handler/session.go | 2 +- internal/websocket/handler/signal.go | 4 +- internal/websocket/handler/system.go | 8 +- internal/websocket/manager.go | 24 ++-- neko.go | 54 +++---- 54 files changed, 445 insertions(+), 447 deletions(-) diff --git a/cmd/serve.go b/cmd/serve.go index 91e69d54..95ab608b 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" "demodesk/neko" - "demodesk/neko/modules" "demodesk/neko/internal/config" + "demodesk/neko/modules" ) func init() { diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index e35d326e..282fe01c 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -3,8 +3,8 @@ package members import ( "net/http" - "demodesk/neko/internal/utils" "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" ) type MemberDataPayload struct { @@ -29,11 +29,11 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { data := &MemberDataPayload{ // default values MemberProfile: &types.MemberProfile{ - IsAdmin: false, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, + IsAdmin: false, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, CanAccessClipboard: true, }, } diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 0320c7e6..555058a7 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -6,9 +6,9 @@ import ( "github.com/go-chi/chi" + "demodesk/neko/internal/http/auth" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" - "demodesk/neko/internal/http/auth" ) type key int diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index a8f7e84c..b3722f53 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -3,14 +3,14 @@ package room import ( "net/http" - "demodesk/neko/internal/utils" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" + "demodesk/neko/internal/utils" ) type BroadcastStatusPayload struct { - URL string `json:"url,omitempty"` - IsActive bool `json:"is_active"` + URL string `json:"url,omitempty"` + IsActive bool `json:"is_active"` } func (h *RoomHandler) broadcastStatus(w http.ResponseWriter, r *http.Request) { diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 3bd19341..a241c15f 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -6,8 +6,8 @@ import ( //"strings" "net/http" - "demodesk/neko/internal/utils" "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" ) type ClipboardPayload struct { diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 92a47571..2e895010 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -5,15 +5,15 @@ import ( "github.com/go-chi/chi" + "demodesk/neko/internal/http/auth" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" "demodesk/neko/internal/utils" - "demodesk/neko/internal/http/auth" ) type ControlStatusPayload struct { - HasHost bool `json:"has_host"` - HostId string `json:"host_id,omitempty"` + HasHost bool `json:"has_host"` + HostId string `json:"host_id,omitempty"` } type ControlTargetPayload struct { @@ -30,7 +30,7 @@ func (h *RoomHandler) controlStatus(w http.ResponseWriter, r *http.Request) { } else { utils.HttpSuccess(w, ControlStatusPayload{ HasHost: true, - HostId: host.ID(), + HostId: host.ID(), }) } } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 9da74aca..2aa3fe19 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -5,8 +5,8 @@ import ( "github.com/go-chi/chi" - "demodesk/neko/internal/types" "demodesk/neko/internal/http/auth" + "demodesk/neko/internal/types" "demodesk/neko/internal/utils" ) diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 1a3bf8c9..88d1fb58 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -3,8 +3,8 @@ package room import ( "net/http" - "demodesk/neko/internal/utils" "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" ) type KeyboardMapData struct { @@ -24,11 +24,11 @@ func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) { } err := h.desktop.SetKeyboardMap(types.KeyboardMap{ - Layout: data.Layout, + Layout: data.Layout, Variant: data.Variant, }) - if err != nil{ + if err != nil { utils.HttpInternalServerError(w, "Unable to change keyboard map.") return } @@ -39,13 +39,13 @@ func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) keyboardMapGet(w http.ResponseWriter, r *http.Request) { data, err := h.desktop.GetKeyboardMap() - if err != nil{ + if err != nil { utils.HttpInternalServerError(w, "Unable to get keyboard map.") return } utils.HttpSuccess(w, KeyboardMapData{ - Layout: data.Layout, + Layout: data.Layout, Variant: data.Variant, }) } @@ -57,7 +57,7 @@ func (h *RoomHandler) keyboardModifiersSet(w http.ResponseWriter, r *http.Reques } h.desktop.SetKeyboardModifiers(types.KeyboardModifiers{ - NumLock: data.NumLock, + NumLock: data.NumLock, CapsLock: data.CapsLock, }) utils.HttpSuccess(w) @@ -67,7 +67,7 @@ func (h *RoomHandler) keyboardModifiersGet(w http.ResponseWriter, r *http.Reques data := h.desktop.GetKeyboardModifiers() utils.HttpSuccess(w, KeyboardModifiersData{ - NumLock: data.NumLock, + NumLock: data.NumLock, CapsLock: data.CapsLock, }) } diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index ddd7a398..b453e45f 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -3,8 +3,8 @@ package room import ( "bytes" "image/jpeg" - "strconv" "net/http" + "strconv" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" @@ -40,9 +40,9 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R } if err := h.desktop.SetScreenSize(types.ScreenSize{ - Width: data.Width, + Width: data.Width, Height: data.Height, - Rate: data.Rate, + Rate: data.Rate, }); err != nil { utils.HttpUnprocessableEntity(w, err) return diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 1bbce9d4..52b224ac 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -1,12 +1,12 @@ package room import ( - "os" "io" "io/ioutil" + "net/http" + "os" "path" "strconv" - "net/http" "demodesk/neko/internal/utils" ) @@ -62,7 +62,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { defer srcFile.Close() - dstFile, err := os.OpenFile(path, os.O_APPEND | os.O_CREATE | os.O_WRONLY, 0644) + dstFile, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { utils.HttpInternalServerError(w, err) return @@ -125,7 +125,7 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { defer srcFile.Close() - dstFile, err := os.OpenFile(path, os.O_APPEND | os.O_CREATE | os.O_WRONLY, 0644) + dstFile, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { utils.HttpInternalServerError(w, err) return diff --git a/internal/api/router.go b/internal/api/router.go index 33bdb1d6..c57ee9dc 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -7,10 +7,10 @@ import ( "demodesk/neko/internal/api/members" "demodesk/neko/internal/api/room" + "demodesk/neko/internal/config" "demodesk/neko/internal/http/auth" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" - "demodesk/neko/internal/config" ) type ApiManagerCtx struct { diff --git a/internal/api/session.go b/internal/api/session.go index 72821431..89fb787e 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -1,12 +1,12 @@ package api import ( - "time" "net/http" + "time" - "demodesk/neko/internal/utils" - "demodesk/neko/internal/types" "demodesk/neko/internal/http/auth" + "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" ) type SessionLoginPayload struct { @@ -33,16 +33,16 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { } http.SetCookie(w, &http.Cookie{ - Name: "neko-id", - Value: session.ID(), - Expires: time.Now().Add(365 * 24 * time.Hour), + Name: "neko-id", + Value: session.ID(), + Expires: time.Now().Add(365 * 24 * time.Hour), HttpOnly: false, }) http.SetCookie(w, &http.Cookie{ - Name: "neko-secret", - Value: data.Secret, - Expires: time.Now().Add(365 * 24 * time.Hour), + Name: "neko-secret", + Value: data.Secret, + Expires: time.Now().Add(365 * 24 * time.Hour), HttpOnly: true, }) @@ -55,16 +55,16 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { http.SetCookie(w, &http.Cookie{ - Name: "neko-id", - Value: "", - Expires: time.Unix(0, 0), + Name: "neko-id", + Value: "", + Expires: time.Unix(0, 0), HttpOnly: false, }) http.SetCookie(w, &http.Cookie{ - Name: "neko-secret", - Value: "", - Expires: time.Unix(0, 0), + Name: "neko-secret", + Value: "", + Expires: time.Unix(0, 0), HttpOnly: true, }) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 7bcce951..802ace89 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -2,8 +2,8 @@ package capture import ( "fmt" - "sync" "strings" + "sync" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -12,20 +12,20 @@ import ( ) type BroacastManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - pipelineStr string - pipeline *gst.Pipeline - started bool - url string + logger zerolog.Logger + mu sync.Mutex + pipelineStr string + pipeline *gst.Pipeline + started bool + url string } func broadcastNew(pipelineStr string) *BroacastManagerCtx { return &BroacastManagerCtx{ - logger: log.With().Str("module", "capture").Str("submodule", "broadcast").Logger(), - pipelineStr: pipelineStr, - started: false, - url: "", + logger: log.With().Str("module", "capture").Str("submodule", "broadcast").Logger(), + pipelineStr: pipelineStr, + started: false, + url: "", } } diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 33ffe629..a7c0683b 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -8,18 +8,18 @@ package gst import "C" import ( "fmt" - "time" "sync" + "time" "unsafe" "demodesk/neko/internal/types" ) type Pipeline struct { - Pipeline *C.GstElement - Sample chan types.Sample - Src string - id int + Pipeline *C.GstElement + Sample chan types.Sample + Src string + id int } var pipelines = make(map[int]*Pipeline) @@ -45,14 +45,14 @@ func CreatePipeline(pipelineStr string) (*Pipeline, error) { if gstError != nil { defer C.g_error_free(gstError) - return nil, fmt.Errorf("(pipeline error) %s", C.GoString(gstError.message)) + return nil, fmt.Errorf("(pipeline error) %s", C.GoString(gstError.message)) } p := &Pipeline{ - Pipeline: gstPipeline, - Sample: make(chan types.Sample), - Src: pipelineStr, - id: len(pipelines), + Pipeline: gstPipeline, + Sample: make(chan types.Sample), + Src: pipelineStr, + id: len(pipelines), } pipelines[p.id] = p @@ -96,7 +96,7 @@ func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.i if ok { pipeline.Sample <- types.Sample{ - Data: C.GoBytes(buffer, bufferLen), + Data: C.GoBytes(buffer, bufferLen), Duration: time.Duration(duration), } } else { diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 94b0e5d7..c90d492f 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -7,20 +7,20 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "demodesk/neko/internal/config" "demodesk/neko/internal/types" "demodesk/neko/internal/types/codec" - "demodesk/neko/internal/config" ) type CaptureManagerCtx struct { - logger zerolog.Logger - desktop types.DesktopManager - streaming bool - broadcast *BroacastManagerCtx - screencast *ScreencastManagerCtx - audio *StreamManagerCtx - videos map[string]*StreamManagerCtx - videoIDs []string + logger zerolog.Logger + desktop types.DesktopManager + streaming bool + broadcast *BroacastManagerCtx + screencast *ScreencastManagerCtx + audio *StreamManagerCtx + videos map[string]*StreamManagerCtx + videoIDs []string } func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { @@ -29,124 +29,124 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt broadcastPipeline := config.BroadcastPipeline if broadcastPipeline == "" { broadcastPipeline = fmt.Sprintf( - "flvmux name=mux ! rtmpsink location='{url} live=1' " + - "pulsesrc device=%s " + - "! audio/x-raw,channels=2 " + - "! audioconvert " + - "! queue " + - "! voaacenc " + - "! mux. " + - "ximagesrc display-name=%s show-pointer=true use-damage=false " + - "! video/x-raw " + - "! videoconvert " + - "! queue " + - "! x264enc threads=4 bitrate=4096 key-int-max=15 byte-stream=true byte-stream=true tune=zerolatency speed-preset=veryfast " + - "! mux.", config.Device, config.Display, + "flvmux name=mux ! rtmpsink location='{url} live=1' "+ + "pulsesrc device=%s "+ + "! audio/x-raw,channels=2 "+ + "! audioconvert "+ + "! queue "+ + "! voaacenc "+ + "! mux. "+ + "ximagesrc display-name=%s show-pointer=true use-damage=false "+ + "! video/x-raw "+ + "! videoconvert "+ + "! queue "+ + "! x264enc threads=4 bitrate=4096 key-int-max=15 byte-stream=true byte-stream=true tune=zerolatency speed-preset=veryfast "+ + "! mux.", config.Device, config.Display, ) } screencastPipeline := config.ScreencastPipeline if screencastPipeline == "" { screencastPipeline = fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=true use-damage=false " + - "! video/x-raw,framerate=%s " + - "! videoconvert " + - "! queue " + - "! jpegenc quality=%s " + + "ximagesrc display-name=%s show-pointer=true use-damage=false "+ + "! video/x-raw,framerate=%s "+ + "! videoconvert "+ + "! queue "+ + "! jpegenc quality=%s "+ "! appsink name=appsink", config.Display, config.ScreencastRate, config.ScreencastQuality, ) } return &CaptureManagerCtx{ - logger: logger, - desktop: desktop, - streaming: false, - broadcast: broadcastNew(broadcastPipeline), - screencast: screencastNew(config.Screencast, screencastPipeline), - audio: streamNew(config.AudioCodec, func() string { + logger: logger, + desktop: desktop, + streaming: false, + broadcast: broadcastNew(broadcastPipeline), + screencast: screencastNew(config.Screencast, screencastPipeline), + audio: streamNew(config.AudioCodec, func() string { if config.AudioPipeline != "" { return config.AudioPipeline } return fmt.Sprintf( - "pulsesrc device=%s " + - "! audio/x-raw,channels=2 " + - "! audioconvert " + - "! queue " + - "! %s " + + "pulsesrc device=%s "+ + "! audio/x-raw,channels=2 "+ + "! audioconvert "+ + "! queue "+ + "! %s "+ "! appsink name=appsink", config.Device, config.AudioCodec.Pipeline, ) }), - videos: map[string]*StreamManagerCtx{ + videos: map[string]*StreamManagerCtx{ "hd": streamNew(codec.VP8(), func() string { - screen := desktop.GetScreenSize() + screen := desktop.GetScreenSize() bitrate := screen.Width * screen.Height * 12 return fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw,framerate=25/1 " + - "! videoconvert " + - "! queue " + - "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 " + + "ximagesrc display-name=%s show-pointer=false use-damage=false "+ + "! video/x-raw,framerate=25/1 "+ + "! videoconvert "+ + "! queue "+ + "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 "+ "! appsink name=appsink", config.Display, bitrate, ) }), "hq": streamNew(codec.VP8(), func() string { - screen := desktop.GetScreenSize() - width := int(math.Ceil(float64(screen.Width) / 6) * 5) - height := int(math.Ceil(float64(screen.Height) / 6) * 5) + screen := desktop.GetScreenSize() + width := int(math.Ceil(float64(screen.Width)/6) * 5) + height := int(math.Ceil(float64(screen.Height)/6) * 5) bitrate := width * height * 12 return fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw,framerate=25/1 " + - "! videoconvert " + - "! queue " + - "! videoscale " + - "! video/x-raw,width=%d,height=%d " + - "! queue " + - "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 " + + "ximagesrc display-name=%s show-pointer=false use-damage=false "+ + "! video/x-raw,framerate=25/1 "+ + "! videoconvert "+ + "! queue "+ + "! videoscale "+ + "! video/x-raw,width=%d,height=%d "+ + "! queue "+ + "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 "+ "! appsink name=appsink", config.Display, width, height, bitrate, ) }), "mq": streamNew(codec.VP8(), func() string { - screen := desktop.GetScreenSize() - width := int(math.Ceil(float64(screen.Width) / 6) * 4) - height := int(math.Ceil(float64(screen.Height) / 6) * 4) + screen := desktop.GetScreenSize() + width := int(math.Ceil(float64(screen.Width)/6) * 4) + height := int(math.Ceil(float64(screen.Height)/6) * 4) bitrate := width * height * 8 return fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw,framerate=125/10 " + - "! videoconvert " + - "! queue " + - "! videoscale " + - "! video/x-raw,width=%d,height=%d " + - "! queue " + - "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 " + + "ximagesrc display-name=%s show-pointer=false use-damage=false "+ + "! video/x-raw,framerate=125/10 "+ + "! videoconvert "+ + "! queue "+ + "! videoscale "+ + "! video/x-raw,width=%d,height=%d "+ + "! queue "+ + "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 "+ "! appsink name=appsink", config.Display, width, height, bitrate, ) }), "lq": streamNew(codec.VP8(), func() string { - screen := desktop.GetScreenSize() - width := int(math.Ceil(float64(screen.Width) / 6) * 3) - height := int(math.Ceil(float64(screen.Height) / 6) * 3) + screen := desktop.GetScreenSize() + width := int(math.Ceil(float64(screen.Width)/6) * 3) + height := int(math.Ceil(float64(screen.Height)/6) * 3) bitrate := width * height * 4 return fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false " + - "! video/x-raw,framerate=125/10 " + - "! videoconvert " + - "! queue " + - "! videoscale " + - "! video/x-raw,width=%d,height=%d " + - "! queue " + - "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 " + + "ximagesrc display-name=%s show-pointer=false use-damage=false "+ + "! video/x-raw,framerate=125/10 "+ + "! videoconvert "+ + "! queue "+ + "! videoscale "+ + "! video/x-raw,width=%d,height=%d "+ + "! queue "+ + "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 "+ "! appsink name=appsink", config.Display, width, height, bitrate, ) }), }, - videoIDs: []string{ "hd", "hq", "mq", "lq" }, + videoIDs: []string{"hd", "hq", "mq", "lq"}, } } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index cfce69f9..df788899 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -2,41 +2,41 @@ package capture import ( "fmt" - "time" "sync" "sync/atomic" + "time" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" "demodesk/neko/internal/capture/gst" + "demodesk/neko/internal/types" ) type ScreencastManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - pipelineStr string - pipeline *gst.Pipeline - enabled bool - started bool - emitStop chan bool - emitUpdate chan bool - expired int32 - sample chan types.Sample - image types.Sample + logger zerolog.Logger + mu sync.Mutex + pipelineStr string + pipeline *gst.Pipeline + enabled bool + started bool + emitStop chan bool + emitUpdate chan bool + expired int32 + sample chan types.Sample + image types.Sample } const screencastTimeout = 5 * time.Second func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { manager := &ScreencastManagerCtx{ - logger: log.With().Str("module", "capture").Str("submodule", "screencast").Logger(), - pipelineStr: pipelineStr, - enabled: enabled, - started: false, - emitStop: make(chan bool), - emitUpdate: make(chan bool), + logger: log.With().Str("module", "capture").Str("submodule", "screencast").Logger(), + pipelineStr: pipelineStr, + enabled: enabled, + started: false, + emitStop: make(chan bool), + emitUpdate: make(chan bool), } go func() { @@ -146,7 +146,7 @@ func (manager *ScreencastManagerCtx) createPipeline() error { manager.pipeline.Start() manager.sample = manager.pipeline.Sample - manager.emitUpdate <-true + manager.emitUpdate <- true return nil } diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 61d6ef80..dd3f13f2 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -2,40 +2,40 @@ package capture import ( "fmt" - "sync" "reflect" + "sync" "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "demodesk/neko/internal/capture/gst" "demodesk/neko/internal/types" "demodesk/neko/internal/types/codec" - "demodesk/neko/internal/capture/gst" ) type StreamManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - codec codec.RTPCodec - pipelineStr func() string - pipeline *gst.Pipeline - sample chan types.Sample - listeners map[uintptr]*func(sample types.Sample) - emitMu sync.Mutex - emitUpdate chan bool - emitStop chan bool - started bool + logger zerolog.Logger + mu sync.Mutex + codec codec.RTPCodec + pipelineStr func() string + pipeline *gst.Pipeline + sample chan types.Sample + listeners map[uintptr]*func(sample types.Sample) + emitMu sync.Mutex + emitUpdate chan bool + emitStop chan bool + started bool } func streamNew(codec codec.RTPCodec, pipelineStr func() string) *StreamManagerCtx { manager := &StreamManagerCtx{ - logger: log.With().Str("module", "capture").Str("submodule", "stream").Logger(), - codec: codec, - pipelineStr: pipelineStr, - listeners: map[uintptr]*func(sample types.Sample){}, - emitUpdate: make(chan bool), - emitStop: make(chan bool), - started: false, + logger: log.With().Str("module", "capture").Str("submodule", "stream").Logger(), + codec: codec, + pipelineStr: pipelineStr, + listeners: map[uintptr]*func(sample types.Sample){}, + emitUpdate: make(chan bool), + emitStop: make(chan bool), + started: false, } go func() { @@ -146,7 +146,7 @@ func (manager *StreamManagerCtx) createPipeline() error { manager.pipeline.Start() manager.sample = manager.pipeline.Sample - manager.emitUpdate <-true + manager.emitUpdate <- true return nil } diff --git a/internal/config/capture.go b/internal/config/capture.go index e0df9036..80c13a69 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -8,15 +8,15 @@ import ( ) type Capture struct { - Device string - AudioCodec codec.RTPCodec - AudioPipeline string + Device string + AudioCodec codec.RTPCodec + AudioPipeline string - Display string - //VideoCodec codec.RTPCodec - //VideoPipeline string + Display string + //VideoCodec codec.RTPCodec + //VideoPipeline string - BroadcastPipeline string + BroadcastPipeline string Screencast bool ScreencastRate string diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index ec6876e6..4cc6006e 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -1,8 +1,8 @@ package desktop import ( - "fmt" "bytes" + "fmt" "os/exec" "strings" @@ -58,7 +58,7 @@ func (manager *DesktopManagerCtx) ClipboardSetBinary(mime string, data []byte) e var stderr bytes.Buffer cmd.Stderr = &stderr - stdin, err := cmd.StdinPipe() + stdin, err := cmd.StdinPipe() if err != nil { return err } diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index 5e3ce48e..6dbf186b 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -8,7 +8,7 @@ import ( const ( DROP_MOVE_REPEAT = 4 - DROP_DELAY = 100 * time.Millisecond + DROP_DELAY = 100 * time.Millisecond ) func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { @@ -49,10 +49,10 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { go drop.OpenWindow(files) select { - case succeeded := <- finished: + case succeeded := <-finished: return succeeded case <-time.After(1 * time.Second): - drop.CloseWindow(); + drop.CloseWindow() return false } } diff --git a/internal/desktop/drop/drop.go b/internal/desktop/drop/drop.go index dd06f993..15ecbeb7 100644 --- a/internal/desktop/drop/drop.go +++ b/internal/desktop/drop/drop.go @@ -25,7 +25,7 @@ func OpenWindow(files []string) { defer mu.Unlock() size := C.int(len(files)) - urisUnsafe := C.dragUrisMake(size); + urisUnsafe := C.dragUrisMake(size) defer C.dragUrisFree(urisUnsafe, size) for i, file := range files { diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index 192d578b..85fb22e1 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -2,8 +2,8 @@ package desktop import ( "fmt" - "time" "os/exec" + "time" ) const ( @@ -19,19 +19,19 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { // TODO: Use native API. err1 := exec.Command( "xdotool", - "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", - "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, - "key", "--clearmodifiers", "ctrl+l", - "type", "--args", "1", uri + "//", - "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, - "key", "Delete", // remove autocomplete results - "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, - "key", "Return", - "sleep", FILE_CHOOSER_DIALOG_LONG_SLEEP, - "key", "Down", - "key", "--clearmodifiers", "ctrl+a", - "key", "Return", - "sleep", FILE_CHOOSER_DIALOG_LONG_SLEEP, + "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", + "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, + "key", "--clearmodifiers", "ctrl+l", + "type", "--args", "1", uri+"//", + "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, + "key", "Delete", // remove autocomplete results + "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, + "key", "Return", + "sleep", FILE_CHOOSER_DIALOG_LONG_SLEEP, + "key", "Down", + "key", "--clearmodifiers", "ctrl+a", + "key", "Return", + "sleep", FILE_CHOOSER_DIALOG_LONG_SLEEP, ).Run() if err1 != nil { @@ -41,7 +41,7 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { // TODO: Use native API. err2 := exec.Command( "xdotool", - "search", "--name", FILE_CHOOSER_DIALOG_NAME, + "search", "--name", FILE_CHOOSER_DIALOG_NAME, ).Run() // if last command didn't return error, consider dialog as still open @@ -61,7 +61,7 @@ func (manager *DesktopManagerCtx) CloseFileChooserDialog() { // TODO: Use native API. err := exec.Command( "xdotool", - "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", + "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", ).Run() if err != nil { @@ -92,7 +92,7 @@ func (manager *DesktopManagerCtx) IsFileChooserDialogOpened() bool { // TODO: Use native API. err := exec.Command( "xdotool", - "search", "--name", FILE_CHOOSER_DIALOG_NAME, + "search", "--name", FILE_CHOOSER_DIALOG_NAME, ).Run() return err == nil diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index a4816457..38534c7f 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -2,37 +2,37 @@ package desktop import ( "fmt" - "time" "sync" + "time" "github.com/kataras/go-events" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "demodesk/neko/internal/config" - "demodesk/neko/internal/desktop/xorg" "demodesk/neko/internal/desktop/xevent" + "demodesk/neko/internal/desktop/xorg" ) var mu = sync.Mutex{} type DesktopManagerCtx struct { - logger zerolog.Logger - cleanup *time.Ticker - shutdown chan bool - emmiter events.EventEmmiter - display string - config *config.Desktop + logger zerolog.Logger + cleanup *time.Ticker + shutdown chan bool + emmiter events.EventEmmiter + display string + config *config.Desktop } func New(display string, config *config.Desktop) *DesktopManagerCtx { return &DesktopManagerCtx{ - logger: log.With().Str("module", "desktop").Logger(), - cleanup: time.NewTicker(1 * time.Second), - shutdown: make(chan bool), - emmiter: events.New(), - display: display, - config: config, + logger: log.With().Str("module", "desktop").Logger(), + cleanup: time.NewTicker(1 * time.Second), + shutdown: make(chan bool), + emmiter: events.New(), + display: display, + config: config, } } diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go index a5b34404..42decebb 100644 --- a/internal/desktop/xevent/xevent.go +++ b/internal/desktop/xevent/xevent.go @@ -8,9 +8,9 @@ package xevent import "C" import ( + "strings" "time" "unsafe" - "strings" "github.com/kataras/go-events" ) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 3ad15dc1..ff09a5d0 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -2,11 +2,11 @@ package desktop import ( "image" - "regexp" "os/exec" + "regexp" - "demodesk/neko/internal/types" "demodesk/neko/internal/desktop/xorg" + "demodesk/neko/internal/types" ) // TODO: Refactor. @@ -119,7 +119,7 @@ func (manager *DesktopManagerCtx) GetKeyboardModifiers() types.KeyboardModifiers CapsLock := (modifiers & xorg.KBD_CAPS_LOCK) != 0 return types.KeyboardModifiers{ - NumLock: &NumLock, + NumLock: &NumLock, CapsLock: &CapsLock, } } diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index e3d6fa68..92f41b1e 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -236,13 +236,13 @@ func GetCursorImage() *types.CursorImage { height := uint16(cur.height) return &types.CursorImage{ - Width: width, + Width: width, Height: height, - Xhot: uint16(cur.xhot), - Yhot: uint16(cur.yhot), + Xhot: uint16(cur.xhot), + Yhot: uint16(cur.yhot), Serial: uint64(cur.cursor_serial), // Xlib stores 32-bit data in longs, even if longs are 64-bits long. - Pixels: C.GoBytes(unsafe.Pointer(cur.pixels), C.int(width * height * 8)), + Pixels: C.GoBytes(unsafe.Pointer(cur.pixels), C.int(width*height*8)), } } @@ -252,7 +252,7 @@ func GetScreenshotImage() *image.RGBA { var w, h C.int pixelsUnsafe := C.XGetScreenshot(&w, &h) - pixels := C.GoBytes(unsafe.Pointer(pixelsUnsafe), w * h * 3) + pixels := C.GoBytes(unsafe.Pointer(pixelsUnsafe), w*h*3) defer C.free(unsafe.Pointer(pixelsUnsafe)) width := int(w) @@ -288,7 +288,7 @@ func goSetScreenRates(index C.int, rate_index C.int, rateC C.short) { rate := int16(rateC) // filter out all irrelevant rates - if rate > 60 || (rate > 30 && rate % 10 != 0){ + if rate > 60 || (rate > 30 && rate%10 != 0) { return } diff --git a/internal/http/manager.go b/internal/http/manager.go index da8b3cff..e6111803 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -11,8 +11,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" "demodesk/neko/internal/config" + "demodesk/neko/internal/types" "demodesk/neko/internal/utils" ) @@ -29,7 +29,7 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c router := chi.NewRouter() router.Use(middleware.Recoverer) // Recover from panics without crashing server router.Use(cors.Handler(cors.Options{ - AllowOriginFunc: func(r *http.Request, origin string) bool { + AllowOriginFunc: func(r *http.Request, origin string) bool { return conf.AllowOrigin(origin) }, AllowedMethods: []string{"GET", "POST", "DELETE", "OPTIONS"}, @@ -39,7 +39,7 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c MaxAge: 300, // Maximum value not ignored by any of major browsers })) router.Use(middleware.RequestID) // Create a request ID for each request - router.Use(Logger) // Log API request calls using custom logger function + router.Use(Logger) // Log API request calls using custom logger function router.Route("/api", ApiManager.Route) diff --git a/internal/session/auth.go b/internal/session/auth.go index 2c9be576..b49da1e2 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -55,4 +55,4 @@ func getAuthData(r *http.Request) (string, string, bool) { } return "", "", false -} \ No newline at end of file +} diff --git a/internal/session/database/dummy/adapter.go b/internal/session/database/dummy/adapter.go index 7197f06e..5155d213 100644 --- a/internal/session/database/dummy/adapter.go +++ b/internal/session/database/dummy/adapter.go @@ -8,7 +8,7 @@ func New() types.MembersDatabase { return &MembersDatabaseCtx{} } -type MembersDatabaseCtx struct {} +type MembersDatabaseCtx struct{} func (manager *MembersDatabaseCtx) Connect() error { return nil diff --git a/internal/session/database/file/adapter.go b/internal/session/database/file/adapter.go index e24c0067..0508d4ed 100644 --- a/internal/session/database/file/adapter.go +++ b/internal/session/database/file/adapter.go @@ -2,9 +2,9 @@ package file import ( "encoding/json" + "fmt" "io/ioutil" "os" - "fmt" "sync" "demodesk/neko/internal/types" diff --git a/internal/session/database/manager.go b/internal/session/database/manager.go index 5a470afe..a1c7bc5a 100644 --- a/internal/session/database/manager.go +++ b/internal/session/database/manager.go @@ -1,11 +1,11 @@ package database import ( + "demodesk/neko/internal/config" "demodesk/neko/internal/session/database/dummy" "demodesk/neko/internal/session/database/file" "demodesk/neko/internal/session/database/object" "demodesk/neko/internal/types" - "demodesk/neko/internal/config" ) func New(config *config.Session) types.MembersDatabase { diff --git a/internal/session/manager.go b/internal/session/manager.go index a8702d26..d6cbd786 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "demodesk/neko/internal/config" "demodesk/neko/internal/session/database" "demodesk/neko/internal/types" - "demodesk/neko/internal/config" "demodesk/neko/internal/utils" ) @@ -72,25 +72,25 @@ func (manager *SessionManagerCtx) Connect() error { // create default admin account at startup _ = manager.add("admin", types.MemberProfile{ - Secret: manager.config.AdminPassword, - Name: "Administrator", - IsAdmin: true, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, + Secret: manager.config.AdminPassword, + Name: "Administrator", + IsAdmin: true, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, CanAccessClipboard: true, }) // create default user account at startup _ = manager.add("user", types.MemberProfile{ - Secret: manager.config.Password, - Name: "User", - IsAdmin: false, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, + Secret: manager.config.Password, + Name: "User", + IsAdmin: false, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, CanAccessClipboard: true, }) diff --git a/internal/types/codec/codecs.go b/internal/types/codec/codecs.go index 023cbaca..dd111d59 100644 --- a/internal/types/codec/codecs.go +++ b/internal/types/codec/codecs.go @@ -19,14 +19,14 @@ func (codec *RTPCodec) Register(engine *webrtc.MediaEngine) error { func VP8() RTPCodec { return RTPCodec{ - Name: "vp8", + Name: "vp8", PayloadType: 96, - Type: webrtc.RTPCodecTypeVideo, + Type: webrtc.RTPCodecTypeVideo, Capability: webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypeVP8, - ClockRate: 90000, - Channels: 0, - SDPFmtpLine: "", + MimeType: webrtc.MimeTypeVP8, + ClockRate: 90000, + Channels: 0, + SDPFmtpLine: "", RTCPFeedback: nil, }, // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html @@ -38,14 +38,14 @@ func VP8() RTPCodec { // TODO: Profile ID. func VP9() RTPCodec { return RTPCodec{ - Name: "vp9", + Name: "vp9", PayloadType: 98, - Type: webrtc.RTPCodecTypeVideo, + Type: webrtc.RTPCodecTypeVideo, Capability: webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypeVP9, - ClockRate: 90000, - Channels: 0, - SDPFmtpLine: "profile-id=0", + MimeType: webrtc.MimeTypeVP9, + ClockRate: 90000, + Channels: 0, + SDPFmtpLine: "profile-id=0", RTCPFeedback: nil, }, // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html @@ -57,14 +57,14 @@ func VP9() RTPCodec { // TODO: Profile ID. func H264() RTPCodec { return RTPCodec{ - Name: "h264", + Name: "h264", PayloadType: 102, - Type: webrtc.RTPCodecTypeVideo, + Type: webrtc.RTPCodecTypeVideo, Capability: webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypeH264, - ClockRate: 90000, - Channels: 0, - SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", + MimeType: webrtc.MimeTypeH264, + ClockRate: 90000, + Channels: 0, + SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", RTCPFeedback: nil, }, // https://gstreamer.freedesktop.org/documentation/x264/index.html @@ -78,14 +78,14 @@ func H264() RTPCodec { func Opus() RTPCodec { return RTPCodec{ - Name: "opus", + Name: "opus", PayloadType: 111, - Type: webrtc.RTPCodecTypeAudio, + Type: webrtc.RTPCodecTypeAudio, Capability: webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypeOpus, - ClockRate: 48000, - Channels: 2, - SDPFmtpLine: "", + MimeType: webrtc.MimeTypeOpus, + ClockRate: 48000, + Channels: 2, + SDPFmtpLine: "", RTCPFeedback: nil, }, // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html @@ -96,14 +96,14 @@ func Opus() RTPCodec { func G722() RTPCodec { return RTPCodec{ - Name: "g722", + Name: "g722", PayloadType: 9, - Type: webrtc.RTPCodecTypeAudio, + Type: webrtc.RTPCodecTypeAudio, Capability: webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypeG722, - ClockRate: 8000, - Channels: 0, - SDPFmtpLine: "", + MimeType: webrtc.MimeTypeG722, + ClockRate: 8000, + Channels: 0, + SDPFmtpLine: "", RTCPFeedback: nil, }, // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html @@ -114,14 +114,14 @@ func G722() RTPCodec { func PCMU() RTPCodec { return RTPCodec{ - Name: "pcmu", + Name: "pcmu", PayloadType: 0, - Type: webrtc.RTPCodecTypeAudio, + Type: webrtc.RTPCodecTypeAudio, Capability: webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypePCMU, - ClockRate: 8000, - Channels: 0, - SDPFmtpLine: "", + MimeType: webrtc.MimeTypePCMU, + ClockRate: 8000, + Channels: 0, + SDPFmtpLine: "", RTCPFeedback: nil, }, // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html @@ -132,14 +132,14 @@ func PCMU() RTPCodec { func PCMA() RTPCodec { return RTPCodec{ - Name: "pcma", + Name: "pcma", PayloadType: 8, - Type: webrtc.RTPCodecTypeAudio, + Type: webrtc.RTPCodecTypeAudio, Capability: webrtc.RTPCodecCapability{ - MimeType: webrtc.MimeTypePCMA, - ClockRate: 8000, - Channels: 0, - SDPFmtpLine: "", + MimeType: webrtc.MimeTypePCMA, + ClockRate: 8000, + Channels: 0, + SDPFmtpLine: "", RTCPFeedback: nil, }, // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 8fef3c70..c1018115 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -73,7 +73,7 @@ type DesktopManager interface { OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) // clipboard - ClipboardGetText() (*ClipboardText, error) + ClipboardGetText() (*ClipboardText, error) ClipboardSetText(data ClipboardText) error ClipboardGetBinary(mime string) ([]byte, error) ClipboardSetBinary(mime string, data []byte) error diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 99c55a05..173134d8 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -15,20 +15,20 @@ const ( ) const ( - MEMBER_CREATED = "member/created" - MEMBER_DELETED = "member/deleted" - MEMBER_PROFILE = "member/profile" - MEMBER_STATE = "member/state" + MEMBER_CREATED = "member/created" + MEMBER_DELETED = "member/deleted" + MEMBER_PROFILE = "member/profile" + MEMBER_STATE = "member/state" ) const ( CONTROL_HOST = "control/host" CONTROL_RELEASE = "control/release" CONTROL_REQUEST = "control/request" - CONTROL_MOVE = "control/move" // TODO: New. (fallback) - CONTROL_SCROLL = "control/scroll" // TODO: New. (fallback) + CONTROL_MOVE = "control/move" // TODO: New. (fallback) + CONTROL_SCROLL = "control/scroll" // TODO: New. (fallback) CONTROL_KEYDOWN = "control/keydown" // TODO: New. (fallback) - CONTROL_KEYUP = "control/keyup" // TODO: New. (fallback) + CONTROL_KEYUP = "control/keyup" // TODO: New. (fallback) ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index fef67b8e..23df1025 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -25,9 +25,9 @@ type SystemInit struct { } type SystemAdmin struct { - Event string `json:"event,omitempty"` - ScreenSizesList []ScreenSize `json:"screen_sizes_list"` - BroadcastStatus BroadcastStatus `json:"broadcast_status"` + Event string `json:"event,omitempty"` + ScreenSizesList []ScreenSize `json:"screen_sizes_list"` + BroadcastStatus BroadcastStatus `json:"broadcast_status"` } type SystemDisconnect struct { @@ -96,9 +96,9 @@ type MemberData struct { ///////////////////////////// type ControlHost struct { - Event string `json:"event,omitempty"` - HasHost bool `json:"has_host"` - HostID string `json:"host_id,omitempty"` + Event string `json:"event,omitempty"` + HasHost bool `json:"has_host"` + HostID string `json:"host_id,omitempty"` } // TODO: New. @@ -155,7 +155,7 @@ type KeyboardModifiers struct { Event string `json:"event,omitempty"` CapsLock *bool `json:"caps_lock"` NumLock *bool `json:"num_lock"` - ScrollLock *bool `json:"scroll_lock"` + ScrollLock *bool `json:"scroll_lock"` } ///////////////////////////// diff --git a/internal/types/session.go b/internal/types/session.go index 92a2feaa..80063dcc 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -22,9 +22,9 @@ type MembersDatabase interface { Connect() error Disconnect() error - Insert(id string, profile MemberProfile) error - Update(id string, profile MemberProfile) error - Delete(id string) error + Insert(id string, profile MemberProfile) error + Update(id string, profile MemberProfile) error + Delete(id string) error Select() (map[string]MemberProfile, error) } diff --git a/internal/utils/cursor.go b/internal/utils/cursor.go index 14fb350f..528ac488 100644 --- a/internal/utils/cursor.go +++ b/internal/utils/cursor.go @@ -2,10 +2,10 @@ package utils import ( "bytes" + "encoding/base64" "image" "image/color" "image/png" - "encoding/base64" "demodesk/neko/internal/types" ) diff --git a/internal/utils/http.go b/internal/utils/http.go index 003f9e7c..11debe8c 100644 --- a/internal/utils/http.go +++ b/internal/utils/http.go @@ -1,10 +1,10 @@ package utils import ( - "io" - "fmt" - "net/http" "encoding/json" + "fmt" + "io" + "net/http" "github.com/rs/zerolog/log" ) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index acf336b2..741eca8e 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -9,11 +9,11 @@ import ( ) const ( - OP_MOVE = 0x01 - OP_SCROLL = 0x02 + OP_MOVE = 0x01 + OP_SCROLL = 0x02 OP_KEY_DOWN = 0x03 - OP_KEY_UP = 0x04 - OP_KEY_CLK = 0x05 + OP_KEY_UP = 0x04 + OP_KEY_CLK = 0x05 ) type PayloadHeader struct { diff --git a/internal/webrtc/logger.go b/internal/webrtc/logger.go index 4dfc1058..90c0d7e2 100644 --- a/internal/webrtc/logger.go +++ b/internal/webrtc/logger.go @@ -8,17 +8,17 @@ import ( "github.com/rs/zerolog" ) -type nulllog struct {} +type nulllog struct{} -func (l nulllog) Trace(msg string) {} +func (l nulllog) Trace(msg string) {} func (l nulllog) Tracef(format string, args ...interface{}) {} -func (l nulllog) Debug(msg string) {} +func (l nulllog) Debug(msg string) {} func (l nulllog) Debugf(format string, args ...interface{}) {} -func (l nulllog) Info(msg string) {} -func (l nulllog) Infof(format string, args ...interface{}) {} -func (l nulllog) Warn(msg string) {} -func (l nulllog) Warnf(format string, args ...interface{}) {} -func (l nulllog) Error(msg string) {} +func (l nulllog) Info(msg string) {} +func (l nulllog) Infof(format string, args ...interface{}) {} +func (l nulllog) Warn(msg string) {} +func (l nulllog) Warnf(format string, args ...interface{}) {} +func (l nulllog) Error(msg string) {} func (l nulllog) Errorf(format string, args ...interface{}) {} type logger struct { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 9981caf7..da7b0b2d 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -3,39 +3,39 @@ package webrtc import ( "fmt" "io" - "strings" "reflect" + "strings" "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "demodesk/neko/internal/config" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" - "demodesk/neko/internal/config" ) func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ - logger: log.With().Str("module", "webrtc").Logger(), - desktop: desktop, - capture: capture, - config: config, + logger: log.With().Str("module", "webrtc").Logger(), + desktop: desktop, + capture: capture, + config: config, // TODO: Refactor. - curImgListeners: map[uintptr]*func(cur *types.CursorImage){}, - curPosListeners: map[uintptr]*func(x, y int){}, + curImgListeners: map[uintptr]*func(cur *types.CursorImage){}, + curPosListeners: map[uintptr]*func(x, y int){}, } } type WebRTCManagerCtx struct { - logger zerolog.Logger - audioTrack *webrtc.TrackLocalStaticSample - audioStop func() - desktop types.DesktopManager - capture types.CaptureManager - config *config.WebRTC + logger zerolog.Logger + audioTrack *webrtc.TrackLocalStaticSample + audioStop func() + desktop types.DesktopManager + capture types.CaptureManager + config *config.WebRTC // TODO: Refactor. curImgListeners map[uintptr]*func(cur *types.CursorImage) curPosListeners map[uintptr]*func(x, y int) @@ -58,7 +58,7 @@ func (manager *WebRTCManagerCtx) Start() { } audio.AddListener(&listener) - manager.audioStop = func(){ + manager.audioStop = func() { audio.RemoveListener(&listener) } @@ -193,7 +193,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin if videoStream.ListenersCount() == 0 { videoStream.Stop() } - + videoStream = newVideoStream return nil } @@ -234,10 +234,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } peer := &WebRTCPeerCtx{ - api: api, - connection: connection, - changeVideo: changeVideo, - dataChannel: dataChannel, + api: api, + connection: connection, + changeVideo: changeVideo, + dataChannel: dataChannel, } cursorChange := func(cur *types.CursorImage) { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 08e422eb..2dac155c 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -3,15 +3,15 @@ package webrtc import "github.com/pion/webrtc/v3" type WebRTCPeerCtx struct { - api *webrtc.API - connection *webrtc.PeerConnection - dataChannel *webrtc.DataChannel - changeVideo func(videoID string) error + api *webrtc.API + connection *webrtc.PeerConnection + dataChannel *webrtc.DataChannel + changeVideo func(videoID string) error } func (webrtc_peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { return webrtc_peer.connection.SetRemoteDescription(webrtc.SessionDescription{ - SDP: sdp, + SDP: sdp, Type: webrtc.SDPTypeAnswer, }) } diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index cd2fa64b..d2400107 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -1,9 +1,9 @@ package webrtc import ( - "fmt" "bytes" - "encoding/binary" + "encoding/binary" + "fmt" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" @@ -11,7 +11,7 @@ import ( const ( OP_CURSOR_POSITION = 0x01 - OP_CURSOR_IMAGE = 0x02 + OP_CURSOR_IMAGE = 0x02 ) type PayloadCursorPosition struct { @@ -35,7 +35,7 @@ func (webrtc_peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { data := PayloadCursorPosition{ PayloadHeader: PayloadHeader{ - Event: OP_CURSOR_POSITION, + Event: OP_CURSOR_POSITION, Length: 7, }, X: uint16(x), @@ -62,13 +62,13 @@ func (webrtc_peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error data := PayloadCursorImage{ PayloadHeader: PayloadHeader{ - Event: OP_CURSOR_IMAGE, + Event: OP_CURSOR_IMAGE, Length: uint16(11 + len(img)), }, - Width: cur.Width, + Width: cur.Width, Height: cur.Height, - Xhot: cur.Xhot, - Yhot: cur.Yhot, + Xhot: cur.Xhot, + Yhot: cur.Yhot, } buffer := &bytes.Buffer{} diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index 9ad4def2..f94e9fd4 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -23,8 +23,8 @@ func (ws *WebSocketManagerCtx) fileChooserDialogEvents() { file_chooser_dialog_member = host go ws.sessions.Broadcast(message.MemberID{ - Event: event.FILE_CHOOSER_DIALOG_OPENED, - ID: host.ID(), + Event: event.FILE_CHOOSER_DIALOG_OPENED, + ID: host.ID(), }, nil) }) @@ -35,11 +35,10 @@ func (ws *WebSocketManagerCtx) fileChooserDialogEvents() { file_chooser_dialog_member = nil go ws.sessions.Broadcast(message.MemberID{ - Event: event.FILE_CHOOSER_DIALOG_CLOSED, + Event: event.FILE_CHOOSER_DIALOG_CLOSED, }, nil) }) - // when new user joins, and someone holds dialog, he shouldd be notified about it. ws.sessions.OnConnected(func(session types.Session) { if file_chooser_dialog_member == nil { @@ -47,8 +46,8 @@ func (ws *WebSocketManagerCtx) fileChooserDialogEvents() { } if err := session.Send(message.MemberID{ - Event: event.FILE_CHOOSER_DIALOG_OPENED, - ID: file_chooser_dialog_member.ID(), + Event: event.FILE_CHOOSER_DIALOG_OPENED, + ID: file_chooser_dialog_member.ID(), }); err != nil { ws.logger.Warn(). Str("id", session.ID()). diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 95e59c2f..6e8ac8df 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -21,20 +21,20 @@ func New( logger := log.With().Str("module", "handler").Logger() return &MessageHandlerCtx{ - logger: logger, - sessions: sessions, - desktop: desktop, - capture: capture, - webrtc: webrtc, + logger: logger, + sessions: sessions, + desktop: desktop, + capture: capture, + webrtc: webrtc, } } type MessageHandlerCtx struct { - logger zerolog.Logger - sessions types.SessionManager - webrtc types.WebRTCManager - desktop types.DesktopManager - capture types.CaptureManager + logger zerolog.Logger + sessions types.SessionManager + webrtc types.WebRTCManager + desktop types.DesktopManager + capture types.CaptureManager } func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 867b28ff..85968d85 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -5,7 +5,6 @@ import ( "demodesk/neko/internal/types/message" ) - func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error { if !session.IsHost() { h.logger.Debug().Str("id", session.ID()).Msg("is not the host") @@ -13,7 +12,7 @@ func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message. } return h.desktop.SetKeyboardMap(types.KeyboardMap{ - Layout: payload.Layout, + Layout: payload.Layout, Variant: payload.Variant, }) } @@ -25,7 +24,7 @@ func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *me } h.desktop.SetKeyboardModifiers(types.KeyboardModifiers{ - NumLock: payload.NumLock, + NumLock: payload.NumLock, CapsLock: payload.CapsLock, }) return nil diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 1062d46b..7caf158a 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -13,9 +13,9 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc } if err := h.desktop.SetScreenSize(types.ScreenSize{ - Width: payload.Width, + Width: payload.Width, Height: payload.Height, - Rate: payload.Rate, + Rate: payload.Rate, }); err != nil { return err } diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index ba757fb8..f30eabeb 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -2,8 +2,8 @@ package handler import ( "demodesk/neko/internal/types" - "demodesk/neko/internal/types/message" "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" ) func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error { @@ -24,10 +24,10 @@ func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message. func (h *MessageHandlerCtx) sendBroadcast(session types.Session, payload *message.SendBroadcast) error { h.sessions.Broadcast(message.SendBroadcast{ - Event: event.SEND_BROADCAST, - Sender: session.ID(), - Subject: payload.Subject, - Body: payload.Body, - }, []string{ session.ID() }) + Event: event.SEND_BROADCAST, + Sender: session.ID(), + Subject: payload.Subject, + Body: payload.Body, + }, []string{session.ID()}) return nil } diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index e430813e..aebfb070 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -23,7 +23,7 @@ func (h *MessageHandlerCtx) SessionDeleted(session types.Session) error { message.MemberID{ Event: event.MEMBER_DELETED, ID: session.ID(), - }, nil); + }, nil) return nil } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 5c32e15c..cfc31113 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -64,7 +64,7 @@ func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message. return session.Send( message.SignalVideo{ - Event: event.SIGNAL_VIDEO, - Video: payload.Video, + Event: event.SIGNAL_VIDEO, + Video: payload.Video, }) } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 1f8f019b..ecff96c2 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -34,10 +34,10 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return session.Send( message.SystemInit{ - Event: event.SYSTEM_INIT, - MemberId: session.ID(), - ControlHost: controlHost, - ScreenSize: message.ScreenSize{ + Event: event.SYSTEM_INIT, + MemberId: session.ID(), + ControlHost: controlHost, + ScreenSize: message.ScreenSize{ Width: size.Width, Height: size.Height, Rate: size.Rate, diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 9d1430e9..240841f6 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -8,10 +8,10 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/websocket/handler" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" + "demodesk/neko/internal/websocket/handler" ) func New( @@ -23,11 +23,11 @@ func New( logger := log.With().Str("module", "websocket").Logger() return &WebSocketManagerCtx{ - logger: logger, - sessions: sessions, - desktop: desktop, - handler: handler.New(sessions, desktop, capture, webrtc), - handlers: []types.HandlerFunction{}, + logger: logger, + sessions: sessions, + desktop: desktop, + handler: handler.New(sessions, desktop, capture, webrtc), + handlers: []types.HandlerFunction{}, } } @@ -35,12 +35,12 @@ func New( const pingPeriod = 60 * time.Second type WebSocketManagerCtx struct { - logger zerolog.Logger - sessions types.SessionManager - desktop types.DesktopManager - handler *handler.MessageHandlerCtx - handlers []types.HandlerFunction - shutdown chan bool + logger zerolog.Logger + sessions types.SessionManager + desktop types.DesktopManager + handler *handler.MessageHandlerCtx + handlers []types.HandlerFunction + shutdown chan bool } func (ws *WebSocketManagerCtx) Start() { diff --git a/neko.go b/neko.go index c5857d20..c2b2d125 100644 --- a/neko.go +++ b/neko.go @@ -6,14 +6,14 @@ import ( "os/signal" "runtime" + "demodesk/neko/internal/api" + "demodesk/neko/internal/capture" "demodesk/neko/internal/config" "demodesk/neko/internal/desktop" - "demodesk/neko/internal/capture" - "demodesk/neko/internal/webrtc" - "demodesk/neko/internal/session" - "demodesk/neko/internal/websocket" - "demodesk/neko/internal/api" "demodesk/neko/internal/http" + "demodesk/neko/internal/session" + "demodesk/neko/internal/webrtc" + "demodesk/neko/internal/websocket" "demodesk/neko/modules" "github.com/rs/zerolog" @@ -62,12 +62,12 @@ func init() { Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), }, Configs: &Configs{ - Root: &config.Root{}, - Desktop: &config.Desktop{}, - Capture: &config.Capture{}, - WebRTC: &config.WebRTC{}, - Session: &config.Session{}, - Server: &config.Server{}, + Root: &config.Root{}, + Desktop: &config.Desktop{}, + Capture: &config.Capture{}, + WebRTC: &config.WebRTC{}, + Session: &config.Session{}, + Server: &config.Server{}, }, } } @@ -102,26 +102,26 @@ func (i *Version) Details() string { } type Configs struct { - Root *config.Root - Desktop *config.Desktop - Capture *config.Capture - WebRTC *config.WebRTC - Session *config.Session - Server *config.Server + Root *config.Root + Desktop *config.Desktop + Capture *config.Capture + WebRTC *config.WebRTC + Session *config.Session + Server *config.Server } type Neko struct { - Version *Version - Configs *Configs + Version *Version + Configs *Configs - logger zerolog.Logger - desktopManager *desktop.DesktopManagerCtx - captureManager *capture.CaptureManagerCtx - webRTCManager *webrtc.WebRTCManagerCtx - sessionManager *session.SessionManagerCtx - webSocketManager *websocket.WebSocketManagerCtx - apiManager *api.ApiManagerCtx - httpManager *http.HttpManagerCtx + logger zerolog.Logger + desktopManager *desktop.DesktopManagerCtx + captureManager *capture.CaptureManagerCtx + webRTCManager *webrtc.WebRTCManagerCtx + sessionManager *session.SessionManagerCtx + webSocketManager *websocket.WebSocketManagerCtx + apiManager *api.ApiManagerCtx + httpManager *http.HttpManagerCtx } func (neko *Neko) Preflight() { From 2b693f4e528fed57db2ae052401c0d15739962d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Feb 2021 17:11:21 +0100 Subject: [PATCH 367/876] fix naming convention. --- internal/http/manager.go | 20 ++--- internal/session/session.go | 64 +++++++------- internal/types/session.go | 4 +- internal/webrtc/peer.go | 18 ++-- internal/webrtc/send.go | 12 +-- internal/websocket/filechooserdialog.go | 28 +++--- internal/websocket/manager.go | 110 ++++++++++++------------ internal/websocket/peer.go | 28 +++--- 8 files changed, 142 insertions(+), 142 deletions(-) diff --git a/internal/http/manager.go b/internal/http/manager.go index e6111803..e8fda212 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -78,24 +78,24 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c } } -func (s *HttpManagerCtx) Start() { - if s.conf.Cert != "" && s.conf.Key != "" { +func (manager *HttpManagerCtx) Start() { + if manager.conf.Cert != "" && manager.conf.Key != "" { go func() { - if err := s.http.ListenAndServeTLS(s.conf.Cert, s.conf.Key); err != http.ErrServerClosed { - s.logger.Panic().Err(err).Msg("unable to start https server") + if err := manager.http.ListenAndServeTLS(manager.conf.Cert, manager.conf.Key); err != http.ErrServerClosed { + manager.logger.Panic().Err(err).Msg("unable to start https server") } }() - s.logger.Info().Msgf("https listening on %s", s.http.Addr) + manager.logger.Info().Msgf("https listening on %s", manager.http.Addr) } else { go func() { - if err := s.http.ListenAndServe(); err != http.ErrServerClosed { - s.logger.Panic().Err(err).Msg("unable to start http server") + if err := manager.http.ListenAndServe(); err != http.ErrServerClosed { + manager.logger.Panic().Err(err).Msg("unable to start http server") } }() - s.logger.Info().Msgf("http listening on %s", s.http.Addr) + manager.logger.Info().Msgf("http listening on %s", manager.http.Addr) } } -func (s *HttpManagerCtx) Shutdown() error { - return s.http.Shutdown(context.Background()) +func (manager *HttpManagerCtx) Shutdown() error { + return manager.http.Shutdown(context.Background()) } diff --git a/internal/session/session.go b/internal/session/session.go index ba6c6f3e..d5f72921 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -9,14 +9,14 @@ import ( ) type SessionCtx struct { - id string - logger zerolog.Logger - manager *SessionManagerCtx - profile types.MemberProfile - websocket_peer types.WebSocketPeer - websocket_connected bool - webrtc_peer types.WebRTCPeer - webrtc_connected bool + id string + logger zerolog.Logger + manager *SessionManagerCtx + profile types.MemberProfile + websocketPeer types.WebSocketPeer + websocketConnected bool + webrtcPeer types.WebRTCPeer + webrtcConnected bool } func (session *SessionCtx) ID() string { @@ -77,7 +77,7 @@ func (session *SessionCtx) profileChanged() { } if !session.CanWatch() && session.IsWatching() { - if err := session.webrtc_peer.Destroy(); err != nil { + if err := session.webrtcPeer.Destroy(); err != nil { session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") } } @@ -98,11 +98,11 @@ func (session *SessionCtx) IsHost() bool { } func (session *SessionCtx) IsConnected() bool { - return session.websocket_connected + return session.websocketConnected } func (session *SessionCtx) IsWatching() bool { - return session.webrtc_connected + return session.webrtcConnected } func (session *SessionCtx) GetState() types.MemberState { @@ -117,18 +117,18 @@ func (session *SessionCtx) GetState() types.MemberState { // webscoket // --- -func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { - if session.websocket_peer != nil { - if err := session.websocket_peer.Destroy(); err != nil { +func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { + if session.websocketPeer != nil { + if err := session.websocketPeer.Destroy(); err != nil { session.logger.Warn().Err(err).Msgf("websocket destroy has failed") } } - session.websocket_peer = websocket_peer + session.websocketPeer = websocketPeer } func (session *SessionCtx) SetWebSocketConnected(connected bool) { - session.websocket_connected = connected + session.websocketConnected = connected if connected { session.manager.emmiter.Emit("connected", session) @@ -136,21 +136,21 @@ func (session *SessionCtx) SetWebSocketConnected(connected bool) { } session.manager.emmiter.Emit("disconnected", session) - session.websocket_peer = nil + session.websocketPeer = nil - if session.webrtc_peer != nil { - if err := session.webrtc_peer.Destroy(); err != nil { + if session.webrtcPeer != nil { + if err := session.webrtcPeer.Destroy(); err != nil { session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") } } } func (session *SessionCtx) Send(v interface{}) error { - if session.websocket_peer == nil { + if session.websocketPeer == nil { return nil } - return session.websocket_peer.Send(v) + return session.websocketPeer.Send(v) } func (session *SessionCtx) Disconnect(reason string) error { @@ -162,14 +162,14 @@ func (session *SessionCtx) Disconnect(reason string) error { return err } - if session.websocket_peer != nil { - if err := session.websocket_peer.Destroy(); err != nil { + if session.websocketPeer != nil { + if err := session.websocketPeer.Destroy(); err != nil { return err } } - if session.webrtc_peer != nil { - if err := session.webrtc_peer.Destroy(); err != nil { + if session.webrtcPeer != nil { + if err := session.webrtcPeer.Destroy(); err != nil { return err } } @@ -181,25 +181,25 @@ func (session *SessionCtx) Disconnect(reason string) error { // webrtc // --- -func (session *SessionCtx) SetWebRTCPeer(webrtc_peer types.WebRTCPeer) { - if session.webrtc_peer != nil { - if err := session.webrtc_peer.Destroy(); err != nil { +func (session *SessionCtx) SetWebRTCPeer(webrtcPeer types.WebRTCPeer) { + if session.webrtcPeer != nil { + if err := session.webrtcPeer.Destroy(); err != nil { session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") } } - session.webrtc_peer = webrtc_peer + session.webrtcPeer = webrtcPeer } func (session *SessionCtx) SetWebRTCConnected(connected bool) { - session.webrtc_connected = connected + session.webrtcConnected = connected session.manager.emmiter.Emit("state_changed", session) if !connected { - session.webrtc_peer = nil + session.webrtcPeer = nil } } func (session *SessionCtx) GetWebRTCPeer() types.WebRTCPeer { - return session.webrtc_peer + return session.webrtcPeer } diff --git a/internal/types/session.go b/internal/types/session.go index 80063dcc..7bc09769 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -49,13 +49,13 @@ type Session interface { GetState() MemberState // websocket - SetWebSocketPeer(websocket_peer WebSocketPeer) + SetWebSocketPeer(websocketPeer WebSocketPeer) SetWebSocketConnected(connected bool) Send(v interface{}) error Disconnect(reason string) error // webrtc - SetWebRTCPeer(webrtc_peer WebRTCPeer) + SetWebRTCPeer(webrtcPeer WebRTCPeer) SetWebRTCConnected(connected bool) GetWebRTCPeer() WebRTCPeer } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 2dac155c..a9bdba34 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -9,25 +9,25 @@ type WebRTCPeerCtx struct { changeVideo func(videoID string) error } -func (webrtc_peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { - return webrtc_peer.connection.SetRemoteDescription(webrtc.SessionDescription{ +func (peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { + return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ SDP: sdp, Type: webrtc.SDPTypeAnswer, }) } -func (webrtc_peer *WebRTCPeerCtx) SignalCandidate(candidate webrtc.ICECandidateInit) error { - return webrtc_peer.connection.AddICECandidate(candidate) +func (peer *WebRTCPeerCtx) SignalCandidate(candidate webrtc.ICECandidateInit) error { + return peer.connection.AddICECandidate(candidate) } -func (webrtc_peer *WebRTCPeerCtx) SetVideoID(videoID string) error { - return webrtc_peer.changeVideo(videoID) +func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { + return peer.changeVideo(videoID) } -func (webrtc_peer *WebRTCPeerCtx) Destroy() error { - if webrtc_peer.connection == nil || webrtc_peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { +func (peer *WebRTCPeerCtx) Destroy() error { + if peer.connection == nil || peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { return nil } - return webrtc_peer.connection.Close() + return peer.connection.Close() } diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index d2400107..e3facb9f 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -28,8 +28,8 @@ type PayloadCursorImage struct { Yhot uint16 } -func (webrtc_peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { - if webrtc_peer.dataChannel == nil { +func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { + if peer.dataChannel == nil { return fmt.Errorf("no data channel") } @@ -47,11 +47,11 @@ func (webrtc_peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { return err } - return webrtc_peer.dataChannel.Send(buffer.Bytes()) + return peer.dataChannel.Send(buffer.Bytes()) } -func (webrtc_peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error { - if webrtc_peer.dataChannel == nil { +func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error { + if peer.dataChannel == nil { return fmt.Errorf("no data channel") } @@ -81,5 +81,5 @@ func (webrtc_peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error return err } - return webrtc_peer.dataChannel.Send(buffer.Bytes()) + return peer.dataChannel.Send(buffer.Bytes()) } diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index f94e9fd4..c0c72e59 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -6,41 +6,41 @@ import ( "demodesk/neko/internal/types/message" ) -func (ws *WebSocketManagerCtx) fileChooserDialogEvents() { +func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { var file_chooser_dialog_member types.Session // when dialog opens, everyone should be notified. - ws.desktop.OnFileChooserDialogOpened(func() { - ws.logger.Info().Msg("FileChooserDialog opened") + manager.desktop.OnFileChooserDialogOpened(func() { + manager.logger.Info().Msg("FileChooserDialog opened") - host := ws.sessions.GetHost() + host := manager.sessions.GetHost() if host == nil { - ws.logger.Warn().Msg("no host for FileChooserDialog found, closing") - go ws.desktop.CloseFileChooserDialog() + manager.logger.Warn().Msg("no host for FileChooserDialog found, closing") + go manager.desktop.CloseFileChooserDialog() return } file_chooser_dialog_member = host - go ws.sessions.Broadcast(message.MemberID{ + go manager.sessions.Broadcast(message.MemberID{ Event: event.FILE_CHOOSER_DIALOG_OPENED, ID: host.ID(), }, nil) }) // when dialog closes, everyone should be notified. - ws.desktop.OnFileChooserDialogClosed(func() { - ws.logger.Info().Msg("FileChooserDialog closed") + manager.desktop.OnFileChooserDialogClosed(func() { + manager.logger.Info().Msg("FileChooserDialog closed") file_chooser_dialog_member = nil - go ws.sessions.Broadcast(message.MemberID{ + go manager.sessions.Broadcast(message.MemberID{ Event: event.FILE_CHOOSER_DIALOG_CLOSED, }, nil) }) // when new user joins, and someone holds dialog, he shouldd be notified about it. - ws.sessions.OnConnected(func(session types.Session) { + manager.sessions.OnConnected(func(session types.Session) { if file_chooser_dialog_member == nil { return } @@ -49,7 +49,7 @@ func (ws *WebSocketManagerCtx) fileChooserDialogEvents() { Event: event.FILE_CHOOSER_DIALOG_OPENED, ID: file_chooser_dialog_member.ID(), }); err != nil { - ws.logger.Warn(). + manager.logger.Warn(). Str("id", session.ID()). Err(err). Msgf("could not send event `%s` to session", event.FILE_CHOOSER_DIALOG_OPENED) @@ -57,7 +57,7 @@ func (ws *WebSocketManagerCtx) fileChooserDialogEvents() { }) // when user, that holds dialog, disconnects, it should be closed. - ws.sessions.OnDisconnected(func(session types.Session) { + manager.sessions.OnDisconnected(func(session types.Session) { if file_chooser_dialog_member == nil { return } @@ -66,6 +66,6 @@ func (ws *WebSocketManagerCtx) fileChooserDialogEvents() { return } - ws.desktop.CloseFileChooserDialog() + manager.desktop.CloseFileChooserDialog() }) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 240841f6..852646cb 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -43,64 +43,64 @@ type WebSocketManagerCtx struct { shutdown chan bool } -func (ws *WebSocketManagerCtx) Start() { - ws.sessions.OnCreated(func(session types.Session) { - if err := ws.handler.SessionCreated(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with an error") +func (manager *WebSocketManagerCtx) Start() { + manager.sessions.OnCreated(func(session types.Session) { + if err := manager.handler.SessionCreated(session); err != nil { + manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with an error") } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session created") + manager.logger.Debug().Str("id", session.ID()).Msg("session created") } }) - ws.sessions.OnDeleted(func(session types.Session) { - if err := ws.handler.SessionDeleted(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session deleted with an error") + manager.sessions.OnDeleted(func(session types.Session) { + if err := manager.handler.SessionDeleted(session); err != nil { + manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session deleted with an error") } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session deleted") + manager.logger.Debug().Str("id", session.ID()).Msg("session deleted") } }) - ws.sessions.OnConnected(func(session types.Session) { - if err := ws.handler.SessionConnected(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with an error") + manager.sessions.OnConnected(func(session types.Session) { + if err := manager.handler.SessionConnected(session); err != nil { + manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with an error") } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session connected") + manager.logger.Debug().Str("id", session.ID()).Msg("session connected") } }) - ws.sessions.OnDisconnected(func(session types.Session) { - if err := ws.handler.SessionDisconnected(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session disconnected with an error") + manager.sessions.OnDisconnected(func(session types.Session) { + if err := manager.handler.SessionDisconnected(session); err != nil { + manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session disconnected with an error") } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session disconnected") + manager.logger.Debug().Str("id", session.ID()).Msg("session disconnected") } }) - ws.sessions.OnProfileChanged(func(session types.Session) { - if err := ws.handler.SessionProfileChanged(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session profile changed with an error") + manager.sessions.OnProfileChanged(func(session types.Session) { + if err := manager.handler.SessionProfileChanged(session); err != nil { + manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session profile changed with an error") } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session profile changed") + manager.logger.Debug().Str("id", session.ID()).Msg("session profile changed") } }) - ws.sessions.OnStateChanged(func(session types.Session) { - if err := ws.handler.SessionStateChanged(session); err != nil { - ws.logger.Warn().Str("id", session.ID()).Err(err).Msg("session state changed with an error") + manager.sessions.OnStateChanged(func(session types.Session) { + if err := manager.handler.SessionStateChanged(session); err != nil { + manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session state changed with an error") } else { - ws.logger.Debug().Str("id", session.ID()).Msg("session state changed") + manager.logger.Debug().Str("id", session.ID()).Msg("session state changed") } }) - ws.desktop.OnClipboardUpdated(func() { - session := ws.sessions.GetHost() + manager.desktop.OnClipboardUpdated(func() { + session := manager.sessions.GetHost() if session == nil || !session.CanAccessClipboard() { return } - data, err := ws.desktop.ClipboardGetText() + data, err := manager.desktop.ClipboardGetText() if err != nil { - ws.logger.Warn().Err(err).Msg("could not get clipboard content") + manager.logger.Warn().Err(err).Msg("could not get clipboard content") return } @@ -109,24 +109,24 @@ func (ws *WebSocketManagerCtx) Start() { Text: data.Text, // TODO: Send HTML? }); err != nil { - ws.logger.Warn().Err(err).Msg("could not sync clipboard") + manager.logger.Warn().Err(err).Msg("could not sync clipboard") } }) - ws.fileChooserDialogEvents() + manager.fileChooserDialogEvents() } -func (ws *WebSocketManagerCtx) Shutdown() error { - ws.shutdown <- true +func (manager *WebSocketManagerCtx) Shutdown() error { + manager.shutdown <- true return nil } -func (ws *WebSocketManagerCtx) AddHandler(handler types.HandlerFunction) { - ws.handlers = append(ws.handlers, handler) +func (manager *WebSocketManagerCtx) AddHandler(handler types.HandlerFunction) { + manager.handlers = append(manager.handlers, handler) } -func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin types.CheckOrigin) error { - ws.logger.Debug().Msg("attempting to upgrade connection") +func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin types.CheckOrigin) error { + manager.logger.Debug().Msg("attempting to upgrade connection") upgrader := websocket.Upgrader{ CheckOrigin: checkOrigin, @@ -134,13 +134,13 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, c connection, err := upgrader.Upgrade(w, r, nil) if err != nil { - ws.logger.Error().Err(err).Msg("failed to upgrade connection") + manager.logger.Error().Err(err).Msg("failed to upgrade connection") return err } - session, err := ws.sessions.AuthenticateRequest(r) + session, err := manager.sessions.AuthenticateRequest(r) if err != nil { - ws.logger.Warn().Err(err).Msg("authentication failed") + manager.logger.Warn().Err(err).Msg("authentication failed") // TODO: Refactor, return error code. if err = connection.WriteJSON( @@ -148,7 +148,7 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, c Event: event.SYSTEM_DISCONNECT, Message: err.Error(), }); err != nil { - ws.logger.Error().Err(err).Msg("failed to send disconnect") + manager.logger.Error().Err(err).Msg("failed to send disconnect") } return connection.Close() @@ -161,7 +161,7 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, c Event: event.SYSTEM_DISCONNECT, Message: "connection disabled", }); err != nil { - ws.logger.Error().Err(err).Msg("failed to send disconnect") + manager.logger.Error().Err(err).Msg("failed to send disconnect") } return connection.Close() @@ -174,7 +174,7 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, c Event: event.SYSTEM_DISCONNECT, Message: "already connected", }); err != nil { - ws.logger.Error().Err(err).Msg("failed to send disconnect") + manager.logger.Error().Err(err).Msg("failed to send disconnect") } return connection.Close() @@ -182,11 +182,11 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, c session.SetWebSocketPeer(&WebSocketPeerCtx{ session: session, - ws: ws, + manager: manager, connection: connection, }) - ws.logger. + manager.logger. Debug(). Str("session", session.ID()). Str("address", connection.RemoteAddr().String()). @@ -195,7 +195,7 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, c session.SetWebSocketConnected(true) defer func() { - ws.logger. + manager.logger. Debug(). Str("session", session.ID()). Str("address", connection.RemoteAddr().String()). @@ -204,11 +204,11 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, c session.SetWebSocketConnected(false) }() - ws.handle(connection, session) + manager.handle(connection, session) return nil } -func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types.Session) { +func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session types.Session) { bytes := make(chan []byte) cancel := make(chan struct{}) @@ -220,9 +220,9 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types. _, raw, err := connection.ReadMessage() if err != nil { if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { - ws.logger.Warn().Err(err).Msg("read message error") + manager.logger.Warn().Err(err).Msg("read message error") } else { - ws.logger.Debug().Err(err).Msg("read message error") + manager.logger.Debug().Err(err).Msg("read message error") } close(cancel) @@ -236,14 +236,14 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types. for { select { case raw := <-bytes: - ws.logger.Debug(). + manager.logger.Debug(). Str("session", session.ID()). Str("address", connection.RemoteAddr().String()). Str("raw", string(raw)). Msg("received message from client") - handled := ws.handler.Message(session, raw) - for _, handler := range ws.handlers { + handled := manager.handler.Message(session, raw) + for _, handler := range manager.handlers { if handled { break } @@ -252,13 +252,13 @@ func (ws *WebSocketManagerCtx) handle(connection *websocket.Conn, session types. } if !handled { - ws.logger.Warn().Msg("unhandled message") + manager.logger.Warn().Msg("unhandled message") } case <-cancel: return case <-ticker.C: if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { - ws.logger.Error().Err(err).Msg("ping message has failed") + manager.logger.Error().Err(err).Msg("ping message has failed") return } } diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 98a6e607..7187f23b 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -10,17 +10,17 @@ import ( ) type WebSocketPeerCtx struct { - session types.Session - ws *WebSocketManagerCtx - connection *websocket.Conn mu sync.Mutex + session types.Session + manager *WebSocketManagerCtx + connection *websocket.Conn } -func (websocket_peer *WebSocketPeerCtx) Send(v interface{}) error { - websocket_peer.mu.Lock() - defer websocket_peer.mu.Unlock() +func (peer *WebSocketPeerCtx) Send(v interface{}) error { + peer.mu.Lock() + defer peer.mu.Unlock() - if websocket_peer.connection == nil { + if peer.connection == nil { return nil } @@ -29,19 +29,19 @@ func (websocket_peer *WebSocketPeerCtx) Send(v interface{}) error { return err } - websocket_peer.ws.logger.Debug(). - Str("session", websocket_peer.session.ID()). - Str("address", websocket_peer.connection.RemoteAddr().String()). + peer.manager.logger.Debug(). + Str("session", peer.session.ID()). + Str("address", peer.connection.RemoteAddr().String()). Str("raw", string(raw)). Msg("sending message to client") - return websocket_peer.connection.WriteMessage(websocket.TextMessage, raw) + return peer.connection.WriteMessage(websocket.TextMessage, raw) } -func (websocket_peer *WebSocketPeerCtx) Destroy() error { - if websocket_peer.connection == nil { +func (peer *WebSocketPeerCtx) Destroy() error { + if peer.connection == nil { return nil } - return websocket_peer.connection.Close() + return peer.connection.Close() } From cd18a22655ed8fcd2570fed9f42d4dc8198917f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Feb 2021 17:17:06 +0100 Subject: [PATCH 368/876] WebRTC events only for active peer connection. --- internal/session/session.go | 6 +++++- internal/types/session.go | 2 +- internal/webrtc/manager.go | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index d5f72921..11c3c967 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -191,7 +191,11 @@ func (session *SessionCtx) SetWebRTCPeer(webrtcPeer types.WebRTCPeer) { session.webrtcPeer = webrtcPeer } -func (session *SessionCtx) SetWebRTCConnected(connected bool) { +func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, connected bool) { + if webrtcPeer != session.webrtcPeer { + return + } + session.webrtcConnected = connected session.manager.emmiter.Emit("state_changed", session) diff --git a/internal/types/session.go b/internal/types/session.go index 7bc09769..c2a3a772 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -56,7 +56,7 @@ type Session interface { // webrtc SetWebRTCPeer(webrtcPeer WebRTCPeer) - SetWebRTCConnected(connected bool) + SetWebRTCConnected(webrtcPeer WebRTCPeer, connected bool) GetWebRTCPeer() WebRTCPeer } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index da7b0b2d..c94b651c 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -263,13 +263,13 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: - session.SetWebRTCConnected(true) + session.SetWebRTCConnected(peer, true) case webrtc.PeerConnectionStateDisconnected: fallthrough case webrtc.PeerConnectionStateFailed: connection.Close() case webrtc.PeerConnectionStateClosed: - session.SetWebRTCConnected(false) + session.SetWebRTCConnected(peer, false) videoStream.RemoveListener(&listener) // should be stream stopped From 2ac3f9876fbfb5960d5f3ecf75936fefcee46c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Feb 2021 18:16:24 +0100 Subject: [PATCH 369/876] audio start / stop in WebRTC. --- internal/webrtc/manager.go | 70 +++++++++++++++++++-------- internal/websocket/handler/session.go | 12 ----- 2 files changed, 51 insertions(+), 31 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index c94b651c..91ee6d7d 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -5,6 +5,7 @@ import ( "io" "reflect" "strings" + "sync" "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" @@ -19,10 +20,11 @@ import ( func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ - logger: log.With().Str("module", "webrtc").Logger(), - desktop: desktop, - capture: capture, - config: config, + logger: log.With().Str("module", "webrtc").Logger(), + desktop: desktop, + capture: capture, + config: config, + participants: 0, // TODO: Refactor. curImgListeners: map[uintptr]*func(cur *types.CursorImage){}, curPosListeners: map[uintptr]*func(x, y int){}, @@ -30,12 +32,14 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con } type WebRTCManagerCtx struct { - logger zerolog.Logger - audioTrack *webrtc.TrackLocalStaticSample - audioStop func() - desktop types.DesktopManager - capture types.CaptureManager - config *config.WebRTC + mu sync.Mutex + logger zerolog.Logger + audioTrack *webrtc.TrackLocalStaticSample + audioStop func() + desktop types.DesktopManager + capture types.CaptureManager + config *config.WebRTC + participants uint32 // TODO: Refactor. curImgListeners map[uintptr]*func(cur *types.CursorImage) curPosListeners map[uintptr]*func(x, y int) @@ -51,15 +55,15 @@ func (manager *WebRTCManagerCtx) Start() { manager.logger.Panic().Err(err).Msg("unable to create audio track") } - listener := func(sample types.Sample) { + audioListener := func(sample types.Sample) { if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") } } - audio.AddListener(&listener) + audio.AddListener(&audioListener) manager.audioStop = func() { - audio.RemoveListener(&listener) + audio.RemoveListener(&audioListener) } manager.logger.Info(). @@ -156,12 +160,14 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return nil, err } - listener := func(sample types.Sample) { + videoListener := func(sample types.Sample) { if err := videoTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { manager.logger.Warn().Err(err).Msg("video pipeline failed to write") } } + manager.mu.Lock() + // should be stream started if videoStream.ListenersCount() == 0 { if err := videoStream.Start(); err != nil { @@ -170,7 +176,17 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } } - videoStream.AddListener(&listener) + videoStream.AddListener(&videoListener) + + // start audio, when first participant connects + if !manager.capture.Audio().Started() { + if err := manager.capture.Audio().Start(); err != nil { + manager.logger.Panic().Err(err).Msg("unable to start audio stream") + } + } + + manager.participants = manager.participants + 1 + manager.mu.Unlock() changeVideo := func(videoID string) error { newVideoStream, ok := manager.capture.Video(videoID) @@ -185,9 +201,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } } - // switch listeners - videoStream.RemoveListener(&listener) - newVideoStream.AddListener(&listener) + // switch videoListeners + videoStream.RemoveListener(&videoListener) + newVideoStream.AddListener(&videoListener) // should be old stream stopped if videoStream.ListenersCount() == 0 { @@ -269,17 +285,33 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin case webrtc.PeerConnectionStateFailed: connection.Close() case webrtc.PeerConnectionStateClosed: + manager.mu.Lock() + session.SetWebRTCConnected(peer, false) - videoStream.RemoveListener(&listener) + videoStream.RemoveListener(&videoListener) // should be stream stopped if videoStream.ListenersCount() == 0 { videoStream.Stop() } + // decrease participants + manager.participants = manager.participants - 1 + + // stop audio, if last participant disonnects + if manager.participants <= 0 { + manager.participants = 0 + + if manager.capture.Audio().Started() { + manager.capture.Audio().Stop() + } + } + // TODO: Refactor. delete(manager.curImgListeners, cursorChangePtr) delete(manager.curPosListeners, cursorPositionPtr) + + manager.mu.Unlock() } }) diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index aebfb070..522b2908 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -29,13 +29,6 @@ func (h *MessageHandlerCtx) SessionDeleted(session types.Session) error { } func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { - // start audio, when first member connects - if !h.capture.Audio().Started() { - if err := h.capture.Audio().Start(); err != nil { - return err - } - } - if err := h.systemInit(session); err != nil { return err } @@ -50,11 +43,6 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { } func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { - // stop audio, if last member disonnects - if h.capture.Audio().Started() && !h.sessions.HasConnectedMembers() { - h.capture.Audio().Stop() - } - // clear host if exists if session.IsHost() { h.desktop.ResetKeys() From 5310acfbf0daa566ac08f7dab9d04b62752ffc1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 17 Feb 2021 21:55:11 +0100 Subject: [PATCH 370/876] implement xorg GetCursorPosition. --- internal/desktop/xorg.go | 4 ++++ internal/desktop/xorg/xorg.c | 9 +++++++++ internal/desktop/xorg/xorg.go | 11 +++++++++++ internal/desktop/xorg/xorg.h | 1 + internal/types/desktop.go | 1 + 5 files changed, 26 insertions(+) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index ff09a5d0..df182169 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -26,6 +26,10 @@ func (manager *DesktopManagerCtx) OnCursorPosition(listener func(x, y int)) { cursorListeners = append(cursorListeners, listener) } +func (manager *DesktopManagerCtx) GetCursorPosition() (int, int) { + return xorg.GetCursorPosition() +} + func (manager *DesktopManagerCtx) Scroll(x, y int) { xorg.Scroll(x, y) } diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index fd5be1f9..8d446440 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -21,6 +21,15 @@ void XMove(int x, int y) { XSync(display, 0); } +void XCursorPosition(int *x, int *y) { + Display *display = getXDisplay(); + Window root = DefaultRootWindow(display); + Window window; + int i; + unsigned mask; + XQueryPointer(display, root, &root, &window, x, y, &i, &i, &mask); +} + void XScroll(int x, int y) { int ydir = 4; /* Button 4 is up, 5 is down. */ int xdir = 6; diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 92f41b1e..72dc04e9 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -68,6 +68,17 @@ func Move(x, y int) { C.XMove(C.int(x), C.int(y)) } +func GetCursorPosition() (int, int) { + mu.Lock() + defer mu.Unlock() + + var x C.int + var y C.int + C.XCursorPosition(&x, &y) + + return int(x), int(y) +} + func Scroll(x, y int) { mu.Lock() defer mu.Unlock() diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index caa99fc8..8fad29c9 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -16,6 +16,7 @@ int XDisplayOpen(char *input); void XDisplayClose(void); void XMove(int x, int y); +void XCursorPosition(int *x, int *y); void XScroll(int x, int y); void XButton(unsigned int button, int down); void XKey(unsigned long key, int down); diff --git a/internal/types/desktop.go b/internal/types/desktop.go index c1018115..83076e76 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -49,6 +49,7 @@ type DesktopManager interface { // xorg Move(x, y int) OnCursorPosition(listener func(x, y int)) + GetCursorPosition() (int, int) Scroll(x, y int) ButtonDown(code int) error KeyDown(code uint64) error From ab34f4a53f59c35ed29304ed8cfb81a9c413e222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 17 Feb 2021 21:55:21 +0100 Subject: [PATCH 371/876] WebRTC cursor: set initial state. --- internal/webrtc/manager.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 91ee6d7d..f05b7c6c 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -319,6 +319,15 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // TODO: Refactor. manager.curImgListeners[cursorChangePtr] = &cursorChange manager.curPosListeners[cursorPositionPtr] = &cursorPosition + + // send initial cursor image + cur := manager.desktop.GetCursorImage() + cursorChange(cur) + + // send initial cursor position + x, y := manager.desktop.GetCursorPosition() + manager.logger.Warn().Int("x", x).Int("y", y).Msg("got cursor position") + cursorPosition(x, y) }) dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { From c862711e6a8e208a79aa92440304adf4fe74880e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Feb 2021 16:52:49 +0100 Subject: [PATCH 372/876] update KeyboardModifiers WebSocket struct. --- internal/types/message/messages.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 23df1025..2f307635 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -152,10 +152,9 @@ type KeyboardMap struct { } type KeyboardModifiers struct { - Event string `json:"event,omitempty"` - CapsLock *bool `json:"caps_lock"` - NumLock *bool `json:"num_lock"` - ScrollLock *bool `json:"scroll_lock"` + Event string `json:"event,omitempty"` + CapsLock *bool `json:"capslock"` + NumLock *bool `json:"numlock"` } ///////////////////////////// From 7df10404390830f6a848ea985808b2fbfcf6aa8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Feb 2021 16:59:36 +0100 Subject: [PATCH 373/876] remove not needed log message. --- internal/webrtc/manager.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index f05b7c6c..1039d672 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -326,7 +326,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // send initial cursor position x, y := manager.desktop.GetCursorPosition() - manager.logger.Warn().Int("x", x).Int("y", y).Msg("got cursor position") cursorPosition(x, y) }) From 7bc9e669db2c89cb21663b34778ffd31a911871d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 20 Feb 2021 13:49:06 +0100 Subject: [PATCH 374/876] golang upgrade to 1.16. --- Dockerfile | 4 ++-- go.mod | 15 ++++++++------- go.sum | 20 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 43a53213..9491939e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Stage 1: Build. # -FROM golang:1.15-buster as build +FROM golang:1.16-buster as build WORKDIR /src # @@ -32,7 +32,7 @@ RUN go get -v -t -d . && go build \ -X 'demodesk/neko.gitCommit=${GIT_COMMIT}' \ -X 'demodesk/neko.gitBranch=${GIT_BRANCH}' \ " \ - -i cmd/neko/main.go; + cmd/neko/main.go; # # Stage 2: Runtime. diff --git a/go.mod b/go.mod index 2d45251f..a71c2dfe 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module demodesk/neko -go 1.13 +go 1.16 require ( - github.com/go-chi/chi v1.5.1 + github.com/go-chi/chi v1.5.2 github.com/go-chi/cors v1.1.1 github.com/google/uuid v1.2.0 // indirect github.com/gorilla/websocket v1.4.2 @@ -11,17 +11,18 @@ require ( github.com/magiconair/properties v1.8.4 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/pelletier/go-toml v1.8.1 // indirect + github.com/pion/interceptor v0.0.10 // indirect github.com/pion/logging v0.2.2 - github.com/pion/webrtc/v3 v3.0.4 + github.com/pion/webrtc/v3 v3.0.11 github.com/rs/zerolog v1.20.0 github.com/spf13/afero v1.5.1 // indirect github.com/spf13/cast v1.3.1 // indirect - github.com/spf13/cobra v1.1.1 + github.com/spf13/cobra v1.1.3 github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.7.1 - golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect - golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect - golang.org/x/sys v0.0.0-20210123111255-9b0068b26619 // indirect + golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect + golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d // indirect + golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43 // indirect golang.org/x/text v0.3.5 // indirect gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 3dc53b6c..583d2dfc 100644 --- a/go.sum +++ b/go.sum @@ -47,6 +47,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi v1.5.1 h1:kfTK3Cxd/dkMu/rKs5ZceWYp+t5CtiE7vmaTv3LjC6w= github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k= +github.com/go-chi/chi v1.5.2 h1:YcLIBANL4OTaAOcTdp//sskGa0yGACQMCtbnr7YEn0Q= +github.com/go-chi/chi v1.5.2/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k= github.com/go-chi/cors v1.1.1 h1:eHuqxsIw89iXcWnWUN8R72JMibABJTN/4IOYI5WERvw= github.com/go-chi/cors v1.1.1/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -83,6 +85,7 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -179,10 +182,16 @@ github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXm github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= github.com/pion/dtls/v2 v2.0.4 h1:WuUcqi6oYMu/noNTz92QrF1DaFj4eXbhQ6dzaaAwOiI= github.com/pion/dtls/v2 v2.0.4/go.mod h1:qAkFscX0ZHoI1E07RfYPoRw3manThveu+mlTDdOxoGI= +github.com/pion/dtls/v2 v2.0.7 h1:PNcUs/G1l9hb4jzMEorgFMxIBdp7fRN4LIApOTMtCYs= +github.com/pion/dtls/v2 v2.0.7/go.mod h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10= github.com/pion/ice/v2 v2.0.14 h1:FxXxauyykf89SWAtkQCfnHkno6G8+bhRkNguSh9zU+4= github.com/pion/ice/v2 v2.0.14/go.mod h1:wqaUbOq5ObDNU5ox1hRsEst0rWfsKuH1zXjQFEWiZwM= +github.com/pion/ice/v2 v2.0.15 h1:KZrwa2ciL9od8+TUVJiYTNsCW9J5lktBjGwW1MacEnQ= +github.com/pion/ice/v2 v2.0.15/go.mod h1:ZIiVGevpgAxF/cXiIVmuIUtCb3Xs4gCzCbXB6+nFkSI= github.com/pion/interceptor v0.0.9 h1:fk5hTdyLO3KURQsf/+RjMpEm4NE3yeTY9Kh97b5BvwA= github.com/pion/interceptor v0.0.9/go.mod h1:dHgEP5dtxOTf21MObuBAjJeAayPxLUAZjerGH8Xr07c= +github.com/pion/interceptor v0.0.10 h1:dXFyFWRJFwmzQqyn0U8dUAbOJu+JJnMVAqxmvTu30B4= +github.com/pion/interceptor v0.0.10/go.mod h1:qzeuWuD/ZXvPqOnxNcnhWfkCZ2e1kwwslicyyPnhoK4= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY= @@ -208,6 +217,7 @@ github.com/pion/transport v0.10.0 h1:9M12BSneJm6ggGhJyWpDveFOstJsTiQjkLf4M44rm80 github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE= github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A= github.com/pion/transport v0.12.0/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= +github.com/pion/transport v0.12.1/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/transport v0.12.2 h1:WYEjhloRHt1R86LhUKjC5y+P52Y11/QqEUalvtzVoys= github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= @@ -216,6 +226,8 @@ github.com/pion/udp v0.1.0 h1:uGxQsNyrqG3GLINv36Ff60covYmfrLoxzwnCsIYspXI= github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths= github.com/pion/webrtc/v3 v3.0.4 h1:Tiw3H9fpfcwkvaxonB+Gv1DG9tmgYBQaM1vBagDHP40= github.com/pion/webrtc/v3 v3.0.4/go.mod h1:1TmFSLpPYFTFXFHPtoq9eGP1ASTa9LC6FBh7sUY8cd4= +github.com/pion/webrtc/v3 v3.0.11 h1:RIxUbkWJn6YvLVmHZSzc30yQLyME5vGDkpqrV7EHxz4= +github.com/pion/webrtc/v3 v3.0.11/go.mod h1:WEvXneGTeqNmiR59v5jTsxMc4yXQyOQcRsrdAbNwSEU= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -265,6 +277,8 @@ github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= +github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= +github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= @@ -308,6 +322,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -350,6 +366,8 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d h1:1aflnvSoWWLI2k/dMUAl5lvU1YO4Mb4hz0gh+1rjcxU= +golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -382,6 +400,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210123111255-9b0068b26619 h1:yLLDsUUPDliIQpKl7BjVb1igwngIMH2GBjo1VpwLTE0= golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43 h1:SgQ6LNaYJU0JIuEHv9+s6EbhSCwYeAf5Yvj6lpYlqAE= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= From 0581ce385cf7320d29fb12662faacbf0659d0d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 21 Feb 2021 00:40:52 +0100 Subject: [PATCH 375/876] clean up repository. --- .editorconfig | 2 +- .env.development | 2 -- .gitignore | 1 - .vscode/launch.json | 16 ---------------- .vscode/settings.json | 37 ++++++++++++++++++------------------- neko.code-workspace | 8 -------- 6 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 .env.development delete mode 100644 .vscode/launch.json delete mode 100644 neko.code-workspace diff --git a/.editorconfig b/.editorconfig index 3dce4145..9d08a1a8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,4 +6,4 @@ indent_style = space indent_size = 2 end_of_line = lf insert_final_newline = true -trim_trailing_whitespace = true \ No newline at end of file +trim_trailing_whitespace = true diff --git a/.env.development b/.env.development deleted file mode 100644 index b5884926..00000000 --- a/.env.development +++ /dev/null @@ -1,2 +0,0 @@ -DISPLAY=:99.0 -PION_LOG_TRACE=all diff --git a/.gitignore b/.gitignore index d855be89..e660fd93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ bin/ - diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 02c7b7db..00000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "launch", - "type": "go", - "request": "launch", - "mode": "debug", - "program": "${workspaceFolder}/cmd/neko", - "envFile": "${workspaceFolder}/.env.development", - "output": "${workspaceFolder}/bin/debug/neko", - "cwd": "${workspaceFolder}/", - "args": ["serve", "-d", "--bind", ":3000", "--static", "../client/dist", "--password", "neko", "--password_admin", "admin"] - } - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json index 452ccec1..f30aa6f0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,22 +1,21 @@ - { - "go.formatTool": "goformat", - "go.inferGopath": false, - "go.autocompleteUnimportedPackages": true, - "go.delveConfig": { - "useApiV1": false, - "dlvLoadConfig": { - "followPointers": true, - "maxVariableRecurse": 3, - "maxStringLen": 400, - "maxArrayValues": 400, - "maxStructFields": -1 - } - }, - "[go]": { - "editor.formatOnSave": true, - "editor.codeActionsOnSave": { - "source.organizeImports": true - } + "go.formatTool": "goformat", + "go.inferGopath": false, + "go.autocompleteUnimportedPackages": true, + "go.delveConfig": { + "useApiV1": false, + "dlvLoadConfig": { + "followPointers": true, + "maxVariableRecurse": 3, + "maxStringLen": 400, + "maxArrayValues": 400, + "maxStructFields": -1 + } + }, + "[go]": { + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.organizeImports": true } } +} diff --git a/neko.code-workspace b/neko.code-workspace deleted file mode 100644 index 876a1499..00000000 --- a/neko.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "path": "." - } - ], - "settings": {} -} \ No newline at end of file From 8f2639412d67c8e1d10d2538c92f59108f9b5f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 21 Feb 2021 00:41:04 +0100 Subject: [PATCH 376/876] format code. --- internal/desktop/xorg/xorg.go | 2 +- internal/webrtc/manager.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 72dc04e9..e68e58e9 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -75,7 +75,7 @@ func GetCursorPosition() (int, int) { var x C.int var y C.int C.XCursorPosition(&x, &y) - + return int(x), int(y) } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 1039d672..9a0f6ce9 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -323,7 +323,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // send initial cursor image cur := manager.desktop.GetCursorImage() cursorChange(cur) - + // send initial cursor position x, y := manager.desktop.GetCursorPosition() cursorPosition(x, y) From dc29f71b0c6244421dacb56568bc30d9af867fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 23 Feb 2021 21:25:55 +0100 Subject: [PATCH 377/876] keysym as uint32. --- internal/desktop/xorg.go | 8 ++-- internal/desktop/xorg/xorg.go | 12 ++--- internal/types/desktop.go | 8 ++-- internal/types/message/messages.go | 2 +- internal/webrtc/handler.go | 76 +++++++++++++++--------------- 5 files changed, 53 insertions(+), 53 deletions(-) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index df182169..9271fab6 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -34,19 +34,19 @@ func (manager *DesktopManagerCtx) Scroll(x, y int) { xorg.Scroll(x, y) } -func (manager *DesktopManagerCtx) ButtonDown(code int) error { +func (manager *DesktopManagerCtx) ButtonDown(code uint32) error { return xorg.ButtonDown(code) } -func (manager *DesktopManagerCtx) KeyDown(code uint64) error { +func (manager *DesktopManagerCtx) KeyDown(code uint32) error { return xorg.KeyDown(code) } -func (manager *DesktopManagerCtx) ButtonUp(code int) error { +func (manager *DesktopManagerCtx) ButtonUp(code uint32) error { return xorg.ButtonUp(code) } -func (manager *DesktopManagerCtx) KeyUp(code uint64) error { +func (manager *DesktopManagerCtx) KeyUp(code uint32) error { return xorg.KeyUp(code) } diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index e68e58e9..039dccc5 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -28,8 +28,8 @@ const ( var ScreenConfigurations = make(map[int]types.ScreenConfiguration) -var debounce_button = make(map[int]time.Time) -var debounce_key = make(map[uint64]time.Time) +var debounce_button = make(map[uint32]time.Time) +var debounce_key = make(map[uint32]time.Time) var mu = sync.Mutex{} func GetScreenConfigurations() { @@ -86,7 +86,7 @@ func Scroll(x, y int) { C.XScroll(C.int(x), C.int(y)) } -func ButtonDown(code int) error { +func ButtonDown(code uint32) error { mu.Lock() defer mu.Unlock() @@ -100,7 +100,7 @@ func ButtonDown(code int) error { return nil } -func KeyDown(code uint64) error { +func KeyDown(code uint32) error { mu.Lock() defer mu.Unlock() @@ -114,7 +114,7 @@ func KeyDown(code uint64) error { return nil } -func ButtonUp(code int) error { +func ButtonUp(code uint32) error { mu.Lock() defer mu.Unlock() @@ -128,7 +128,7 @@ func ButtonUp(code int) error { return nil } -func KeyUp(code uint64) error { +func KeyUp(code uint32) error { mu.Lock() defer mu.Unlock() diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 83076e76..7d49f8e2 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -51,10 +51,10 @@ type DesktopManager interface { OnCursorPosition(listener func(x, y int)) GetCursorPosition() (int, int) Scroll(x, y int) - ButtonDown(code int) error - KeyDown(code uint64) error - ButtonUp(code int) error - KeyUp(code uint64) error + ButtonDown(code uint32) error + KeyDown(code uint32) error + ButtonUp(code uint32) error + KeyUp(code uint32) error ResetKeys() ScreenConfigurations() map[int]ScreenConfiguration SetScreenSize(ScreenSize) error diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 2f307635..072a407a 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -118,7 +118,7 @@ type ControlScroll struct { // TODO: New. type ControlKey struct { Event string `json:"event,omitempty"` - Key uint64 `json:"key"` + Key uint32 `json:"key"` } ///////////////////////////// diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 741eca8e..ff3ab2c2 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -13,7 +13,8 @@ const ( OP_SCROLL = 0x02 OP_KEY_DOWN = 0x03 OP_KEY_UP = 0x04 - OP_KEY_CLK = 0x05 + OP_BTN_DOWN = 0x05 + OP_BTN_UP = 0x06 ) type PayloadHeader struct { @@ -35,7 +36,7 @@ type PayloadScroll struct { type PayloadKey struct { PayloadHeader - Key uint64 + Key uint32 } func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { @@ -80,49 +81,48 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { return err } - if payload.Key < 8 { - err := manager.desktop.ButtonDown(int(payload.Key)) - if err != nil { - manager.logger.Warn().Err(err).Msg("button down failed") - return nil - } - - manager.logger.Debug().Msgf("button down %d", payload.Key) - } else { - err := manager.desktop.KeyDown(uint64(payload.Key)) - if err != nil { - manager.logger.Warn().Err(err).Msg("key down failed") - return nil - } - - manager.logger.Debug().Msgf("key down %d", payload.Key) + if err := manager.desktop.KeyDown(payload.Key); err != nil { + manager.logger.Warn().Err(err).Msg("key down failed") + break } + + manager.logger.Debug().Msgf("key down %d", payload.Key) case OP_KEY_UP: payload := &PayloadKey{} - err := binary.Read(buffer, binary.BigEndian, payload) - if err != nil { + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } - if payload.Key < 8 { - err := manager.desktop.ButtonUp(int(payload.Key)) - if err != nil { - manager.logger.Warn().Err(err).Msg("button up failed") - return nil - } - - manager.logger.Debug().Msgf("button up %d", payload.Key) - } else { - err := manager.desktop.KeyUp(uint64(payload.Key)) - if err != nil { - manager.logger.Warn().Err(err).Msg("key up failed") - return nil - } - - manager.logger.Debug().Msgf("key up %d", payload.Key) + if err := manager.desktop.KeyUp(payload.Key); err != nil { + manager.logger.Warn().Err(err).Msg("key up failed") + break } - case OP_KEY_CLK: - // unused + + manager.logger.Debug().Msgf("key up %d", payload.Key) + case OP_BTN_DOWN: + payload := &PayloadKey{} + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { + return err + } + + if err := manager.desktop.ButtonDown(payload.Key); err != nil { + manager.logger.Warn().Err(err).Msg("button down failed") + break + } + + manager.logger.Debug().Msgf("button down %d", payload.Key) + case OP_BTN_UP: + payload := &PayloadKey{} + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { + return err + } + + if err := manager.desktop.ButtonUp(payload.Key); err != nil { + manager.logger.Warn().Err(err).Msg("button up failed") + break + } + + manager.logger.Debug().Msgf("button up %d", payload.Key) } return nil From 8f142e4b91cb8b4778c8f893c65b4b87377f6244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Feb 2021 14:03:57 +0100 Subject: [PATCH 378/876] GetCursorImage returns image structure. --- internal/desktop/xorg/xorg.go | 28 ++++++++++++++++++++++------ internal/types/desktop.go | 2 +- internal/utils/cursor.go | 22 +--------------------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 039dccc5..cccd5d87 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -243,17 +243,33 @@ func GetCursorImage() *types.CursorImage { cur := C.XGetCursorImage() defer C.XFree(unsafe.Pointer(cur)) - width := uint16(cur.width) - height := uint16(cur.height) + width := int(cur.width) + height := int(cur.height) + + // Xlib stores 32-bit data in longs, even if longs are 64-bits long. + pixels := C.GoBytes(unsafe.Pointer(cur.pixels), C.int(width*height*8)) + + img := image.NewRGBA(image.Rect(0, 0, width, height)) + for row := 0; row < height; row++ { + for col := 0; col < width; col++ { + pos := ((row * height) + col) * 8 + + img.SetRGBA(col, row, color.RGBA{ + A: pixels[pos+3], + R: pixels[pos+2], + G: pixels[pos+1], + B: pixels[pos+0], + }) + } + } return &types.CursorImage{ - Width: width, - Height: height, + Width: uint16(width), + Height: uint16(height), Xhot: uint16(cur.xhot), Yhot: uint16(cur.yhot), Serial: uint64(cur.cursor_serial), - // Xlib stores 32-bit data in longs, even if longs are 64-bits long. - Pixels: C.GoBytes(unsafe.Pointer(cur.pixels), C.int(width*height*8)), + Image: img, } } diff --git a/internal/types/desktop.go b/internal/types/desktop.go index 7d49f8e2..bccfbc04 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -10,7 +10,7 @@ type CursorImage struct { Xhot uint16 Yhot uint16 Serial uint64 - Pixels []byte + Image *image.RGBA } type ScreenSize struct { diff --git a/internal/utils/cursor.go b/internal/utils/cursor.go index 528ac488..ebd806dd 100644 --- a/internal/utils/cursor.go +++ b/internal/utils/cursor.go @@ -3,34 +3,14 @@ package utils import ( "bytes" "encoding/base64" - "image" - "image/color" "image/png" "demodesk/neko/internal/types" ) func GetCursorImage(cursor *types.CursorImage) ([]byte, error) { - width := int(cursor.Width) - height := int(cursor.Height) - pixels := cursor.Pixels - - img := image.NewRGBA(image.Rect(0, 0, width, height)) - for row := 0; row < height; row++ { - for col := 0; col < width; col++ { - pos := ((row * height) + col) * 8 - - img.SetRGBA(col, row, color.RGBA{ - A: pixels[pos+3], - R: pixels[pos+2], - G: pixels[pos+1], - B: pixels[pos+0], - }) - } - } - out := new(bytes.Buffer) - err := png.Encode(out, img) + err := png.Encode(out, cursor.Image) if err != nil { return nil, err } From d2eda6f25fa1703afa2ab94e26bf90c76457e312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Feb 2021 14:15:18 +0100 Subject: [PATCH 379/876] cursor utils changed to generic CreatePNGImage. --- internal/api/room/screen.go | 11 +++-------- internal/utils/cursor.go | 29 --------------------------- internal/utils/image.go | 39 +++++++++++++++++++++++++++++++++++++ internal/webrtc/send.go | 2 +- 4 files changed, 43 insertions(+), 38 deletions(-) delete mode 100644 internal/utils/cursor.go create mode 100644 internal/utils/image.go diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index b453e45f..f94f66b3 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -1,8 +1,6 @@ package room import ( - "bytes" - "image/jpeg" "net/http" "strconv" @@ -83,11 +81,8 @@ func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) { } img := h.desktop.GetScreenshotImage() - out := new(bytes.Buffer) - - if err := jpeg.Encode(out, img, &jpeg.Options{ - Quality: quality, - }); err != nil { + bytes, err := utils.CreateJPGImage(img, quality) + if err != nil { utils.HttpInternalServerError(w, err) return } @@ -95,7 +90,7 @@ func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) { w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") w.Header().Set("Content-Type", "image/jpeg") //nolint - w.Write(out.Bytes()) + w.Write(bytes) } func (h *RoomHandler) screenCastGet(w http.ResponseWriter, r *http.Request) { diff --git a/internal/utils/cursor.go b/internal/utils/cursor.go deleted file mode 100644 index ebd806dd..00000000 --- a/internal/utils/cursor.go +++ /dev/null @@ -1,29 +0,0 @@ -package utils - -import ( - "bytes" - "encoding/base64" - "image/png" - - "demodesk/neko/internal/types" -) - -func GetCursorImage(cursor *types.CursorImage) ([]byte, error) { - out := new(bytes.Buffer) - err := png.Encode(out, cursor.Image) - if err != nil { - return nil, err - } - - return out.Bytes(), nil -} - -func GetCursorImageURI(cursor *types.CursorImage) (string, error) { - img, err := GetCursorImage(cursor) - if err != nil { - return "", err - } - - uri := "data:image/png;base64," + base64.StdEncoding.EncodeToString(img) - return uri, nil -} diff --git a/internal/utils/image.go b/internal/utils/image.go new file mode 100644 index 00000000..feefcd8c --- /dev/null +++ b/internal/utils/image.go @@ -0,0 +1,39 @@ +package utils + +import ( + "bytes" + "encoding/base64" + "image" + "image/jpeg" + "image/png" +) + +func CreatePNGImage(img *image.RGBA) ([]byte, error) { + out := new(bytes.Buffer) + err := png.Encode(out, img) + if err != nil { + return nil, err + } + + return out.Bytes(), nil +} + +func CreateJPGImage(img *image.RGBA, quality int) ([]byte, error) { + out := new(bytes.Buffer) + err := jpeg.Encode(out, img, &jpeg.Options{ Quality: quality }) + if err != nil { + return nil, err + } + + return out.Bytes(), nil +} + +func CreatePNGImageURI(img *image.RGBA) (string, error) { + data, err := CreatePNGImage(img) + if err != nil { + return "", err + } + + uri := "data:image/png;base64," + base64.StdEncoding.EncodeToString(data) + return uri, nil +} diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index e3facb9f..573b22d6 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -55,7 +55,7 @@ func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error { return fmt.Errorf("no data channel") } - img, err := utils.GetCursorImage(cur) + img, err := utils.CreatePNGImage(cur.Image) if err != nil { return err } From 2410295ad4413ad0906e966e51582805997d8115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Feb 2021 14:24:17 +0100 Subject: [PATCH 380/876] cursor CreatePNGImage in event emitter. --- internal/types/webrtc.go | 2 +- internal/webrtc/manager.go | 25 +++++++++++++++++++------ internal/webrtc/send.go | 8 +------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 3a19b837..4560d681 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -8,7 +8,7 @@ type WebRTCPeer interface { SetVideoID(videoID string) error SendCursorPosition(x, y int) error - SendCursorImage(cur *CursorImage) error + SendCursorImage(cur *CursorImage, img []byte) error Destroy() error } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 9a0f6ce9..2604bfaa 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -16,6 +16,7 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" + "demodesk/neko/internal/utils" ) func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { @@ -26,7 +27,7 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con config: config, participants: 0, // TODO: Refactor. - curImgListeners: map[uintptr]*func(cur *types.CursorImage){}, + curImgListeners: map[uintptr]*func(cur *types.CursorImage, img []byte){}, curPosListeners: map[uintptr]*func(x, y int){}, } } @@ -41,7 +42,7 @@ type WebRTCManagerCtx struct { config *config.WebRTC participants uint32 // TODO: Refactor. - curImgListeners map[uintptr]*func(cur *types.CursorImage) + curImgListeners map[uintptr]*func(cur *types.CursorImage, img []byte) curPosListeners map[uintptr]*func(x, y int) } @@ -77,8 +78,15 @@ func (manager *WebRTCManagerCtx) Start() { // TODO: Refactor. manager.desktop.OnCursorChanged(func(serial uint64) { cur := manager.desktop.GetCursorImage() + + img, err := utils.CreatePNGImage(cur.Image) + if err != nil { + manager.logger.Warn().Err(err).Msg("failed to create cursor image") + return + } + for _, emit := range manager.curImgListeners { - (*emit)(cur) + (*emit)(cur, img) } }) @@ -256,8 +264,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin dataChannel: dataChannel, } - cursorChange := func(cur *types.CursorImage) { - if err := peer.SendCursorImage(cur); err != nil { + cursorChange := func(cur *types.CursorImage, img []byte) { + if err := peer.SendCursorImage(cur, img); err != nil { manager.logger.Warn().Err(err).Msg("could not send cursor image") } } @@ -322,7 +330,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // send initial cursor image cur := manager.desktop.GetCursorImage() - cursorChange(cur) + img, err := utils.CreatePNGImage(cur.Image) + if err == nil { + cursorChange(cur, img) + } else { + manager.logger.Warn().Err(err).Msg("failed to create cursor image") + } // send initial cursor position x, y := manager.desktop.GetCursorPosition() diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index 573b22d6..31d07c1a 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -6,7 +6,6 @@ import ( "fmt" "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" ) const ( @@ -50,16 +49,11 @@ func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { return peer.dataChannel.Send(buffer.Bytes()) } -func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error { +func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage, img []byte) error { if peer.dataChannel == nil { return fmt.Errorf("no data channel") } - img, err := utils.CreatePNGImage(cur.Image) - if err != nil { - return err - } - data := PayloadCursorImage{ PayloadHeader: PayloadHeader{ Event: OP_CURSOR_IMAGE, From e9840a957955e42db662d2a60302685c5228ff72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Feb 2021 17:16:01 +0100 Subject: [PATCH 381/876] fmt edit. --- internal/utils/image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/utils/image.go b/internal/utils/image.go index feefcd8c..b621fb4b 100644 --- a/internal/utils/image.go +++ b/internal/utils/image.go @@ -20,7 +20,7 @@ func CreatePNGImage(img *image.RGBA) ([]byte, error) { func CreateJPGImage(img *image.RGBA, quality int) ([]byte, error) { out := new(bytes.Buffer) - err := jpeg.Encode(out, img, &jpeg.Options{ Quality: quality }) + err := jpeg.Encode(out, img, &jpeg.Options{Quality: quality}) if err != nil { return nil, err } From 93f8d7f05e891fe1e0707be851592883007a1446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Feb 2021 17:16:37 +0100 Subject: [PATCH 382/876] adding WebRTC timeouts. --- internal/webrtc/manager.go | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 2604bfaa..b89b4ef2 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -6,6 +6,7 @@ import ( "reflect" "strings" "sync" + "time" "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" @@ -19,6 +20,18 @@ import ( "demodesk/neko/internal/utils" ) +// how long is can take between sending offer and connecting +const offerTimeout = 4 * time.Second + +// the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds +const disconnectedTimeout = 4 * time.Second + +// the duration without network activity before a Agent is considered failed after disconnected. Default is 25 Seconds +const failedTimeout = 6 * time.Second + +// how often the ICE Agent sends extra traffic if there is no activity, if media is flowing no traffic will be sent. Default is 2 seconds +const keepAliveInterval = 2 * time.Second + func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ logger: log.With().Str("module", "webrtc").Logger(), @@ -352,6 +365,22 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } }) + // offer timeout + go func() { + time.Sleep(offerTimeout) + + // already disconnected + if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { + return + } + + // not connected + if connection.ConnectionState() != webrtc.PeerConnectionStateConnected { + logger.Warn().Msg("connection timeouted, closing") + connection.Close() + } + }() + session.SetWebRTCPeer(peer) return connection.LocalDescription(), nil } @@ -387,6 +416,7 @@ func (manager *WebRTCManagerCtx) apiSettings(logger zerolog.Logger) *webrtc.Sett //nolint settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) + settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) settings.SetLite(manager.config.ICELite) From 09625ecca542531bdd16188a8833ab82dde79821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 26 Feb 2021 15:04:50 +0100 Subject: [PATCH 383/876] session refactor state. --- internal/session/session.go | 23 +++++++---------------- internal/types/session.go | 1 - 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 11c3c967..14e18175 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -13,10 +13,9 @@ type SessionCtx struct { logger zerolog.Logger manager *SessionManagerCtx profile types.MemberProfile + state types.MemberState websocketPeer types.WebSocketPeer - websocketConnected bool webrtcPeer types.WebRTCPeer - webrtcConnected bool } func (session *SessionCtx) ID() string { @@ -76,13 +75,13 @@ func (session *SessionCtx) profileChanged() { }, nil) } - if !session.CanWatch() && session.IsWatching() { + if !session.CanWatch() && session.state.IsWatching { if err := session.webrtcPeer.Destroy(); err != nil { session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") } } - if (!session.CanConnect() || !session.CanLogin()) && session.IsConnected() { + if (!session.CanConnect() || !session.CanLogin()) && session.state.IsConnected { if err := session.Disconnect("profile changed"); err != nil { session.logger.Warn().Err(err).Msgf("websocket destroy has failed") } @@ -98,19 +97,11 @@ func (session *SessionCtx) IsHost() bool { } func (session *SessionCtx) IsConnected() bool { - return session.websocketConnected -} - -func (session *SessionCtx) IsWatching() bool { - return session.webrtcConnected + return session.state.IsConnected } func (session *SessionCtx) GetState() types.MemberState { - // TODO: Save state in member struct. - return types.MemberState{ - IsConnected: session.IsConnected(), - IsWatching: session.IsWatching(), - } + return session.state } // --- @@ -128,7 +119,7 @@ func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { } func (session *SessionCtx) SetWebSocketConnected(connected bool) { - session.websocketConnected = connected + session.state.IsConnected = connected if connected { session.manager.emmiter.Emit("connected", session) @@ -196,7 +187,7 @@ func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, conne return } - session.webrtcConnected = connected + session.state.IsWatching = connected session.manager.emmiter.Emit("state_changed", session) if !connected { diff --git a/internal/types/session.go b/internal/types/session.go index c2a3a772..c909de8b 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -45,7 +45,6 @@ type Session interface { // state IsHost() bool IsConnected() bool - IsWatching() bool GetState() MemberState // websocket From 9d60468aeaa6c0240ddf9060ebc45fb9bf055b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 28 Feb 2021 17:22:55 +0100 Subject: [PATCH 384/876] xevent DRY, expose emitter. --- internal/desktop/xevent.go | 20 ++++++++++---- internal/desktop/xevent/xevent.go | 44 +++++-------------------------- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index 3e4f5942..4d67905f 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -5,21 +5,31 @@ import ( ) func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) { - xevent.OnCursorChanged(listener) + xevent.Emmiter.On("cursor-changed", func(payload ...interface{}) { + listener(payload[0].(uint64)) + }) } func (manager *DesktopManagerCtx) OnClipboardUpdated(listener func()) { - xevent.OnClipboardUpdated(listener) + xevent.Emmiter.On("clipboard-updated", func(payload ...interface{}) { + listener() + }) } func (manager *DesktopManagerCtx) OnFileChooserDialogOpened(listener func()) { - xevent.OnFileChooserDialogOpened(listener) + xevent.Emmiter.On("file-chooser-dialog-opened", func(payload ...interface{}) { + listener() + }) } func (manager *DesktopManagerCtx) OnFileChooserDialogClosed(listener func()) { - xevent.OnFileChooserDialogClosed(listener) + xevent.Emmiter.On("file-chooser-dialog-closed", func(payload ...interface{}) { + listener() + }) } func (manager *DesktopManagerCtx) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { - xevent.OnEventError(listener) + xevent.Emmiter.On("event-error", func(payload ...interface{}) { + listener(payload[0].(uint8), payload[1].(string), payload[2].(uint8), payload[3].(uint8)) + }) } diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go index 42decebb..461e79c5 100644 --- a/internal/desktop/xevent/xevent.go +++ b/internal/desktop/xevent/xevent.go @@ -15,11 +15,11 @@ import ( "github.com/kataras/go-events" ) -var emmiter events.EventEmmiter +var Emmiter events.EventEmmiter var file_chooser_dialog_window uint32 = 0 func init() { - emmiter = events.New() + Emmiter = events.New() } func EventLoop(display string) { @@ -29,44 +29,14 @@ func EventLoop(display string) { C.XEventLoop(displayUnsafe) } -func OnCursorChanged(listener func(serial uint64)) { - emmiter.On("cursor-changed", func(payload ...interface{}) { - listener(payload[0].(uint64)) - }) -} - -func OnClipboardUpdated(listener func()) { - emmiter.On("clipboard-updated", func(payload ...interface{}) { - listener() - }) -} - -func OnFileChooserDialogOpened(listener func()) { - emmiter.On("file-chooser-dialog-opened", func(payload ...interface{}) { - listener() - }) -} - -func OnFileChooserDialogClosed(listener func()) { - emmiter.On("file-chooser-dialog-closed", func(payload ...interface{}) { - listener() - }) -} - -func OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { - emmiter.On("event-error", func(payload ...interface{}) { - listener(payload[0].(uint8), payload[1].(string), payload[2].(uint8), payload[3].(uint8)) - }) -} - //export goXEventCursorChanged func goXEventCursorChanged(event C.XFixesCursorNotifyEvent) { - emmiter.Emit("cursor-changed", uint64(event.cursor_serial)) + Emmiter.Emit("cursor-changed", uint64(event.cursor_serial)) } //export goXEventClipboardUpdated func goXEventClipboardUpdated() { - emmiter.Emit("clipboard-updated") + Emmiter.Emit("clipboard-updated") } //export goXEventConfigureNotify @@ -89,7 +59,7 @@ func goXEventConfigureNotify(display *C.Display, window C.Window, name *C.char, if file_chooser_dialog_window == 0 { file_chooser_dialog_window = uint32(window) - emmiter.Emit("file-chooser-dialog-opened") + Emmiter.Emit("file-chooser-dialog-opened") } } @@ -100,12 +70,12 @@ func goXEventUnmapNotify(window C.Window) { } file_chooser_dialog_window = 0 - emmiter.Emit("file-chooser-dialog-closed") + Emmiter.Emit("file-chooser-dialog-closed") } //export goXEventError func goXEventError(event *C.XErrorEvent, message *C.char) { - emmiter.Emit("event-error", uint8(event.error_code), C.GoString(message), uint8(event.request_code), uint8(event.minor_code)) + Emmiter.Emit("event-error", uint8(event.error_code), C.GoString(message), uint8(event.request_code), uint8(event.minor_code)) } //export goXEventActive From 66618b9e62340b2dcd502045057e4fa7e7e8ff8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 28 Feb 2021 18:37:35 +0100 Subject: [PATCH 385/876] WebRTC cursor handler extracted + cache. --- internal/webrtc/cursor/image.go | 126 +++++++++++++++++++++++++++++ internal/webrtc/cursor/position.go | 68 ++++++++++++++++ internal/webrtc/manager.go | 70 ++++++---------- 3 files changed, 217 insertions(+), 47 deletions(-) create mode 100644 internal/webrtc/cursor/image.go create mode 100644 internal/webrtc/cursor/position.go diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go new file mode 100644 index 00000000..85751907 --- /dev/null +++ b/internal/webrtc/cursor/image.go @@ -0,0 +1,126 @@ +package cursor + +import ( + "reflect" + "sync" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" +) + +func NewImage(desktop types.DesktopManager) *ImageCtx { + return &ImageCtx{ + logger: log.With().Str("module", "cursor-image").Logger(), + desktop: desktop, + listeners: map[uintptr]*func(entry *ImageEntry){}, + cache: map[uint64]*ImageEntry{}, + } +} + +type ImageCtx struct { + logger zerolog.Logger + desktop types.DesktopManager + emitMu sync.Mutex + listeners map[uintptr]*func(entry *ImageEntry) + cacheMu sync.Mutex + cache map[uint64]*ImageEntry + current *ImageEntry +} + +type ImageEntry struct { + Cursor *types.CursorImage + Image []byte +} + +func (manager *ImageCtx) Start() { + manager.desktop.OnCursorChanged(func(serial uint64) { + entry, err := manager.GetCached(serial) + if err != nil { + manager.logger.Warn().Err(err).Msg("failed to get cursor image") + return + } + + for _, emit := range manager.listeners { + (*emit)(entry) + } + }) +} + +func (manager *ImageCtx) Shutdown() { + manager.logger.Info().Msgf("shutting down") + + manager.emitMu.Lock() + for key := range manager.listeners { + delete(manager.listeners, key) + } + manager.emitMu.Unlock() +} + +func (manager *ImageCtx) GetCached(serial uint64) (*ImageEntry, error) { + manager.cacheMu.Lock() + entry, ok := manager.cache[serial] + manager.cacheMu.Unlock() + + if ok { + return entry, nil + } + + entry, err := manager.fetchEntry() + if err != nil { + return nil, err + } + + manager.cacheMu.Lock() + manager.cache[serial] = entry + manager.cacheMu.Unlock() + + return entry, nil +} + +func (manager *ImageCtx) GetCurrent() (*ImageEntry, error) { + if manager.current != nil { + return manager.current, nil + } + + return manager.fetchEntry() +} + +func (manager *ImageCtx) AddListener(listener *func(entry *ImageEntry)) { + manager.emitMu.Lock() + defer manager.emitMu.Unlock() + + if listener != nil { + ptr := reflect.ValueOf(listener).Pointer() + manager.listeners[ptr] = listener + } +} + +func (manager *ImageCtx) RemoveListener(listener *func(entry *ImageEntry)) { + manager.emitMu.Lock() + defer manager.emitMu.Unlock() + + if listener != nil { + ptr := reflect.ValueOf(listener).Pointer() + delete(manager.listeners, ptr) + } +} + +func (manager *ImageCtx) fetchEntry() (*ImageEntry, error) { + cur := manager.desktop.GetCursorImage() + + img, err := utils.CreatePNGImage(cur.Image) + if err != nil { + return nil, err + } + + entry := &ImageEntry{ + Cursor: cur, + Image: img, + } + + manager.current = entry + return entry, nil +} diff --git a/internal/webrtc/cursor/position.go b/internal/webrtc/cursor/position.go new file mode 100644 index 00000000..32244cfa --- /dev/null +++ b/internal/webrtc/cursor/position.go @@ -0,0 +1,68 @@ +package cursor + +import ( + "reflect" + "sync" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "demodesk/neko/internal/types" +) + +func NewPosition(desktop types.DesktopManager) *PositionCtx { + return &PositionCtx{ + logger: log.With().Str("module", "cursor-position").Logger(), + desktop: desktop, + listeners: map[uintptr]*func(x, y int){}, + } +} + +type PositionCtx struct { + logger zerolog.Logger + desktop types.DesktopManager + emitMu sync.Mutex + listeners map[uintptr]*func(x, y int) +} + +func (manager *PositionCtx) Start() { + manager.desktop.OnCursorPosition(func(x, y int) { + for _, emit := range manager.listeners { + (*emit)(x, y) + } + }) +} + +func (manager *PositionCtx) Shutdown() { + manager.logger.Info().Msgf("shutting down") + + manager.emitMu.Lock() + for key := range manager.listeners { + delete(manager.listeners, key) + } + manager.emitMu.Unlock() +} + +func (manager *PositionCtx) GetCurrent() (x, y int) { + return manager.desktop.GetCursorPosition() +} + +func (manager *PositionCtx) AddListener(listener *func(x, y int)) { + manager.emitMu.Lock() + defer manager.emitMu.Unlock() + + if listener != nil { + ptr := reflect.ValueOf(listener).Pointer() + manager.listeners[ptr] = listener + } +} + +func (manager *PositionCtx) RemoveListener(listener *func(x, y int)) { + manager.emitMu.Lock() + defer manager.emitMu.Unlock() + + if listener != nil { + ptr := reflect.ValueOf(listener).Pointer() + delete(manager.listeners, ptr) + } +} diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index b89b4ef2..ce150aef 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -3,7 +3,6 @@ package webrtc import ( "fmt" "io" - "reflect" "strings" "sync" "time" @@ -17,7 +16,7 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" + "demodesk/neko/internal/webrtc/cursor" ) // how long is can take between sending offer and connecting @@ -39,9 +38,8 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con capture: capture, config: config, participants: 0, - // TODO: Refactor. - curImgListeners: map[uintptr]*func(cur *types.CursorImage, img []byte){}, - curPosListeners: map[uintptr]*func(x, y int){}, + curImage: cursor.NewImage(desktop), + curPosition: cursor.NewPosition(desktop), } } @@ -54,9 +52,8 @@ type WebRTCManagerCtx struct { capture types.CaptureManager config *config.WebRTC participants uint32 - // TODO: Refactor. - curImgListeners map[uintptr]*func(cur *types.CursorImage, img []byte) - curPosListeners map[uintptr]*func(x, y int) + curImage *cursor.ImageCtx + curPosition *cursor.PositionCtx } func (manager *WebRTCManagerCtx) Start() { @@ -88,32 +85,16 @@ func (manager *WebRTCManagerCtx) Start() { Str("nat_ips", strings.Join(manager.config.NAT1To1IPs, ",")). Msgf("webrtc starting") - // TODO: Refactor. - manager.desktop.OnCursorChanged(func(serial uint64) { - cur := manager.desktop.GetCursorImage() - - img, err := utils.CreatePNGImage(cur.Image) - if err != nil { - manager.logger.Warn().Err(err).Msg("failed to create cursor image") - return - } - - for _, emit := range manager.curImgListeners { - (*emit)(cur, img) - } - }) - - // TODO: Refactor. - manager.desktop.OnCursorPosition(func(x, y int) { - for _, emit := range manager.curPosListeners { - (*emit)(x, y) - } - }) + manager.curImage.Start() + manager.curPosition.Start() } func (manager *WebRTCManagerCtx) Shutdown() error { manager.logger.Info().Msgf("webrtc shutting down") + manager.curImage.Shutdown() + manager.curPosition.Shutdown() + manager.audioStop() return nil } @@ -277,8 +258,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin dataChannel: dataChannel, } - cursorChange := func(cur *types.CursorImage, img []byte) { - if err := peer.SendCursorImage(cur, img); err != nil { + cursorImage := func(entry *cursor.ImageEntry) { + if err := peer.SendCursorImage(entry.Cursor, entry.Image); err != nil { manager.logger.Warn().Err(err).Msg("could not send cursor image") } } @@ -293,10 +274,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } } - // TODO: Refactor. - cursorChangePtr := reflect.ValueOf(&cursorChange).Pointer() - cursorPositionPtr := reflect.ValueOf(&cursorPosition).Pointer() - connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: @@ -328,33 +305,32 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } } - // TODO: Refactor. - delete(manager.curImgListeners, cursorChangePtr) - delete(manager.curPosListeners, cursorPositionPtr) - manager.mu.Unlock() } }) dataChannel.OnOpen(func() { - // TODO: Refactor. - manager.curImgListeners[cursorChangePtr] = &cursorChange - manager.curPosListeners[cursorPositionPtr] = &cursorPosition + manager.curImage.AddListener(&cursorImage) + manager.curPosition.AddListener(&cursorPosition) // send initial cursor image - cur := manager.desktop.GetCursorImage() - img, err := utils.CreatePNGImage(cur.Image) + entry, err := manager.curImage.GetCurrent() if err == nil { - cursorChange(cur, img) + cursorImage(entry) } else { - manager.logger.Warn().Err(err).Msg("failed to create cursor image") + manager.logger.Warn().Err(err).Msg("failed to get cursor image") } // send initial cursor position - x, y := manager.desktop.GetCursorPosition() + x, y := manager.curPosition.GetCurrent() cursorPosition(x, y) }) + dataChannel.OnClose(func() { + manager.curImage.RemoveListener(&cursorImage) + manager.curPosition.RemoveListener(&cursorPosition) + }) + dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { if !session.IsHost() { return From 663270b0f54560e45824c095cb981395004e1bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 28 Feb 2021 18:50:32 +0100 Subject: [PATCH 386/876] cursor position bypass desktop module. --- internal/desktop/xorg.go | 13 ------------- internal/types/desktop.go | 1 - internal/webrtc/cursor/image.go | 2 +- internal/webrtc/cursor/position.go | 16 +++++++--------- internal/webrtc/handler.go | 1 + internal/webrtc/manager.go | 5 ++--- 6 files changed, 11 insertions(+), 27 deletions(-) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 9271fab6..35a43d5c 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -9,21 +9,8 @@ import ( "demodesk/neko/internal/types" ) -// TODO: Refactor. -var cursorListeners []func(x, y int) - func (manager *DesktopManagerCtx) Move(x, y int) { xorg.Move(x, y) - - // TODO: Refactor. - for _, listener := range cursorListeners { - listener(x, y) - } -} - -// TODO: Refactor. -func (manager *DesktopManagerCtx) OnCursorPosition(listener func(x, y int)) { - cursorListeners = append(cursorListeners, listener) } func (manager *DesktopManagerCtx) GetCursorPosition() (int, int) { diff --git a/internal/types/desktop.go b/internal/types/desktop.go index bccfbc04..ea724433 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -48,7 +48,6 @@ type DesktopManager interface { // xorg Move(x, y int) - OnCursorPosition(listener func(x, y int)) GetCursorPosition() (int, int) Scroll(x, y int) ButtonDown(code uint32) error diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 85751907..2fc802c0 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -80,7 +80,7 @@ func (manager *ImageCtx) GetCached(serial uint64) (*ImageEntry, error) { return entry, nil } -func (manager *ImageCtx) GetCurrent() (*ImageEntry, error) { +func (manager *ImageCtx) Get() (*ImageEntry, error) { if manager.current != nil { return manager.current, nil } diff --git a/internal/webrtc/cursor/position.go b/internal/webrtc/cursor/position.go index 32244cfa..958e7d3d 100644 --- a/internal/webrtc/cursor/position.go +++ b/internal/webrtc/cursor/position.go @@ -25,14 +25,6 @@ type PositionCtx struct { listeners map[uintptr]*func(x, y int) } -func (manager *PositionCtx) Start() { - manager.desktop.OnCursorPosition(func(x, y int) { - for _, emit := range manager.listeners { - (*emit)(x, y) - } - }) -} - func (manager *PositionCtx) Shutdown() { manager.logger.Info().Msgf("shutting down") @@ -43,10 +35,16 @@ func (manager *PositionCtx) Shutdown() { manager.emitMu.Unlock() } -func (manager *PositionCtx) GetCurrent() (x, y int) { +func (manager *PositionCtx) Get() (x, y int) { return manager.desktop.GetCursorPosition() } +func (manager *PositionCtx) Set(x, y int) { + for _, emit := range manager.listeners { + (*emit)(x, y) + } +} + func (manager *PositionCtx) AddListener(listener *func(x, y int)) { manager.emitMu.Lock() defer manager.emitMu.Unlock() diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index ff3ab2c2..911e0a6e 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -62,6 +62,7 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { } manager.desktop.Move(int(payload.X), int(payload.Y)) + manager.curPosition.Set(int(payload.X), int(payload.Y)) case OP_SCROLL: payload := &PayloadScroll{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index ce150aef..9d51efb7 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -86,7 +86,6 @@ func (manager *WebRTCManagerCtx) Start() { Msgf("webrtc starting") manager.curImage.Start() - manager.curPosition.Start() } func (manager *WebRTCManagerCtx) Shutdown() error { @@ -314,7 +313,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin manager.curPosition.AddListener(&cursorPosition) // send initial cursor image - entry, err := manager.curImage.GetCurrent() + entry, err := manager.curImage.Get() if err == nil { cursorImage(entry) } else { @@ -322,7 +321,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } // send initial cursor position - x, y := manager.curPosition.GetCurrent() + x, y := manager.curPosition.Get() cursorPosition(x, y) }) From 2204400282cb2919050c2447d85e66d715109640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 28 Feb 2021 18:52:37 +0100 Subject: [PATCH 387/876] cursor cache disable if not available. --- internal/webrtc/cursor/image.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 2fc802c0..037161b7 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -60,6 +60,11 @@ func (manager *ImageCtx) Shutdown() { } func (manager *ImageCtx) GetCached(serial uint64) (*ImageEntry, error) { + // zero means no serial available + if serial == 0 { + return manager.fetchEntry() + } + manager.cacheMu.Lock() entry, ok := manager.cache[serial] manager.cacheMu.Unlock() From 8f9ad2cd9bf2fc1630dfde921fff90b86372d85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 28 Feb 2021 18:56:04 +0100 Subject: [PATCH 388/876] capture stream remove listeners on shutdown. --- internal/capture/stream.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/capture/stream.go b/internal/capture/stream.go index dd3f13f2..ef19b0c2 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -64,6 +64,12 @@ func streamNew(codec codec.RTPCodec, pipelineStr func() string) *StreamManagerCt func (manager *StreamManagerCtx) shutdown() { manager.logger.Info().Msgf("shutting down") + manager.emitMu.Lock() + for key := range manager.listeners { + delete(manager.listeners, key) + } + manager.emitMu.Unlock() + manager.destroyPipeline() manager.emitStop <- true } From c6a183f766adc1217da3d49d42450a0110dde58d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Mar 2021 18:20:17 +0100 Subject: [PATCH 389/876] set AllowCredentials to true. --- internal/http/manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/http/manager.go b/internal/http/manager.go index e8fda212..185df234 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -35,7 +35,7 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c AllowedMethods: []string{"GET", "POST", "DELETE", "OPTIONS"}, AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"}, ExposedHeaders: []string{"Link"}, - AllowCredentials: false, + AllowCredentials: true, MaxAge: 300, // Maximum value not ignored by any of major browsers })) router.Use(middleware.RequestID) // Create a request ID for each request From fa16b28ac03f246aafe44c729d39b119a1060d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Mar 2021 18:52:05 +0100 Subject: [PATCH 390/876] set secure cookies by default. --- internal/api/session.go | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/internal/api/session.go b/internal/api/session.go index 89fb787e..a9f67a37 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -2,6 +2,7 @@ package api import ( "net/http" + "os" "time" "demodesk/neko/internal/http/auth" @@ -9,6 +10,9 @@ import ( "demodesk/neko/internal/utils" ) +var CookieExpirationDate = time.Now().Add(365 * 24 * time.Hour) +var UnsecureCookies = os.Getenv("DISABLE_SECURE_COOKIES") == "true" + type SessionLoginPayload struct { ID string `json:"id"` Secret string `json:"secret"` @@ -32,17 +36,26 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { return } + sameSite := http.SameSiteNoneMode + if UnsecureCookies { + sameSite = http.SameSiteDefaultMode + } + http.SetCookie(w, &http.Cookie{ Name: "neko-id", Value: session.ID(), - Expires: time.Now().Add(365 * 24 * time.Hour), + Expires: CookieExpirationDate, + Secure: !UnsecureCookies, + SameSite: sameSite, HttpOnly: false, }) http.SetCookie(w, &http.Cookie{ Name: "neko-secret", Value: data.Secret, - Expires: time.Now().Add(365 * 24 * time.Hour), + Expires: CookieExpirationDate, + Secure: !UnsecureCookies, + SameSite: sameSite, HttpOnly: true, }) @@ -54,10 +67,17 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { } func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { + sameSite := http.SameSiteNoneMode + if UnsecureCookies { + sameSite = http.SameSiteDefaultMode + } + http.SetCookie(w, &http.Cookie{ Name: "neko-id", Value: "", Expires: time.Unix(0, 0), + Secure: !UnsecureCookies, + SameSite: sameSite, HttpOnly: false, }) @@ -65,6 +85,8 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { Name: "neko-secret", Value: "", Expires: time.Unix(0, 0), + Secure: !UnsecureCookies, + SameSite: sameSite, HttpOnly: true, }) From 0aa1237df92f361d83b3e3bb492e5a4d2be55857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 3 Mar 2021 18:35:58 +0100 Subject: [PATCH 391/876] change pingPeriod to 10s. --- internal/websocket/manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 852646cb..7b4418e6 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -32,7 +32,7 @@ func New( } // Send pings to peer with this period. Must be less than pongWait. -const pingPeriod = 60 * time.Second +const pingPeriod = 10 * time.Second type WebSocketManagerCtx struct { logger zerolog.Logger From 9dc96036cec9c8455992760f3649b017ae1f493d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 3 Mar 2021 18:46:08 +0100 Subject: [PATCH 392/876] fmt sessionCtx. --- internal/session/session.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 14e18175..8b7a2e52 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -9,13 +9,13 @@ import ( ) type SessionCtx struct { - id string - logger zerolog.Logger - manager *SessionManagerCtx - profile types.MemberProfile - state types.MemberState - websocketPeer types.WebSocketPeer - webrtcPeer types.WebRTCPeer + id string + logger zerolog.Logger + manager *SessionManagerCtx + profile types.MemberProfile + state types.MemberState + websocketPeer types.WebSocketPeer + webrtcPeer types.WebRTCPeer } func (session *SessionCtx) ID() string { From b78132e6aadacc3b16082a10a13f03c4c892c53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 3 Mar 2021 18:53:35 +0100 Subject: [PATCH 393/876] WebRTC: add rtp consumer. --- internal/webrtc/manager.go | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 9d51efb7..9f13902d 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -215,12 +215,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return nil } - _, err = connection.AddTrack(manager.audioTrack) + rtpAudio, err := connection.AddTrack(manager.audioTrack) if err != nil { return nil, err } - _, err = connection.AddTrack(videoTrack) + rtpVideo, err := connection.AddTrack(videoTrack) if err != nil { return nil, err } @@ -356,6 +356,24 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } }() + go func() { + rtcpBuf := make([]byte, 1500) + for { + if _, _, err := rtpAudio.Read(rtcpBuf); err != nil { + return + } + } + }() + + go func() { + rtcpBuf := make([]byte, 1500) + for { + if _, _, err := rtpVideo.Read(rtcpBuf); err != nil { + return + } + } + }() + session.SetWebRTCPeer(peer) return connection.LocalDescription(), nil } From e98237a58c5ccde2855f29915bd8828636346b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 3 Mar 2021 19:10:48 +0100 Subject: [PATCH 394/876] vp8 set CBR and undershoot values. --- internal/capture/manager.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index c90d492f..bd3d6546 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -87,7 +87,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! video/x-raw,framerate=25/1 "+ "! videoconvert "+ "! queue "+ - "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 "+ + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 "+ "! appsink name=appsink", config.Display, bitrate, ) }), @@ -105,7 +105,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! videoscale "+ "! video/x-raw,width=%d,height=%d "+ "! queue "+ - "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 "+ + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 "+ "! appsink name=appsink", config.Display, width, height, bitrate, ) }), @@ -123,7 +123,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! videoscale "+ "! video/x-raw,width=%d,height=%d "+ "! queue "+ - "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 "+ + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 "+ "! appsink name=appsink", config.Display, width, height, bitrate, ) }), @@ -141,7 +141,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! videoscale "+ "! video/x-raw,width=%d,height=%d "+ "! queue "+ - "! vp8enc target-bitrate=%d cpu-used=16 threads=4 deadline=100000 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 "+ + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 "+ "! appsink name=appsink", config.Display, width, height, bitrate, ) }), From 13ffc59209e48d2a563e986e72c5898153725b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 3 Mar 2021 19:13:53 +0100 Subject: [PATCH 395/876] broadcast pipeline update. --- internal/capture/manager.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index bd3d6546..310e625a 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -34,13 +34,13 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! audio/x-raw,channels=2 "+ "! audioconvert "+ "! queue "+ - "! voaacenc "+ + "! voaacenc bitrate=128000 "+ "! mux. "+ "ximagesrc display-name=%s show-pointer=true use-damage=false "+ "! video/x-raw "+ "! videoconvert "+ "! queue "+ - "! x264enc threads=4 bitrate=4096 key-int-max=15 byte-stream=true byte-stream=true tune=zerolatency speed-preset=veryfast "+ + "! x264enc threads=4 bitrate=4096 key-int-max=15 byte-stream=true tune=zerolatency speed-preset=veryfast "+ "! mux.", config.Device, config.Display, ) } From f6114cd410bec365403e28778e7aca7e1a6a9eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 3 Mar 2021 22:30:45 +0100 Subject: [PATCH 396/876] pipelines: modify default bitrate ratio. --- internal/capture/manager.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 310e625a..0978b955 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -80,7 +80,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt videos: map[string]*StreamManagerCtx{ "hd": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() - bitrate := screen.Width * screen.Height * 12 + bitrate := int((screen.Width * screen.Height * 5) / 3) return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ @@ -95,7 +95,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt screen := desktop.GetScreenSize() width := int(math.Ceil(float64(screen.Width)/6) * 5) height := int(math.Ceil(float64(screen.Height)/6) * 5) - bitrate := width * height * 12 + bitrate := int((width * height * 5) / 3) return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ @@ -113,7 +113,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt screen := desktop.GetScreenSize() width := int(math.Ceil(float64(screen.Width)/6) * 4) height := int(math.Ceil(float64(screen.Height)/6) * 4) - bitrate := width * height * 8 + bitrate := int((width * height * 5) / 3) return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ @@ -131,7 +131,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt screen := desktop.GetScreenSize() width := int(math.Ceil(float64(screen.Width)/6) * 3) height := int(math.Ceil(float64(screen.Height)/6) * 3) - bitrate := width * height * 4 + bitrate := int((width * height * 5) / 3) return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ From 0ac2109275e9fda775bf5e2fb225e7ddb1af57d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 10 Mar 2021 13:15:18 +0100 Subject: [PATCH 397/876] add ip_retrieval_url. --- internal/config/webrtc.go | 54 ++++++++++++++++++++++++++------------- internal/utils/ip.go | 35 ------------------------- internal/utils/request.go | 22 ++++++++++++++++ 3 files changed, 58 insertions(+), 53 deletions(-) delete mode 100644 internal/utils/ip.go create mode 100644 internal/utils/request.go diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index f8419d5f..616081e2 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -1,9 +1,11 @@ package config import ( + "fmt" "strconv" "strings" + "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -16,32 +18,44 @@ type WebRTC struct { ICEServers []string EphemeralMin uint16 EphemeralMax uint16 - NAT1To1IPs []string + + NAT1To1IPs []string + IpRetrievalUrl string } +const ( + defEprMin = 59000 + defEprMax = 59100 +) + func (WebRTC) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().String("epr", "59000-59100", "limits the pool of ephemeral ports that ICE UDP connections can allocate from") - if err := viper.BindPFlag("epr", cmd.PersistentFlags().Lookup("epr")); err != nil { - return err - } - - cmd.PersistentFlags().StringSlice("nat1to1", []string{}, "sets a list of external IP addresses of 1:1 (D)NAT and a candidate type for which the external IP address is used") - if err := viper.BindPFlag("nat1to1", cmd.PersistentFlags().Lookup("nat1to1")); err != nil { - return err - } - cmd.PersistentFlags().Bool("icelite", false, "configures whether or not the ice agent should be a lite agent") if err := viper.BindPFlag("icelite", cmd.PersistentFlags().Lookup("icelite")); err != nil { return err } + cmd.PersistentFlags().Bool("icetrickle", true, "configures whether cadidates should be sent asynchronously using Trickle ICE") + if err := viper.BindPFlag("icetrickle", cmd.PersistentFlags().Lookup("icetrickle")); err != nil { + return err + } + cmd.PersistentFlags().StringSlice("iceserver", []string{"stun:stun.l.google.com:19302"}, "describes a single STUN and TURN server that can be used by the ICEAgent to establish a connection with a peer") if err := viper.BindPFlag("iceserver", cmd.PersistentFlags().Lookup("iceserver")); err != nil { return err } - cmd.PersistentFlags().Bool("icetrickle", true, "configures whether cadidates should be sent asynchronously using Trickle ICE") - if err := viper.BindPFlag("icetrickle", cmd.PersistentFlags().Lookup("icetrickle")); err != nil { + cmd.PersistentFlags().StringSlice("nat1to1", []string{}, "sets a list of external IP addresses of 1:1 (D)NAT and a candidate type for which the external IP address is used") + if err := viper.BindPFlag("nat1to1", cmd.PersistentFlags().Lookup("nat1to1")); err != nil { + return err + } + + cmd.PersistentFlags().String("ip_retrieval_url", "https://checkip.amazonaws.com", "URL address used for retrieval of the external IP address") + if err := viper.BindPFlag("ip_retrieval_url", cmd.PersistentFlags().Lookup("ip_retrieval_url")); err != nil { + return err + } + + cmd.PersistentFlags().String("epr", fmt.Sprintf("%d-%d", defEprMin, defEprMax), "limits the pool of ephemeral ports that ICE UDP connections can allocate from") + if err := viper.BindPFlag("epr", cmd.PersistentFlags().Lookup("epr")); err != nil { return err } @@ -52,17 +66,21 @@ func (s *WebRTC) Set() { s.ICELite = viper.GetBool("icelite") s.ICETrickle = viper.GetBool("icetrickle") s.ICEServers = viper.GetStringSlice("iceserver") - s.NAT1To1IPs = viper.GetStringSlice("nat1to1") - if len(s.NAT1To1IPs) == 0 { - ip, err := utils.GetIP() + s.NAT1To1IPs = viper.GetStringSlice("nat1to1") + s.IpRetrievalUrl = viper.GetString("ip_retrieval_url") + if s.IpRetrievalUrl != "" && len(s.NAT1To1IPs) == 0 { + ip, err := utils.HttpRequestGET(s.IpRetrievalUrl) if err == nil { s.NAT1To1IPs = append(s.NAT1To1IPs, ip) + } else { + log.Warn().Err(err).Msgf("IP retrieval failed") } } - min := uint16(59000) - max := uint16(59100) + min := uint16(defEprMin) + max := uint16(defEprMax) + epr := viper.GetString("epr") ports := strings.SplitN(epr, "-", -1) if len(ports) > 1 { diff --git a/internal/utils/ip.go b/internal/utils/ip.go deleted file mode 100644 index 67c7d38d..00000000 --- a/internal/utils/ip.go +++ /dev/null @@ -1,35 +0,0 @@ -package utils - -import ( - "bytes" - "io/ioutil" - "net/http" -) - -// dig @resolver1.opendns.com ANY myip.opendns.com +short -4 - -func GetIP() (string, error) { - rsp, err := http.Get("http://checkip.amazonaws.com") - if err != nil { - return "", err - } - defer rsp.Body.Close() - - buf, err := ioutil.ReadAll(rsp.Body) - if err != nil { - return "", err - } - - return string(bytes.TrimSpace(buf)), nil -} - -func ReadUserIP(r *http.Request) string { - IPAddress := r.Header.Get("X-Real-Ip") - if IPAddress == "" { - IPAddress = r.Header.Get("X-Forwarded-For") - } - if IPAddress == "" { - IPAddress = r.RemoteAddr - } - return IPAddress -} diff --git a/internal/utils/request.go b/internal/utils/request.go new file mode 100644 index 00000000..9ba77b01 --- /dev/null +++ b/internal/utils/request.go @@ -0,0 +1,22 @@ +package utils + +import ( + "bytes" + "io/ioutil" + "net/http" +) + +func HttpRequestGET(url string) (string, error) { + rsp, err := http.Get(url) + if err != nil { + return "", err + } + defer rsp.Body.Close() + + buf, err := ioutil.ReadAll(rsp.Body) + if err != nil { + return "", err + } + + return string(bytes.TrimSpace(buf)), nil +} From d24cea353500aec2308164ac2ea280334d184c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 11 Mar 2021 17:44:49 +0100 Subject: [PATCH 398/876] desktop display from env. --- internal/config/desktop.go | 6 ++++++ internal/desktop/manager.go | 10 ++++------ internal/desktop/xorg/xorg.go | 10 +++------- neko.go | 1 - 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/internal/config/desktop.go b/internal/config/desktop.go index f67daace..416924df 100644 --- a/internal/config/desktop.go +++ b/internal/config/desktop.go @@ -1,6 +1,7 @@ package config import ( + "os" "regexp" "strconv" @@ -9,6 +10,8 @@ import ( ) type Desktop struct { + Display string + ScreenWidth int ScreenHeight int ScreenRate int16 @@ -24,6 +27,9 @@ func (Desktop) Init(cmd *cobra.Command) error { } func (s *Desktop) Set() { + // Display is provided by env variable + s.Display = os.Getenv("DISPLAY") + s.ScreenWidth = 1280 s.ScreenHeight = 720 s.ScreenRate = 30 diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 38534c7f..cef9b6ab 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -21,24 +21,22 @@ type DesktopManagerCtx struct { cleanup *time.Ticker shutdown chan bool emmiter events.EventEmmiter - display string config *config.Desktop } -func New(display string, config *config.Desktop) *DesktopManagerCtx { +func New(config *config.Desktop) *DesktopManagerCtx { return &DesktopManagerCtx{ logger: log.With().Str("module", "desktop").Logger(), cleanup: time.NewTicker(1 * time.Second), shutdown: make(chan bool), emmiter: events.New(), - display: display, config: config, } } func (manager *DesktopManagerCtx) Start() { - if err := xorg.DisplayOpen(manager.display); err != nil { - manager.logger.Warn().Err(err).Msg("unable to open dispaly") + if xorg.DisplayOpen(manager.config.Display) { + manager.logger.Panic().Str("display", manager.config.Display).Msg("unable to open display") } xorg.GetScreenConfigurations() @@ -51,7 +49,7 @@ func (manager *DesktopManagerCtx) Start() { manager.logger.Warn().Err(err).Msg("unable to set initial screen size") } - go xevent.EventLoop(manager.display) + go xevent.EventLoop(manager.config.Display) // In case it was opened go manager.CloseFileChooserDialog() diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index cccd5d87..ab079de2 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -39,19 +39,15 @@ func GetScreenConfigurations() { C.XGetScreenConfigurations() } -func DisplayOpen(display string) error { +func DisplayOpen(display string) bool { mu.Lock() defer mu.Unlock() displayUnsafe := C.CString(display) defer C.free(unsafe.Pointer(displayUnsafe)) - err := C.XDisplayOpen(displayUnsafe) - if int(err) == 1 { - return fmt.Errorf("Could not open display %s.", display) - } - - return nil + ok := C.XDisplayOpen(displayUnsafe) + return int(ok) == 1 } func DisplayClose() { diff --git a/neko.go b/neko.go index c2b2d125..ceaa9105 100644 --- a/neko.go +++ b/neko.go @@ -137,7 +137,6 @@ func (neko *Neko) Start() { } neko.desktopManager = desktop.New( - neko.Configs.Capture.Display, neko.Configs.Desktop, ) neko.desktopManager.Start() From 6b638db82500b4be8ab990c7058200bfd76a4b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 11 Mar 2021 17:55:13 +0100 Subject: [PATCH 399/876] capture use display from ENV. --- internal/capture/manager.go | 4 +- internal/config/capture.go | 89 ++++++++++--------------------------- 2 files changed, 26 insertions(+), 67 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 0978b955..d24d17b9 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -41,7 +41,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! videoconvert "+ "! queue "+ "! x264enc threads=4 bitrate=4096 key-int-max=15 byte-stream=true tune=zerolatency speed-preset=veryfast "+ - "! mux.", config.Device, config.Display, + "! mux.", config.AudioDevice, config.Display, ) } @@ -74,7 +74,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! audioconvert "+ "! queue "+ "! %s "+ - "! appsink name=appsink", config.Device, config.AudioCodec.Pipeline, + "! appsink name=appsink", config.AudioDevice, config.AudioCodec.Pipeline, ) }), videos: map[string]*StreamManagerCtx{ diff --git a/internal/config/capture.go b/internal/config/capture.go index 80c13a69..0638fc9b 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -1,6 +1,8 @@ package config import ( + "os" + "github.com/spf13/cobra" "github.com/spf13/viper" @@ -8,14 +10,12 @@ import ( ) type Capture struct { - Device string + Display string + + AudioDevice string AudioCodec codec.RTPCodec AudioPipeline string - Display string - //VideoCodec codec.RTPCodec - //VideoPipeline string - BroadcastPipeline string Screencast bool @@ -25,43 +25,17 @@ type Capture struct { } func (Capture) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().String("display", ":99.0", "XDisplay to capture") - if err := viper.BindPFlag("display", cmd.PersistentFlags().Lookup("display")); err != nil { + // audio + cmd.PersistentFlags().String("audio_device", "auto_null.monitor", "audio device to capture") + if err := viper.BindPFlag("audio_device", cmd.PersistentFlags().Lookup("audio_device")); err != nil { return err } - cmd.PersistentFlags().String("device", "auto_null.monitor", "audio device to capture") - if err := viper.BindPFlag("device", cmd.PersistentFlags().Lookup("device")); err != nil { + cmd.PersistentFlags().String("audio_pipeline", "", "gstreamer pipeline used for audio streaming") + if err := viper.BindPFlag("audio_pipeline", cmd.PersistentFlags().Lookup("audio_pipeline")); err != nil { return err } - cmd.PersistentFlags().String("audio", "", "audio codec parameters to use for streaming") - if err := viper.BindPFlag("audio", cmd.PersistentFlags().Lookup("audio")); err != nil { - return err - } - - //cmd.PersistentFlags().String("video", "", "video codec parameters to use for streaming") - //if err := viper.BindPFlag("video", cmd.PersistentFlags().Lookup("video")); err != nil { - // return err - //} - - // video codecs - //cmd.PersistentFlags().Bool("vp8", false, "use VP8 video codec") - //if err := viper.BindPFlag("vp8", cmd.PersistentFlags().Lookup("vp8")); err != nil { - // return err - //} - // - //cmd.PersistentFlags().Bool("vp9", false, "use VP9 video codec") - //if err := viper.BindPFlag("vp9", cmd.PersistentFlags().Lookup("vp9")); err != nil { - // return err - //} - // - //cmd.PersistentFlags().Bool("h264", false, "use H264 video codec") - //if err := viper.BindPFlag("h264", cmd.PersistentFlags().Lookup("h264")); err != nil { - // return err - //} - - // audio codecs cmd.PersistentFlags().Bool("opus", false, "use Opus audio codec") if err := viper.BindPFlag("opus", cmd.PersistentFlags().Lookup("opus")); err != nil { return err @@ -83,7 +57,7 @@ func (Capture) Init(cmd *cobra.Command) error { } // broadcast - cmd.PersistentFlags().String("broadcast_pipeline", "", "audio video codec parameters to use for broadcasting") + cmd.PersistentFlags().String("broadcast_pipeline", "", "gstreamer pipeline used for broadcasting") if err := viper.BindPFlag("broadcast_pipeline", cmd.PersistentFlags().Lookup("broadcast_pipeline")); err != nil { return err } @@ -94,17 +68,17 @@ func (Capture) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().String("screencast_rate", "10/1", "set screencast frame rate") + cmd.PersistentFlags().String("screencast_rate", "10/1", "screencast frame rate") if err := viper.BindPFlag("screencast_rate", cmd.PersistentFlags().Lookup("screencast_rate")); err != nil { return err } - cmd.PersistentFlags().String("screencast_quality", "60", "set screencast JPEG quality") + cmd.PersistentFlags().String("screencast_quality", "60", "screencast JPEG quality") if err := viper.BindPFlag("screencast_quality", cmd.PersistentFlags().Lookup("screencast_quality")); err != nil { return err } - cmd.PersistentFlags().String("screencast_pipeline", "", "custom screencast pipeline") + cmd.PersistentFlags().String("screencast_pipeline", "", "gstreamer pipeline used for screencasting") if err := viper.BindPFlag("screencast_pipeline", cmd.PersistentFlags().Lookup("screencast_pipeline")); err != nil { return err } @@ -113,40 +87,25 @@ func (Capture) Init(cmd *cobra.Command) error { } func (s *Capture) Set() { - //var videoCodec codec.RTPCodec - //if viper.GetBool("vp8") { - // videoCodec = codec.VP8() - //} else if viper.GetBool("vp9") { - // videoCodec = codec.VP9() - //} else if viper.GetBool("h264") { - // videoCodec = codec.H264() - //} else { - // // default - // videoCodec = codec.VP8() - //} + // Display is provided by env variable + s.Display = os.Getenv("DISPLAY") + + s.AudioDevice = viper.GetString("audio_device") + s.AudioPipeline = viper.GetString("audio_pipeline") - var audioCodec codec.RTPCodec if viper.GetBool("opus") { - audioCodec = codec.Opus() + s.AudioCodec = codec.Opus() } else if viper.GetBool("g722") { - audioCodec = codec.G722() + s.AudioCodec = codec.G722() } else if viper.GetBool("pcmu") { - audioCodec = codec.PCMU() + s.AudioCodec = codec.PCMU() } else if viper.GetBool("pcma") { - audioCodec = codec.PCMA() + s.AudioCodec = codec.PCMA() } else { // default - audioCodec = codec.Opus() + s.AudioCodec = codec.Opus() } - s.Device = viper.GetString("device") - s.AudioCodec = audioCodec - s.AudioPipeline = viper.GetString("audio") - - s.Display = viper.GetString("display") - //s.VideoCodec = videoCodec - //s.VideoPipeline = viper.GetString("video") - s.BroadcastPipeline = viper.GetString("broadcast_pipeline") s.Screencast = viper.GetBool("screencast") From 58b00525cc8b0f5d73db0279d421d5d2fdc547c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 20:42:56 +0100 Subject: [PATCH 400/876] refactor authenticate to use Token. --- internal/api/router.go | 2 +- internal/api/session.go | 9 +++--- internal/session/auth.go | 52 ++++++++++++++--------------------- internal/websocket/manager.go | 2 +- 4 files changed, 27 insertions(+), 38 deletions(-) diff --git a/internal/api/router.go b/internal/api/router.go index c57ee9dc..b1fe988a 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -59,7 +59,7 @@ func (api *ApiManagerCtx) Route(r chi.Router) { func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - session, err := api.sessions.AuthenticateRequest(r) + session, err := api.sessions.Authenticate(r) if err != nil { utils.HttpUnauthorized(w, err) } else { diff --git a/internal/api/session.go b/internal/api/session.go index a9f67a37..c7678e14 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -30,11 +30,12 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { return } - session, err := api.sessions.Authenticate(data.ID, data.Secret) - if err != nil { - utils.HttpUnauthorized(w, err) + // TODO: Proper login. + //session, err := api.sessions.Authenticate(data.ID, data.Secret) + //if err != nil { + utils.HttpUnauthorized(w, "no authentication implemented") return - } + //} sameSite := http.SameSiteNoneMode if UnsecureCookies { diff --git a/internal/session/auth.go b/internal/session/auth.go index b49da1e2..d875dc64 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -2,57 +2,45 @@ package session import ( "fmt" + "strings" "net/http" "demodesk/neko/internal/types" ) -func (manager *SessionManagerCtx) AuthenticateRequest(r *http.Request) (types.Session, error) { - id, secret, ok := getAuthData(r) +func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, error) { + token, ok := getToken(r) if !ok { return nil, fmt.Errorf("no authentication provided") } - return manager.Authenticate(id, secret) -} - -func (manager *SessionManagerCtx) Authenticate(id string, secret string) (types.Session, error) { - session, ok := manager.Get(id) + session, ok := manager.Get(token) if !ok { - return nil, fmt.Errorf("member not found") - } - - if !session.VerifySecret(secret) { - return nil, fmt.Errorf("invalid password provided") - } - - if !session.CanLogin() { - return nil, fmt.Errorf("login disabled") + return nil, fmt.Errorf("session not found") } return session, nil } -func getAuthData(r *http.Request) (string, string, bool) { - // get from Cookies - cid, err1 := r.Cookie("neko-id") - csecret, err2 := r.Cookie("neko-secret") - if err1 == nil && err2 == nil { - return cid.Value, csecret.Value, true +func getToken(r *http.Request) (string, bool) { + // get from Cookie + cookie, err := r.Cookie("neko-token") + if err == nil { + return cookie.Value, true } - // get from BasicAuth - id, secret, ok := r.BasicAuth() - if ok { - return id, secret, true + // get from Header + reqToken := r.Header.Get("Authorization") + splitToken := strings.Split(reqToken, "Bearer ") + if len(splitToken) == 2 { + return strings.TrimSpace(splitToken[1]), true } - // get from QueryParams - id = r.URL.Query().Get("id") - secret = r.URL.Query().Get("secret") - if id != "" && secret != "" { - return id, secret, true + // get from URL + token := r.URL.Query().Get("token") + if token != "" { + return token, true } - return "", "", false + return "", false } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 7b4418e6..613dd34e 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -138,7 +138,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque return err } - session, err := manager.sessions.AuthenticateRequest(r) + session, err := manager.sessions.Authenticate(r) if err != nil { manager.logger.Warn().Err(err).Msg("authentication failed") From 84f0b0aaeb373f2fc9524a6d5b25b7d1f816ae28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 21:07:51 +0100 Subject: [PATCH 401/876] move session database to member folder. --- internal/{session => member}/database/dummy/adapter.go | 0 internal/{session => member}/database/file/adapter.go | 0 internal/{session => member}/database/manager.go | 0 internal/{session => member}/database/object/adapter.go | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename internal/{session => member}/database/dummy/adapter.go (100%) rename internal/{session => member}/database/file/adapter.go (100%) rename internal/{session => member}/database/manager.go (100%) rename internal/{session => member}/database/object/adapter.go (100%) diff --git a/internal/session/database/dummy/adapter.go b/internal/member/database/dummy/adapter.go similarity index 100% rename from internal/session/database/dummy/adapter.go rename to internal/member/database/dummy/adapter.go diff --git a/internal/session/database/file/adapter.go b/internal/member/database/file/adapter.go similarity index 100% rename from internal/session/database/file/adapter.go rename to internal/member/database/file/adapter.go diff --git a/internal/session/database/manager.go b/internal/member/database/manager.go similarity index 100% rename from internal/session/database/manager.go rename to internal/member/database/manager.go diff --git a/internal/session/database/object/adapter.go b/internal/member/database/object/adapter.go similarity index 100% rename from internal/session/database/object/adapter.go rename to internal/member/database/object/adapter.go From 3aea0c7bf5b7188d8439768b069fa6de4d480e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 21:11:48 +0100 Subject: [PATCH 402/876] remove members from session. --- internal/api/members/controler.go | 2 +- internal/api/session.go | 52 ++++--- internal/config/session.go | 28 ---- internal/session/auth.go | 2 +- internal/session/manager.go | 218 ++++++++------------------- internal/session/session.go | 4 - internal/types/session.go | 10 +- internal/websocket/handler/system.go | 2 +- neko.go | 9 -- 9 files changed, 96 insertions(+), 231 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 282fe01c..40cba097 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -14,7 +14,7 @@ type MemberDataPayload struct { func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { members := []MemberDataPayload{} - for _, session := range h.sessions.Members() { + for _, session := range h.sessions.List() { profile := session.GetProfile() members = append(members, MemberDataPayload{ ID: session.ID(), diff --git a/internal/api/session.go b/internal/api/session.go index c7678e14..d8792b12 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -30,12 +30,23 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { return } + token := data.Secret + // TODO: Proper login. - //session, err := api.sessions.Authenticate(data.ID, data.Secret) - //if err != nil { - utils.HttpUnauthorized(w, "no authentication implemented") + session, err := api.sessions.Create(token, types.MemberProfile{ + Name: data.ID, + IsAdmin: true, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + }) + + if err != nil { + utils.HttpUnauthorized(w, err) return - //} + } sameSite := http.SameSiteNoneMode if UnsecureCookies { @@ -43,17 +54,8 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { } http.SetCookie(w, &http.Cookie{ - Name: "neko-id", - Value: session.ID(), - Expires: CookieExpirationDate, - Secure: !UnsecureCookies, - SameSite: sameSite, - HttpOnly: false, - }) - - http.SetCookie(w, &http.Cookie{ - Name: "neko-secret", - Value: data.Secret, + Name: "NEKO_SESSION", + Value: token, Expires: CookieExpirationDate, Secure: !UnsecureCookies, SameSite: sameSite, @@ -68,22 +70,22 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { } func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { + session := auth.GetSession(r) + + // TODO: Proper logout. + err := api.sessions.Delete(session.ID()) + if err != nil { + utils.HttpUnauthorized(w, err) + return + } + sameSite := http.SameSiteNoneMode if UnsecureCookies { sameSite = http.SameSiteDefaultMode } http.SetCookie(w, &http.Cookie{ - Name: "neko-id", - Value: "", - Expires: time.Unix(0, 0), - Secure: !UnsecureCookies, - SameSite: sameSite, - HttpOnly: false, - }) - - http.SetCookie(w, &http.Cookie{ - Name: "neko-secret", + Name: "NEKO_SESSION", Value: "", Expires: time.Unix(0, 0), Secure: !UnsecureCookies, diff --git a/internal/config/session.go b/internal/config/session.go index e7472478..b7de9c84 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -6,46 +6,18 @@ import ( ) type Session struct { - Password string - AdminPassword string ImplicitHosting bool - DatabaseAdapter string - FilePath string } func (Session) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().String("password", "neko", "password for connecting to stream") - if err := viper.BindPFlag("password", cmd.PersistentFlags().Lookup("password")); err != nil { - return err - } - - cmd.PersistentFlags().String("password_admin", "admin", "admin password for connecting to stream") - if err := viper.BindPFlag("password_admin", cmd.PersistentFlags().Lookup("password_admin")); err != nil { - return err - } - cmd.PersistentFlags().Bool("implicit_hosting", true, "allow implicit control switching") if err := viper.BindPFlag("implicit_hosting", cmd.PersistentFlags().Lookup("implicit_hosting")); err != nil { return err } - cmd.PersistentFlags().String("database_adapter", "file", "choose database adapter for members") - if err := viper.BindPFlag("database_adapter", cmd.PersistentFlags().Lookup("database_adapter")); err != nil { - return err - } - - cmd.PersistentFlags().String("file_path", "/home/neko/members.json", "file adapter: specify file path") - if err := viper.BindPFlag("file_path", cmd.PersistentFlags().Lookup("file_path")); err != nil { - return err - } - return nil } func (s *Session) Set() { - s.Password = viper.GetString("password") - s.AdminPassword = viper.GetString("password_admin") s.ImplicitHosting = viper.GetBool("implicit_hosting") - s.DatabaseAdapter = viper.GetString("database_adapter") - s.FilePath = viper.GetString("file_path") } diff --git a/internal/session/auth.go b/internal/session/auth.go index d875dc64..fe085318 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -24,7 +24,7 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, func getToken(r *http.Request) (string, bool) { // get from Cookie - cookie, err := r.Cookie("neko-token") + cookie, err := r.Cookie("NEKO_SESSION") if err == nil { return cookie.Value, true } diff --git a/internal/session/manager.go b/internal/session/manager.go index d6cbd786..8208692b 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -9,37 +9,45 @@ import ( "github.com/rs/zerolog/log" "demodesk/neko/internal/config" - "demodesk/neko/internal/session/database" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" ) func New(config *config.Session) *SessionManagerCtx { return &SessionManagerCtx{ - logger: log.With().Str("module", "session").Logger(), - host: nil, - hostMu: sync.Mutex{}, - config: config, - database: database.New(config), - members: make(map[string]*SessionCtx), - membersMu: sync.Mutex{}, - emmiter: events.New(), + logger: log.With().Str("module", "session").Logger(), + config: config, + host: nil, + hostMu: sync.Mutex{}, + sessions: make(map[string]*SessionCtx), + sessionsMu: sync.Mutex{}, + emmiter: events.New(), } } type SessionManagerCtx struct { - logger zerolog.Logger - host types.Session - hostMu sync.Mutex - config *config.Session - database types.MembersDatabase - members map[string]*SessionCtx - membersMu sync.Mutex - emmiter events.EventEmmiter + logger zerolog.Logger + config *config.Session + host types.Session + hostMu sync.Mutex + sessions map[string]*SessionCtx + sessionsMu sync.Mutex + emmiter events.EventEmmiter } -// TODO: Extract members map + primitives. -func (manager *SessionManagerCtx) add(id string, profile types.MemberProfile) types.Session { +// --- +// sessions +// --- + +func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, error) { + manager.sessionsMu.Lock() + + _, ok := manager.sessions[id] + if ok { + manager.sessionsMu.Unlock() + return nil, fmt.Errorf("Session id already exists.") + } + session := &SessionCtx{ id: id, manager: manager, @@ -47,104 +55,24 @@ func (manager *SessionManagerCtx) add(id string, profile types.MemberProfile) ty profile: profile, } - manager.members[id] = session - return session -} - -// --- -// members -// --- -func (manager *SessionManagerCtx) Connect() error { - if err := manager.database.Connect(); err != nil { - return err - } - - profiles, err := manager.database.Select() - if err != nil { - return err - } - - for id, profile := range profiles { - _ = manager.add(id, profile) - } - - // TODO: Move to Database, or make `admin` as reserved ID. - - // create default admin account at startup - _ = manager.add("admin", types.MemberProfile{ - Secret: manager.config.AdminPassword, - Name: "Administrator", - IsAdmin: true, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanAccessClipboard: true, - }) - - // create default user account at startup - _ = manager.add("user", types.MemberProfile{ - Secret: manager.config.Password, - Name: "User", - IsAdmin: false, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanAccessClipboard: true, - }) - - return nil -} - -func (manager *SessionManagerCtx) Disconnect() error { - return manager.database.Disconnect() -} - -func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, error) { - manager.membersMu.Lock() - - _, ok := manager.members[id] - if ok { - manager.membersMu.Unlock() - return nil, fmt.Errorf("Member ID already exists.") - } - - err := manager.database.Insert(id, profile) - if err != nil { - manager.membersMu.Unlock() - return nil, err - } - - session := manager.add(id, profile) - manager.membersMu.Unlock() + manager.sessions[id] = session + manager.sessionsMu.Unlock() manager.emmiter.Emit("created", session) return session, nil } func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) error { - manager.membersMu.Lock() + manager.sessionsMu.Lock() - session, ok := manager.members[id] + session, ok := manager.sessions[id] if !ok { - manager.membersMu.Unlock() - return fmt.Errorf("Member not found.") - } - - // preserve secret if not updated - if profile.Secret == "" { - profile.Secret = session.profile.Secret - } - - err := manager.database.Update(id, profile) - if err != nil { - manager.membersMu.Unlock() - return err + manager.sessionsMu.Unlock() + return fmt.Errorf("Session id not found.") } session.profile = profile - manager.membersMu.Unlock() + manager.sessionsMu.Unlock() manager.emmiter.Emit("profile_changed", session) session.profileChanged() @@ -152,24 +80,19 @@ func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) } func (manager *SessionManagerCtx) Delete(id string) error { - manager.membersMu.Lock() - session, ok := manager.members[id] + manager.sessionsMu.Lock() + session, ok := manager.sessions[id] if !ok { - manager.membersMu.Unlock() - return fmt.Errorf("Member not found.") + manager.sessionsMu.Unlock() + return fmt.Errorf("Session id not found.") } - err := manager.database.Delete(id) - if err != nil { - manager.membersMu.Unlock() - return err - } - - delete(manager.members, id) - manager.membersMu.Unlock() + delete(manager.sessions, id) + manager.sessionsMu.Unlock() + var err error if session.IsConnected() { - err = session.Disconnect("member deleted") + err = session.Disconnect("session deleted") } manager.emmiter.Emit("deleted", session) @@ -177,13 +100,25 @@ func (manager *SessionManagerCtx) Delete(id string) error { } func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { - manager.membersMu.Lock() - defer manager.membersMu.Unlock() + manager.sessionsMu.Lock() + defer manager.sessionsMu.Unlock() - session, ok := manager.members[id] + session, ok := manager.sessions[id] return session, ok } +func (manager *SessionManagerCtx) List() []types.Session { + manager.sessionsMu.Lock() + defer manager.sessionsMu.Unlock() + + var sessions []types.Session + for _, session := range manager.sessions { + sessions = append(sessions, session) + } + + return sessions +} + // --- // host // --- @@ -213,39 +148,14 @@ func (manager *SessionManagerCtx) ClearHost() { } // --- -// members list +// broadcasts // --- -func (manager *SessionManagerCtx) HasConnectedMembers() bool { - manager.membersMu.Lock() - defer manager.membersMu.Unlock() - - for _, session := range manager.members { - if session.IsConnected() { - return true - } - } - - return false -} - -func (manager *SessionManagerCtx) Members() []types.Session { - manager.membersMu.Lock() - defer manager.membersMu.Unlock() - - var sessions []types.Session - for _, session := range manager.members { - sessions = append(sessions, session) - } - - return sessions -} - func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) { - manager.membersMu.Lock() - defer manager.membersMu.Unlock() + manager.sessionsMu.Lock() + defer manager.sessionsMu.Unlock() - for id, session := range manager.members { + for id, session := range manager.sessions { if !session.IsConnected() { continue } @@ -263,10 +173,10 @@ func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) } func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interface{}) { - manager.membersMu.Lock() - defer manager.membersMu.Unlock() + manager.sessionsMu.Lock() + defer manager.sessionsMu.Unlock() - for id, session := range manager.members { + for id, session := range manager.sessions { if !session.IsConnected() || !session.IsAdmin() { continue } diff --git a/internal/session/session.go b/internal/session/session.go index 8b7a2e52..0311cf6f 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -26,10 +26,6 @@ func (session *SessionCtx) ID() string { // profile // --- -func (session *SessionCtx) VerifySecret(secret string) bool { - return session.profile.Secret == secret -} - func (session *SessionCtx) Name() string { return session.profile.Name } diff --git a/internal/types/session.go b/internal/types/session.go index c909de8b..912bf760 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -32,7 +32,6 @@ type Session interface { ID() string // profile - VerifySecret(secret string) bool Name() string IsAdmin() bool CanLogin() bool @@ -60,20 +59,16 @@ type Session interface { } type SessionManager interface { - Connect() error - Disconnect() error - Create(id string, profile MemberProfile) (Session, error) Update(id string, profile MemberProfile) error Get(id string) (Session, bool) Delete(id string) error + List() []Session SetHost(host Session) GetHost() Session ClearHost() - HasConnectedMembers() bool - Members() []Session Broadcast(v interface{}, exclude interface{}) AdminBroadcast(v interface{}, exclude interface{}) @@ -88,6 +83,5 @@ type SessionManager interface { ImplicitHosting() bool - AuthenticateRequest(r *http.Request) (Session, error) - Authenticate(id string, secret string) (Session, error) + Authenticate(r *http.Request) (Session, error) } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index ecff96c2..9b244545 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -24,7 +24,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { } members := map[string]message.MemberData{} - for _, session := range h.sessions.Members() { + for _, session := range h.sessions.List() { members[session.ID()] = message.MemberData{ ID: session.ID(), Profile: session.GetProfile(), diff --git a/neko.go b/neko.go index ceaa9105..7b912471 100644 --- a/neko.go +++ b/neko.go @@ -132,9 +132,6 @@ func (neko *Neko) Start() { neko.sessionManager = session.New( neko.Configs.Session, ) - if err := neko.sessionManager.Connect(); err != nil { - neko.logger.Panic().Err(err).Msg("unable to connect to session manager") - } neko.desktopManager = desktop.New( neko.Configs.Desktop, @@ -184,12 +181,6 @@ func (neko *Neko) Start() { } func (neko *Neko) Shutdown() { - if err := neko.sessionManager.Disconnect(); err != nil { - neko.logger.Err(err).Msg("session manager disconnect with an error") - } else { - neko.logger.Debug().Msg("session manager disconnect") - } - if err := neko.desktopManager.Shutdown(); err != nil { neko.logger.Err(err).Msg("desktop manager shutdown with an error") } else { From a6b66e4d558ed1c4db7b61dd66bd0c2122d8155d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 21:37:00 +0100 Subject: [PATCH 403/876] OnHostChanged event. --- internal/api/room/control.go | 35 ------------------------ internal/session/manager.go | 39 ++++++++++----------------- internal/session/session.go | 6 ----- internal/types/session.go | 3 +-- internal/websocket/handler/control.go | 12 --------- internal/websocket/handler/session.go | 6 ----- internal/websocket/manager.go | 13 +++++++++ 7 files changed, 28 insertions(+), 86 deletions(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 2e895010..7de66153 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -6,8 +6,6 @@ import ( "github.com/go-chi/chi" "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" "demodesk/neko/internal/utils" ) @@ -50,13 +48,6 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { h.sessions.SetHost(session) - h.sessions.Broadcast( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: true, - HostID: session.ID(), - }, nil) - utils.HttpSuccess(w) } @@ -75,12 +66,6 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { h.desktop.ResetKeys() h.sessions.ClearHost() - h.sessions.Broadcast( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: false, - }, nil) - utils.HttpSuccess(w) } @@ -93,13 +78,6 @@ func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { h.sessions.SetHost(session) - h.sessions.Broadcast( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: true, - HostID: session.ID(), - }, nil) - utils.HttpSuccess(w) } @@ -119,13 +97,6 @@ func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { h.sessions.SetHost(target) - h.sessions.Broadcast( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: true, - HostID: target.ID(), - }, nil) - utils.HttpSuccess(w) } @@ -139,11 +110,5 @@ func (h *RoomHandler) controlReset(w http.ResponseWriter, r *http.Request) { h.desktop.ResetKeys() h.sessions.ClearHost() - h.sessions.Broadcast( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: false, - }, nil) - utils.HttpSuccess(w) } diff --git a/internal/session/manager.go b/internal/session/manager.go index 8208692b..2a4120b8 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -35,10 +35,6 @@ type SessionManagerCtx struct { emmiter events.EventEmmiter } -// --- -// sessions -// --- - func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, error) { manager.sessionsMu.Lock() @@ -125,10 +121,10 @@ func (manager *SessionManagerCtx) List() []types.Session { func (manager *SessionManagerCtx) SetHost(host types.Session) { manager.hostMu.Lock() - defer manager.hostMu.Unlock() - manager.host = host - manager.emmiter.Emit("host", host) + manager.hostMu.Unlock() + + manager.emmiter.Emit("host_changed", host) } func (manager *SessionManagerCtx) GetHost() types.Session { @@ -139,12 +135,7 @@ func (manager *SessionManagerCtx) GetHost() types.Session { } func (manager *SessionManagerCtx) ClearHost() { - manager.hostMu.Lock() - defer manager.hostMu.Unlock() - - host := manager.host - manager.host = nil - manager.emmiter.Emit("host_cleared", host) + manager.SetHost(nil) } // --- @@ -197,18 +188,6 @@ func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interfac // events // --- -func (manager *SessionManagerCtx) OnHost(listener func(session types.Session)) { - manager.emmiter.On("host", func(payload ...interface{}) { - listener(payload[0].(*SessionCtx)) - }) -} - -func (manager *SessionManagerCtx) OnHostCleared(listener func(session types.Session)) { - manager.emmiter.On("host_cleared", func(payload ...interface{}) { - listener(payload[0].(*SessionCtx)) - }) -} - func (manager *SessionManagerCtx) OnCreated(listener func(session types.Session)) { manager.emmiter.On("created", func(payload ...interface{}) { listener(payload[0].(*SessionCtx)) @@ -245,6 +224,16 @@ func (manager *SessionManagerCtx) OnStateChanged(listener func(session types.Ses }) } +func (manager *SessionManagerCtx) OnHostChanged(listener func(session types.Session)) { + manager.emmiter.On("host_changed", func(payload ...interface{}) { + if payload[0] == nil { + listener(nil) + } else { + listener(payload[0].(*SessionCtx)) + } + }) +} + // --- // config // --- diff --git a/internal/session/session.go b/internal/session/session.go index 0311cf6f..c58dfdbf 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -63,12 +63,6 @@ func (session *SessionCtx) GetProfile() types.MemberProfile { func (session *SessionCtx) profileChanged() { if !session.CanHost() && session.IsHost() { session.manager.ClearHost() - - session.manager.Broadcast( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: false, - }, nil) } if !session.CanWatch() && session.state.IsWatching { diff --git a/internal/types/session.go b/internal/types/session.go index 912bf760..54328f71 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -72,14 +72,13 @@ type SessionManager interface { Broadcast(v interface{}, exclude interface{}) AdminBroadcast(v interface{}, exclude interface{}) - OnHost(listener func(session Session)) - OnHostCleared(listener func(session Session)) OnCreated(listener func(session Session)) OnDeleted(listener func(session Session)) OnConnected(listener func(session Session)) OnDisconnected(listener func(session Session)) OnProfileChanged(listener func(session Session)) OnStateChanged(listener func(session Session)) + OnHostChanged(listener func(session Session)) ImplicitHosting() bool diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 69697c02..580098df 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -20,12 +20,6 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { h.desktop.ResetKeys() h.sessions.ClearHost() - h.sessions.Broadcast( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: false, - }, nil) - return nil } @@ -53,12 +47,6 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { } h.sessions.SetHost(session) - h.sessions.Broadcast( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: true, - HostID: session.ID(), - }, nil) return nil } diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 522b2908..6bad4854 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -47,12 +47,6 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { if session.IsHost() { h.desktop.ResetKeys() h.sessions.ClearHost() - - h.sessions.Broadcast( - message.ControlHost{ - Event: event.CONTROL_HOST, - HasHost: false, - }, nil) } return h.SessionStateChanged(session) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 613dd34e..4237e5e7 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -92,6 +92,19 @@ func (manager *WebSocketManagerCtx) Start() { } }) + manager.sessions.OnHostChanged(func(session types.Session) { + msg := message.ControlHost{ + Event: event.CONTROL_HOST, + HasHost: session != nil, + } + + if msg.HasHost { + msg.HostID = session.ID() + } + + manager.sessions.Broadcast(msg, nil) + }) + manager.desktop.OnClipboardUpdated(func() { session := manager.sessions.GetHost() if session == nil || !session.CanAccessClipboard() { From 93ac4e833227d69e065274eedc2e9ceea4f3ec41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 21:43:36 +0100 Subject: [PATCH 404/876] autogenerate token. --- internal/api/members/controler.go | 5 ++++- internal/api/session.go | 6 ++---- internal/session/manager.go | 8 ++++++-- internal/types/session.go | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 40cba097..a6ed8ca3 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -65,7 +65,10 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { } } - session, err := h.sessions.Create(data.ID, *data.MemberProfile) + // TODO: Refactor. + // data.ID + + session, err := h.sessions.Create(*data.MemberProfile) if err != nil { utils.HttpInternalServerError(w, err) return diff --git a/internal/api/session.go b/internal/api/session.go index d8792b12..446843d8 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -30,10 +30,8 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { return } - token := data.Secret - // TODO: Proper login. - session, err := api.sessions.Create(token, types.MemberProfile{ + session, err := api.sessions.Create(types.MemberProfile{ Name: data.ID, IsAdmin: true, CanLogin: true, @@ -55,7 +53,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { http.SetCookie(w, &http.Cookie{ Name: "NEKO_SESSION", - Value: token, + Value: session.ID(), Expires: CookieExpirationDate, Secure: !UnsecureCookies, SameSite: sameSite, diff --git a/internal/session/manager.go b/internal/session/manager.go index 2a4120b8..66ebf2eb 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -35,9 +35,13 @@ type SessionManagerCtx struct { emmiter events.EventEmmiter } -func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, error) { - manager.sessionsMu.Lock() +func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Session, error) { + id, err := utils.NewUID(32) + if err != nil { + return nil, err + } + manager.sessionsMu.Lock() _, ok := manager.sessions[id] if ok { manager.sessionsMu.Unlock() diff --git a/internal/types/session.go b/internal/types/session.go index 54328f71..bea5acef 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -59,7 +59,7 @@ type Session interface { } type SessionManager interface { - Create(id string, profile MemberProfile) (Session, error) + Create(profile MemberProfile) (Session, error) Update(id string, profile MemberProfile) error Get(id string) (Session, bool) Delete(id string) error From 453a6905f74e6ce9caca8080f2c3030e5fd29ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 21:44:38 +0100 Subject: [PATCH 405/876] fmt auth. --- internal/session/auth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/session/auth.go b/internal/session/auth.go index fe085318..3a46dd34 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -2,8 +2,8 @@ package session import ( "fmt" - "strings" "net/http" + "strings" "demodesk/neko/internal/types" ) From 3fcca6ab524083cc72b02808dc59c63272fae4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 22:17:49 +0100 Subject: [PATCH 406/876] OnHostChanged event and add tokens to session. --- internal/api/members/controler.go | 2 +- internal/api/session.go | 4 +-- internal/session/auth.go | 2 +- internal/session/manager.go | 41 ++++++++++++++++++++++++++----- internal/session/session.go | 1 + internal/types/session.go | 5 ++-- 6 files changed, 43 insertions(+), 12 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index a6ed8ca3..1a6d5a4f 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -68,7 +68,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { // TODO: Refactor. // data.ID - session, err := h.sessions.Create(*data.MemberProfile) + session, _, err := h.sessions.Create(*data.MemberProfile) if err != nil { utils.HttpInternalServerError(w, err) return diff --git a/internal/api/session.go b/internal/api/session.go index 446843d8..69761ba0 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -31,7 +31,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { } // TODO: Proper login. - session, err := api.sessions.Create(types.MemberProfile{ + session, token, err := api.sessions.Create(types.MemberProfile{ Name: data.ID, IsAdmin: true, CanLogin: true, @@ -53,7 +53,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { http.SetCookie(w, &http.Cookie{ Name: "NEKO_SESSION", - Value: session.ID(), + Value: token, Expires: CookieExpirationDate, Secure: !UnsecureCookies, SameSite: sameSite, diff --git a/internal/session/auth.go b/internal/session/auth.go index 3a46dd34..5eb23bdb 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -14,7 +14,7 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, return nil, fmt.Errorf("no authentication provided") } - session, ok := manager.Get(token) + session, ok := manager.GetByToken(token) if !ok { return nil, fmt.Errorf("session not found") } diff --git a/internal/session/manager.go b/internal/session/manager.go index 66ebf2eb..26f9ed1a 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -19,6 +19,7 @@ func New(config *config.Session) *SessionManagerCtx { config: config, host: nil, hostMu: sync.Mutex{}, + tokens: make(map[string]string), sessions: make(map[string]*SessionCtx), sessionsMu: sync.Mutex{}, emmiter: events.New(), @@ -30,36 +31,48 @@ type SessionManagerCtx struct { config *config.Session host types.Session hostMu sync.Mutex + tokens map[string]string sessions map[string]*SessionCtx sessionsMu sync.Mutex emmiter events.EventEmmiter } -func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Session, error) { +func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Session, string, error) { id, err := utils.NewUID(32) if err != nil { - return nil, err + return nil, "", err + } + + token, err := utils.NewUID(64) + if err != nil { + return nil, "", err } manager.sessionsMu.Lock() - _, ok := manager.sessions[id] - if ok { + if _, ok := manager.sessions[id]; ok { manager.sessionsMu.Unlock() - return nil, fmt.Errorf("Session id already exists.") + return nil, "", fmt.Errorf("Session id already exists.") + } + + if _, ok := manager.tokens[token]; ok { + manager.sessionsMu.Unlock() + return nil, "", fmt.Errorf("Session token already exists.") } session := &SessionCtx{ id: id, + token: token, manager: manager, logger: manager.logger.With().Str("id", id).Logger(), profile: profile, } + manager.tokens[token] = id manager.sessions[id] = session manager.sessionsMu.Unlock() manager.emmiter.Emit("created", session) - return session, nil + return session, token, nil } func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) error { @@ -87,6 +100,10 @@ func (manager *SessionManagerCtx) Delete(id string) error { return fmt.Errorf("Session id not found.") } + if _, ok := manager.tokens[session.token]; ok { + delete(manager.tokens, session.token) + } + delete(manager.sessions, id) manager.sessionsMu.Unlock() @@ -107,6 +124,18 @@ func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { return session, ok } +func (manager *SessionManagerCtx) GetByToken(token string) (types.Session, bool) { + manager.sessionsMu.Lock() + id, ok := manager.tokens[token] + manager.sessionsMu.Unlock() + + if !ok { + return nil, false + } + + return manager.Get(id) +} + func (manager *SessionManagerCtx) List() []types.Session { manager.sessionsMu.Lock() defer manager.sessionsMu.Unlock() diff --git a/internal/session/session.go b/internal/session/session.go index c58dfdbf..701b9d45 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -10,6 +10,7 @@ import ( type SessionCtx struct { id string + token string logger zerolog.Logger manager *SessionManagerCtx profile types.MemberProfile diff --git a/internal/types/session.go b/internal/types/session.go index bea5acef..443ed042 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -59,10 +59,11 @@ type Session interface { } type SessionManager interface { - Create(profile MemberProfile) (Session, error) + Create(profile MemberProfile) (Session, string, error) Update(id string, profile MemberProfile) error - Get(id string) (Session, bool) Delete(id string) error + Get(id string) (Session, bool) + GetByToken(token string) (Session, bool) List() []Session SetHost(host Session) From cacdd9e20a90169f7ecad6778a74f145df3d129c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 22:54:34 +0100 Subject: [PATCH 407/876] Revert 'autogenerate token.' --- internal/api/members/controler.go | 5 +---- internal/api/session.go | 2 +- internal/session/manager.go | 7 +------ internal/types/session.go | 4 ++-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 1a6d5a4f..73fcea0e 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -65,10 +65,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { } } - // TODO: Refactor. - // data.ID - - session, _, err := h.sessions.Create(*data.MemberProfile) + session, _, err := h.sessions.Create(data.ID, *data.MemberProfile) if err != nil { utils.HttpInternalServerError(w, err) return diff --git a/internal/api/session.go b/internal/api/session.go index 69761ba0..87f66d31 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -31,7 +31,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { } // TODO: Proper login. - session, token, err := api.sessions.Create(types.MemberProfile{ + session, token, err := api.sessions.Create(data.ID, types.MemberProfile{ Name: data.ID, IsAdmin: true, CanLogin: true, diff --git a/internal/session/manager.go b/internal/session/manager.go index 26f9ed1a..2a7c4a73 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -37,12 +37,7 @@ type SessionManagerCtx struct { emmiter events.EventEmmiter } -func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Session, string, error) { - id, err := utils.NewUID(32) - if err != nil { - return nil, "", err - } - +func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, string, error) { token, err := utils.NewUID(64) if err != nil { return nil, "", err diff --git a/internal/types/session.go b/internal/types/session.go index 443ed042..b60b3696 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -59,11 +59,11 @@ type Session interface { } type SessionManager interface { - Create(profile MemberProfile) (Session, string, error) + Create(id string, profile MemberProfile) (Session, string, error) Update(id string, profile MemberProfile) error Delete(id string) error Get(id string) (Session, bool) - GetByToken(token string) (Session, bool) + GetByToken(token string) (Session, bool) List() []Session SetHost(host Session) From d83e04e7ec78a4466dfc9f090f373ac3bd064d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 23:27:28 +0100 Subject: [PATCH 408/876] fix logs, unified session_id. --- internal/session/session.go | 2 +- internal/webrtc/manager.go | 2 +- internal/websocket/filechooserdialog.go | 18 ++++++--------- internal/websocket/handler/clipboard.go | 4 ++-- internal/websocket/handler/control.go | 8 +++---- internal/websocket/handler/keyboard.go | 4 ++-- internal/websocket/handler/send.go | 2 +- internal/websocket/handler/system.go | 5 +++-- internal/websocket/manager.go | 30 ++++++++++++------------- internal/websocket/peer.go | 2 +- 10 files changed, 37 insertions(+), 40 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 701b9d45..9847a4e0 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -84,7 +84,7 @@ func (session *SessionCtx) profileChanged() { // --- func (session *SessionCtx) IsHost() bool { - return session.manager.host != nil && session.manager.host.ID() == session.ID() + return session.manager.host != nil && session.manager.host == session } func (session *SessionCtx) IsConnected() bool { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 9f13902d..10a66706 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -107,7 +107,7 @@ func (manager *WebRTCManagerCtx) ICEServers() []string { } func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) { - logger := manager.logger.With().Str("id", session.ID()).Logger() + logger := manager.logger.With().Str("session_id", session.ID()).Logger() // Create MediaEngine engine, err := manager.mediaEngine(videoID) diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index c0c72e59..10465040 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -7,7 +7,7 @@ import ( ) func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { - var file_chooser_dialog_member types.Session + var activeSession types.Session // when dialog opens, everyone should be notified. manager.desktop.OnFileChooserDialogOpened(func() { @@ -20,7 +20,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { return } - file_chooser_dialog_member = host + activeSession = host go manager.sessions.Broadcast(message.MemberID{ Event: event.FILE_CHOOSER_DIALOG_OPENED, @@ -32,7 +32,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { manager.desktop.OnFileChooserDialogClosed(func() { manager.logger.Info().Msg("FileChooserDialog closed") - file_chooser_dialog_member = nil + activeSession = nil go manager.sessions.Broadcast(message.MemberID{ Event: event.FILE_CHOOSER_DIALOG_CLOSED, @@ -41,16 +41,16 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { // when new user joins, and someone holds dialog, he shouldd be notified about it. manager.sessions.OnConnected(func(session types.Session) { - if file_chooser_dialog_member == nil { + if activeSession == nil { return } if err := session.Send(message.MemberID{ Event: event.FILE_CHOOSER_DIALOG_OPENED, - ID: file_chooser_dialog_member.ID(), + ID: activeSession.ID(), }); err != nil { manager.logger.Warn(). - Str("id", session.ID()). + Str("session_id", session.ID()). Err(err). Msgf("could not send event `%s` to session", event.FILE_CHOOSER_DIALOG_OPENED) } @@ -58,11 +58,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { // when user, that holds dialog, disconnects, it should be closed. manager.sessions.OnDisconnected(func(session types.Session) { - if file_chooser_dialog_member == nil { - return - } - - if session.ID() != file_chooser_dialog_member.ID() { + if activeSession == nil || activeSession != session { return } diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 50ae6cfa..0cef78e4 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -7,12 +7,12 @@ import ( func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { if !session.CanAccessClipboard() { - h.logger.Debug().Str("id", session.ID()).Msg("cannot access clipboard") + h.logger.Debug().Str("session_id", session.ID()).Msg("cannot access clipboard") return nil } if !session.IsHost() { - h.logger.Debug().Str("id", session.ID()).Msg("is not the host") + h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host") return nil } diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 580098df..ec13d7f8 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -8,12 +8,12 @@ import ( func (h *MessageHandlerCtx) controlRelease(session types.Session) error { if !session.CanHost() { - h.logger.Debug().Str("id", session.ID()).Msg("is not allowed to host") + h.logger.Debug().Str("session_id", session.ID()).Msg("is not allowed to host") return nil } if !session.IsHost() { - h.logger.Debug().Str("id", session.ID()).Msg("is not the host") + h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host") return nil } @@ -25,12 +25,12 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { func (h *MessageHandlerCtx) controlRequest(session types.Session) error { if !session.CanHost() { - h.logger.Debug().Str("id", session.ID()).Msg("is not allowed to host") + h.logger.Debug().Str("session_id", session.ID()).Msg("is not allowed to host") return nil } if session.IsHost() { - h.logger.Debug().Str("id", session.ID()).Msg("is already the host") + h.logger.Debug().Str("session_id", session.ID()).Msg("is already the host") return nil } diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 85968d85..0e706333 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -7,7 +7,7 @@ import ( func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error { if !session.IsHost() { - h.logger.Debug().Str("id", session.ID()).Msg("is not the host") + h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host") return nil } @@ -19,7 +19,7 @@ func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message. func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *message.KeyboardModifiers) error { if !session.IsHost() { - h.logger.Debug().Str("id", session.ID()).Msg("is not the host") + h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host") return nil } diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index f30eabeb..4c6a1b7a 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -9,7 +9,7 @@ import ( func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error { receiver, ok := h.sessions.Get(payload.Receiver) if !ok { - h.logger.Debug().Str("id", session.ID()).Msg("receiver ID not found") + h.logger.Debug().Str("session_id", session.ID()).Msg("receiver session ID not found") return nil } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 9b244545..4a9d92d7 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -25,8 +25,9 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { members := map[string]message.MemberData{} for _, session := range h.sessions.List() { - members[session.ID()] = message.MemberData{ - ID: session.ID(), + memberId := session.ID() + members[memberId] = message.MemberData{ + ID: memberId, Profile: session.GetProfile(), State: session.GetState(), } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 4237e5e7..df7d46cd 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -46,49 +46,49 @@ type WebSocketManagerCtx struct { func (manager *WebSocketManagerCtx) Start() { manager.sessions.OnCreated(func(session types.Session) { if err := manager.handler.SessionCreated(session); err != nil { - manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with an error") + manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session created with an error") } else { - manager.logger.Debug().Str("id", session.ID()).Msg("session created") + manager.logger.Debug().Str("session_id", session.ID()).Msg("session created") } }) manager.sessions.OnDeleted(func(session types.Session) { if err := manager.handler.SessionDeleted(session); err != nil { - manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session deleted with an error") + manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session deleted with an error") } else { - manager.logger.Debug().Str("id", session.ID()).Msg("session deleted") + manager.logger.Debug().Str("session_id", session.ID()).Msg("session deleted") } }) manager.sessions.OnConnected(func(session types.Session) { if err := manager.handler.SessionConnected(session); err != nil { - manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with an error") + manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session connected with an error") } else { - manager.logger.Debug().Str("id", session.ID()).Msg("session connected") + manager.logger.Debug().Str("session_id", session.ID()).Msg("session connected") } }) manager.sessions.OnDisconnected(func(session types.Session) { if err := manager.handler.SessionDisconnected(session); err != nil { - manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session disconnected with an error") + manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session disconnected with an error") } else { - manager.logger.Debug().Str("id", session.ID()).Msg("session disconnected") + manager.logger.Debug().Str("session_id", session.ID()).Msg("session disconnected") } }) manager.sessions.OnProfileChanged(func(session types.Session) { if err := manager.handler.SessionProfileChanged(session); err != nil { - manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session profile changed with an error") + manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session profile changed with an error") } else { - manager.logger.Debug().Str("id", session.ID()).Msg("session profile changed") + manager.logger.Debug().Str("session_id", session.ID()).Msg("session profile changed") } }) manager.sessions.OnStateChanged(func(session types.Session) { if err := manager.handler.SessionStateChanged(session); err != nil { - manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session state changed with an error") + manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session state changed with an error") } else { - manager.logger.Debug().Str("id", session.ID()).Msg("session state changed") + manager.logger.Debug().Str("session_id", session.ID()).Msg("session state changed") } }) @@ -201,7 +201,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque manager.logger. Debug(). - Str("session", session.ID()). + Str("session_id", session.ID()). Str("address", connection.RemoteAddr().String()). Msg("connection started") @@ -210,7 +210,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque defer func() { manager.logger. Debug(). - Str("session", session.ID()). + Str("session_id", session.ID()). Str("address", connection.RemoteAddr().String()). Msg("connection ended") @@ -250,7 +250,7 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t select { case raw := <-bytes: manager.logger.Debug(). - Str("session", session.ID()). + Str("session_id", session.ID()). Str("address", connection.RemoteAddr().String()). Str("raw", string(raw)). Msg("received message from client") diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 7187f23b..3b13bd99 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -30,7 +30,7 @@ func (peer *WebSocketPeerCtx) Send(v interface{}) error { } peer.manager.logger.Debug(). - Str("session", peer.session.ID()). + Str("session_id", peer.session.ID()). Str("address", peer.connection.RemoteAddr().String()). Str("raw", string(raw)). Msg("sending message to client") From b03a730c84e93f1e88eb6cb7d8a4236878a4b67b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 23:32:10 +0100 Subject: [PATCH 409/876] memberId to sessionId. --- internal/api/room/control.go | 16 ++++++++-------- internal/websocket/handler/system.go | 9 ++++++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 7de66153..a5855747 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -42,7 +42,7 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if !session.CanHost() { - utils.HttpBadRequest(w, "Member is not allowed to host.") + utils.HttpBadRequest(w, "Session is not allowed to host.") return } @@ -54,12 +54,12 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if !session.IsHost() { - utils.HttpUnprocessableEntity(w, "Member is not the host.") + utils.HttpUnprocessableEntity(w, "Session is not the host.") return } if !session.CanHost() { - utils.HttpBadRequest(w, "Member is not allowed to host.") + utils.HttpBadRequest(w, "Session is not allowed to host.") return } @@ -72,7 +72,7 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if !session.CanHost() { - utils.HttpBadRequest(w, "Member is not allowed to host.") + utils.HttpBadRequest(w, "Session is not allowed to host.") return } @@ -82,16 +82,16 @@ func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { } func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { - memberId := chi.URLParam(r, "memberId") + sessionId := chi.URLParam(r, "sessionId") - target, ok := h.sessions.Get(memberId) + target, ok := h.sessions.Get(sessionId) if !ok { - utils.HttpNotFound(w, "Target member was not found.") + utils.HttpNotFound(w, "Target session was not found.") return } if !target.CanHost() { - utils.HttpBadRequest(w, "Target member is not allowed to host.") + utils.HttpBadRequest(w, "Target session is not allowed to host.") return } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 4a9d92d7..5f419ecb 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -23,11 +23,12 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return nil } + // TODO: Sessions. members := map[string]message.MemberData{} for _, session := range h.sessions.List() { - memberId := session.ID() - members[memberId] = message.MemberData{ - ID: memberId, + sessionId := session.ID() + members[sessionId] = message.MemberData{ + ID: sessionId, Profile: session.GetProfile(), State: session.GetState(), } @@ -36,6 +37,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return session.Send( message.SystemInit{ Event: event.SYSTEM_INIT, + // TODO: Session ID. MemberId: session.ID(), ControlHost: controlHost, ScreenSize: message.ScreenSize{ @@ -43,6 +45,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { Height: size.Height, Rate: size.Rate, }, + // TODO: Sessions. Members: members, ImplicitHosting: h.sessions.ImplicitHosting(), }) From dafebc79e53ef67be05ce027004a1c39c4dbfad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 23:42:16 +0100 Subject: [PATCH 410/876] memberState -> sessionState. --- internal/api/session.go | 2 +- internal/http/auth/auth.go | 4 ++-- internal/session/session.go | 4 ++-- internal/types/member.go | 11 +++++++++++ internal/types/message/messages.go | 6 +++--- internal/types/session.go | 14 ++------------ internal/websocket/handler/session.go | 8 ++++---- internal/websocket/handler/system.go | 2 +- 8 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 internal/types/member.go diff --git a/internal/api/session.go b/internal/api/session.go index 87f66d31..9fc5b001 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -21,7 +21,7 @@ type SessionLoginPayload struct { type SessionWhoamiPayload struct { ID string `json:"id"` Profile types.MemberProfile `json:"profile"` - State types.MemberState `json:"state"` + State types.SessionState `json:"state"` } func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index a8d627e7..3c6ac7e4 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -60,7 +60,7 @@ func CanHostOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.CanHost() { - utils.HttpForbidden(w, "Only for members, that can host.") + utils.HttpForbidden(w, "Only for sessions, that can host.") } else { next.ServeHTTP(w, r) } @@ -71,7 +71,7 @@ func CanWatchOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.CanWatch() { - utils.HttpForbidden(w, "Only for members, that can watch.") + utils.HttpForbidden(w, "Only for sessions, that can watch.") } else { next.ServeHTTP(w, r) } diff --git a/internal/session/session.go b/internal/session/session.go index 9847a4e0..9759d239 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -14,7 +14,7 @@ type SessionCtx struct { logger zerolog.Logger manager *SessionManagerCtx profile types.MemberProfile - state types.MemberState + state types.SessionState websocketPeer types.WebSocketPeer webrtcPeer types.WebRTCPeer } @@ -91,7 +91,7 @@ func (session *SessionCtx) IsConnected() bool { return session.state.IsConnected } -func (session *SessionCtx) GetState() types.MemberState { +func (session *SessionCtx) GetState() types.SessionState { return session.state } diff --git a/internal/types/member.go b/internal/types/member.go new file mode 100644 index 00000000..403d6c54 --- /dev/null +++ b/internal/types/member.go @@ -0,0 +1,11 @@ +package types + +type MembersDatabase interface { + Connect() error + Disconnect() error + + Insert(id string, profile MemberProfile) error + Update(id string, profile MemberProfile) error + Delete(id string) error + Select() (map[string]MemberProfile, error) +} diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 072a407a..4edfa7a7 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -78,17 +78,17 @@ type MemberProfile struct { *types.MemberProfile } -type MemberState struct { +type SessionState struct { Event string `json:"event,omitempty"` ID string `json:"id"` - *types.MemberState + *types.SessionState } type MemberData struct { Event string `json:"event,omitempty"` ID string `json:"id"` Profile types.MemberProfile `json:"profile"` - State types.MemberState `json:"state"` + State types.SessionState `json:"state"` } ///////////////////////////// diff --git a/internal/types/session.go b/internal/types/session.go index b60b3696..c1888cbc 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -13,21 +13,11 @@ type MemberProfile struct { CanAccessClipboard bool `json:"can_access_clipboard"` } -type MemberState struct { +type SessionState struct { IsConnected bool `json:"is_connected"` IsWatching bool `json:"is_watching"` } -type MembersDatabase interface { - Connect() error - Disconnect() error - - Insert(id string, profile MemberProfile) error - Update(id string, profile MemberProfile) error - Delete(id string) error - Select() (map[string]MemberProfile, error) -} - type Session interface { ID() string @@ -44,7 +34,7 @@ type Session interface { // state IsHost() bool IsConnected() bool - GetState() MemberState + GetState() SessionState // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 6bad4854..b4303248 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -69,10 +69,10 @@ func (h *MessageHandlerCtx) SessionStateChanged(session types.Session) error { state := session.GetState() h.sessions.Broadcast( - message.MemberState{ - Event: event.MEMBER_STATE, - ID: session.ID(), - MemberState: &state, + message.SessionState{ + Event: event.MEMBER_STATE, + ID: session.ID(), + SessionState: &state, }, nil) return nil diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 5f419ecb..f38e86e1 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -36,7 +36,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return session.Send( message.SystemInit{ - Event: event.SYSTEM_INIT, + Event: event.SYSTEM_INIT, // TODO: Session ID. MemberId: session.ID(), ControlHost: controlHost, From fa687480a911277409f856f5a40470d53f58fc51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 13 Mar 2021 23:48:07 +0100 Subject: [PATCH 411/876] member events -> session events. --- internal/types/event/events.go | 8 ++++---- internal/websocket/handler/session.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 173134d8..d6a74812 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -15,10 +15,10 @@ const ( ) const ( - MEMBER_CREATED = "member/created" - MEMBER_DELETED = "member/deleted" - MEMBER_PROFILE = "member/profile" - MEMBER_STATE = "member/state" + SESSION_CREATED = "session/created" + SESSION_DELETED = "session/deleted" + SESSION_PROFILE = "session/profile" + SESSION_STATE = "session/state" ) const ( diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index b4303248..6bb0a16f 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -9,7 +9,7 @@ import ( func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { h.sessions.Broadcast( message.MemberData{ - Event: event.MEMBER_CREATED, + Event: event.SESSION_CREATED, ID: session.ID(), Profile: session.GetProfile(), State: session.GetState(), @@ -21,7 +21,7 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { func (h *MessageHandlerCtx) SessionDeleted(session types.Session) error { h.sessions.Broadcast( message.MemberID{ - Event: event.MEMBER_DELETED, + Event: event.SESSION_DELETED, ID: session.ID(), }, nil) @@ -57,7 +57,7 @@ func (h *MessageHandlerCtx) SessionProfileChanged(session types.Session) error { h.sessions.Broadcast( message.MemberProfile{ - Event: event.MEMBER_PROFILE, + Event: event.SESSION_PROFILE, ID: session.ID(), MemberProfile: &profile, }, nil) @@ -70,7 +70,7 @@ func (h *MessageHandlerCtx) SessionStateChanged(session types.Session) error { h.sessions.Broadcast( message.SessionState{ - Event: event.MEMBER_STATE, + Event: event.SESSION_STATE, ID: session.ID(), SessionState: &state, }, nil) From fb2078e1ff4b22103a551948fdd7f49294f00042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 00:05:31 +0100 Subject: [PATCH 412/876] member -> session. --- internal/types/message/messages.go | 18 +++++++++--------- internal/websocket/filechooserdialog.go | 6 +++--- internal/websocket/handler/session.go | 4 ++-- internal/websocket/handler/system.go | 10 ++++------ 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 4edfa7a7..f6b6f112 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -16,12 +16,12 @@ type Message struct { ///////////////////////////// type SystemInit struct { - Event string `json:"event,omitempty"` - MemberId string `json:"member_id"` - ControlHost ControlHost `json:"control_host"` - ScreenSize ScreenSize `json:"screen_size"` - Members map[string]MemberData `json:"members"` - ImplicitHosting bool `json:"implicit_hosting"` + Event string `json:"event,omitempty"` + SessionId string `json:"session_id"` + ControlHost ControlHost `json:"control_host"` + ScreenSize ScreenSize `json:"screen_size"` + Sessions map[string]SessionData `json:"sessions"` + ImplicitHosting bool `json:"implicit_hosting"` } type SystemAdmin struct { @@ -64,10 +64,10 @@ type SignalVideo struct { } ///////////////////////////// -// Member +// Session ///////////////////////////// -type MemberID struct { +type SessionID struct { Event string `json:"event,omitempty"` ID string `json:"id"` } @@ -84,7 +84,7 @@ type SessionState struct { *types.SessionState } -type MemberData struct { +type SessionData struct { Event string `json:"event,omitempty"` ID string `json:"id"` Profile types.MemberProfile `json:"profile"` diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index 10465040..08bd0762 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -22,7 +22,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { activeSession = host - go manager.sessions.Broadcast(message.MemberID{ + go manager.sessions.Broadcast(message.SessionID{ Event: event.FILE_CHOOSER_DIALOG_OPENED, ID: host.ID(), }, nil) @@ -34,7 +34,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { activeSession = nil - go manager.sessions.Broadcast(message.MemberID{ + go manager.sessions.Broadcast(message.SessionID{ Event: event.FILE_CHOOSER_DIALOG_CLOSED, }, nil) }) @@ -45,7 +45,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { return } - if err := session.Send(message.MemberID{ + if err := session.Send(message.SessionID{ Event: event.FILE_CHOOSER_DIALOG_OPENED, ID: activeSession.ID(), }); err != nil { diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 6bb0a16f..fec66c55 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -8,7 +8,7 @@ import ( func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { h.sessions.Broadcast( - message.MemberData{ + message.SessionData{ Event: event.SESSION_CREATED, ID: session.ID(), Profile: session.GetProfile(), @@ -20,7 +20,7 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { func (h *MessageHandlerCtx) SessionDeleted(session types.Session) error { h.sessions.Broadcast( - message.MemberID{ + message.SessionID{ Event: event.SESSION_DELETED, ID: session.ID(), }, nil) diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index f38e86e1..ac3f71b1 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -24,10 +24,10 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { } // TODO: Sessions. - members := map[string]message.MemberData{} + sessions := map[string]message.SessionData{} for _, session := range h.sessions.List() { sessionId := session.ID() - members[sessionId] = message.MemberData{ + sessions[sessionId] = message.SessionData{ ID: sessionId, Profile: session.GetProfile(), State: session.GetState(), @@ -37,16 +37,14 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return session.Send( message.SystemInit{ Event: event.SYSTEM_INIT, - // TODO: Session ID. - MemberId: session.ID(), + SessionId: session.ID(), ControlHost: controlHost, ScreenSize: message.ScreenSize{ Width: size.Width, Height: size.Height, Rate: size.Rate, }, - // TODO: Sessions. - Members: members, + Sessions: sessions, ImplicitHosting: h.sessions.ImplicitHosting(), }) } From 5101f0a9c3427e8be1323355e1fb8a2ed35242dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 00:12:32 +0100 Subject: [PATCH 413/876] fix logs. --- internal/websocket/handler/screen.go | 2 +- internal/websocket/handler/system.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 7caf158a..cd69e1d7 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -8,7 +8,7 @@ import ( func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { if !session.IsAdmin() { - h.logger.Debug().Msg("member not admin") + h.logger.Debug().Str("session_id", session.ID()).Msg("is not the admin") return nil } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index ac3f71b1..14e4bc7a 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -19,7 +19,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { size := h.desktop.GetScreenSize() if size == nil { - h.logger.Debug().Msg("could not get screen size") + h.logger.Warn().Msg("could not get screen size") return nil } From 7d4f7694b99484d71ed2e737cc4f680f33eecd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 00:32:52 +0100 Subject: [PATCH 414/876] login username password. --- internal/api/members/controler.go | 5 ----- internal/api/session.go | 14 +++++++------- internal/session/session.go | 4 +--- internal/types/session.go | 1 - 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 73fcea0e..42371216 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -42,11 +42,6 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { return } - if data.Secret == "" { - utils.HttpBadRequest(w, "Secret cannot be empty.") - return - } - if data.Name == "" { utils.HttpBadRequest(w, "Name cannot be empty.") return diff --git a/internal/api/session.go b/internal/api/session.go index 9fc5b001..7526b838 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -14,11 +14,11 @@ var CookieExpirationDate = time.Now().Add(365 * 24 * time.Hour) var UnsecureCookies = os.Getenv("DISABLE_SECURE_COOKIES") == "true" type SessionLoginPayload struct { - ID string `json:"id"` - Secret string `json:"secret"` + Username string `json:"username"` + Password string `json:"password"` } -type SessionWhoamiPayload struct { +type SessionDataPayload struct { ID string `json:"id"` Profile types.MemberProfile `json:"profile"` State types.SessionState `json:"state"` @@ -31,8 +31,8 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { } // TODO: Proper login. - session, token, err := api.sessions.Create(data.ID, types.MemberProfile{ - Name: data.ID, + session, token, err := api.sessions.Create(data.Username, types.MemberProfile{ + Name: data.Username, IsAdmin: true, CanLogin: true, CanConnect: true, @@ -60,7 +60,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { HttpOnly: true, }) - utils.HttpSuccess(w, SessionWhoamiPayload{ + utils.HttpSuccess(w, SessionDataPayload{ ID: session.ID(), Profile: session.GetProfile(), State: session.GetState(), @@ -97,7 +97,7 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { func (api *ApiManagerCtx) Whoami(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) - utils.HttpSuccess(w, SessionWhoamiPayload{ + utils.HttpSuccess(w, SessionDataPayload{ ID: session.ID(), Profile: session.GetProfile(), State: session.GetState(), diff --git a/internal/session/session.go b/internal/session/session.go index 9759d239..b62b4949 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -56,9 +56,7 @@ func (session *SessionCtx) CanAccessClipboard() bool { } func (session *SessionCtx) GetProfile() types.MemberProfile { - profile := session.profile - profile.Secret = "" - return profile + return session.profile } func (session *SessionCtx) profileChanged() { diff --git a/internal/types/session.go b/internal/types/session.go index c1888cbc..f6b669af 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -3,7 +3,6 @@ package types import "net/http" type MemberProfile struct { - Secret string `json:"secret,omitempty"` Name string `json:"name"` IsAdmin bool `json:"is_admin"` CanLogin bool `json:"can_login"` From 4a28307c1e638f6dc36d8f468d8741df73812bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 00:45:51 +0100 Subject: [PATCH 415/876] session profile decoupled. --- internal/api/members/controler.go | 6 ++-- internal/api/room/control.go | 8 ++--- internal/api/room/handler.go | 2 +- internal/api/session.go | 8 ++--- internal/http/auth/auth.go | 8 ++--- internal/session/manager.go | 2 +- internal/session/session.go | 42 +++---------------------- internal/types/session.go | 13 ++------ internal/websocket/handler/clipboard.go | 2 +- internal/websocket/handler/control.go | 4 +-- internal/websocket/handler/screen.go | 2 +- internal/websocket/handler/session.go | 10 +++--- internal/websocket/handler/signal.go | 2 +- internal/websocket/handler/system.go | 4 +-- internal/websocket/manager.go | 4 +-- 15 files changed, 38 insertions(+), 79 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 42371216..579f0e3b 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -15,7 +15,7 @@ type MemberDataPayload struct { func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { members := []MemberDataPayload{} for _, session := range h.sessions.List() { - profile := session.GetProfile() + profile := session.Profile() members = append(members, MemberDataPayload{ ID: session.ID(), MemberProfile: &profile, @@ -73,14 +73,14 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - profile := member.GetProfile() + profile := member.Profile() utils.HttpSuccess(w, profile) } func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - profile := member.GetProfile() + profile := member.Profile() if !utils.HttpJsonRequest(w, r, &profile) { return diff --git a/internal/api/room/control.go b/internal/api/room/control.go index a5855747..6a7806bd 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -41,7 +41,7 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { } session := auth.GetSession(r) - if !session.CanHost() { + if !session.Profile().CanHost { utils.HttpBadRequest(w, "Session is not allowed to host.") return } @@ -58,7 +58,7 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { return } - if !session.CanHost() { + if !session.Profile().CanHost { utils.HttpBadRequest(w, "Session is not allowed to host.") return } @@ -71,7 +71,7 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) - if !session.CanHost() { + if !session.Profile().CanHost { utils.HttpBadRequest(w, "Session is not allowed to host.") return } @@ -90,7 +90,7 @@ func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { return } - if !target.CanHost() { + if !target.Profile().CanHost { utils.HttpBadRequest(w, "Target session is not allowed to host.") return } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 2aa3fe19..689000f6 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -89,7 +89,7 @@ func (h *RoomHandler) Route(r chi.Router) { func (h *RoomHandler) uploadMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) - if !session.IsHost() && (!session.CanHost() || !h.sessions.ImplicitHosting()) { + if !session.IsHost() && (!session.Profile().CanHost || !h.sessions.ImplicitHosting()) { utils.HttpForbidden(w, "Without implicit hosting, only host can upload files.") } else { next.ServeHTTP(w, r) diff --git a/internal/api/session.go b/internal/api/session.go index 7526b838..fce14a28 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -62,8 +62,8 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w, SessionDataPayload{ ID: session.ID(), - Profile: session.GetProfile(), - State: session.GetState(), + Profile: session.Profile(), + State: session.State(), }) } @@ -99,7 +99,7 @@ func (api *ApiManagerCtx) Whoami(w http.ResponseWriter, r *http.Request) { utils.HttpSuccess(w, SessionDataPayload{ ID: session.ID(), - Profile: session.GetProfile(), - State: session.GetState(), + Profile: session.Profile(), + State: session.State(), }) } diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index 3c6ac7e4..bfb79fea 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -26,7 +26,7 @@ func GetSession(r *http.Request) types.Session { func AdminsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) - if !session.IsAdmin() { + if !session.Profile().IsAdmin { utils.HttpForbidden(w) } else { next.ServeHTTP(w, r) @@ -48,7 +48,7 @@ func HostsOnly(next http.Handler) http.Handler { func HostsOrAdminsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) - if !session.IsHost() && !session.IsAdmin() { + if !session.IsHost() && !session.Profile().IsAdmin { utils.HttpForbidden(w, "Only host can do this.") } else { next.ServeHTTP(w, r) @@ -59,7 +59,7 @@ func HostsOrAdminsOnly(next http.Handler) http.Handler { func CanHostOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) - if !session.CanHost() { + if !session.Profile().CanHost { utils.HttpForbidden(w, "Only for sessions, that can host.") } else { next.ServeHTTP(w, r) @@ -70,7 +70,7 @@ func CanHostOnly(next http.Handler) http.Handler { func CanWatchOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) - if !session.CanWatch() { + if !session.Profile().CanWatch { utils.HttpForbidden(w, "Only for sessions, that can watch.") } else { next.ServeHTTP(w, r) diff --git a/internal/session/manager.go b/internal/session/manager.go index 2a7c4a73..fddda4f1 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -196,7 +196,7 @@ func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interfac defer manager.sessionsMu.Unlock() for id, session := range manager.sessions { - if !session.IsConnected() || !session.IsAdmin() { + if !session.IsConnected() || !session.Profile().IsAdmin { continue } diff --git a/internal/session/session.go b/internal/session/session.go index b62b4949..603ad379 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -23,54 +23,22 @@ func (session *SessionCtx) ID() string { return session.id } -// --- -// profile -// --- - -func (session *SessionCtx) Name() string { - return session.profile.Name -} - -func (session *SessionCtx) IsAdmin() bool { - return session.profile.IsAdmin -} - -func (session *SessionCtx) CanLogin() bool { - return session.profile.CanLogin -} - -func (session *SessionCtx) CanConnect() bool { - return session.profile.CanConnect -} - -func (session *SessionCtx) CanWatch() bool { - return session.profile.CanWatch -} - -func (session *SessionCtx) CanHost() bool { - return session.profile.CanHost -} - -func (session *SessionCtx) CanAccessClipboard() bool { - return session.profile.CanAccessClipboard -} - -func (session *SessionCtx) GetProfile() types.MemberProfile { +func (session *SessionCtx) Profile() types.MemberProfile { return session.profile } func (session *SessionCtx) profileChanged() { - if !session.CanHost() && session.IsHost() { + if !session.profile.CanHost && session.IsHost() { session.manager.ClearHost() } - if !session.CanWatch() && session.state.IsWatching { + if !session.profile.CanWatch && session.state.IsWatching { if err := session.webrtcPeer.Destroy(); err != nil { session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") } } - if (!session.CanConnect() || !session.CanLogin()) && session.state.IsConnected { + if (!session.profile.CanConnect || !session.profile.CanLogin) && session.state.IsConnected { if err := session.Disconnect("profile changed"); err != nil { session.logger.Warn().Err(err).Msgf("websocket destroy has failed") } @@ -89,7 +57,7 @@ func (session *SessionCtx) IsConnected() bool { return session.state.IsConnected } -func (session *SessionCtx) GetState() types.SessionState { +func (session *SessionCtx) State() types.SessionState { return session.state } diff --git a/internal/types/session.go b/internal/types/session.go index f6b669af..73c2716f 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -19,21 +19,12 @@ type SessionState struct { type Session interface { ID() string - - // profile - Name() string - IsAdmin() bool - CanLogin() bool - CanConnect() bool - CanWatch() bool - CanHost() bool - CanAccessClipboard() bool - GetProfile() MemberProfile + Profile() MemberProfile // state IsHost() bool IsConnected() bool - GetState() SessionState + State() SessionState // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 0cef78e4..62a1d79c 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -6,7 +6,7 @@ import ( ) func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { - if !session.CanAccessClipboard() { + if !session.Profile().CanAccessClipboard { h.logger.Debug().Str("session_id", session.ID()).Msg("cannot access clipboard") return nil } diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index ec13d7f8..ac348464 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -7,7 +7,7 @@ import ( ) func (h *MessageHandlerCtx) controlRelease(session types.Session) error { - if !session.CanHost() { + if !session.Profile().CanHost { h.logger.Debug().Str("session_id", session.ID()).Msg("is not allowed to host") return nil } @@ -24,7 +24,7 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { } func (h *MessageHandlerCtx) controlRequest(session types.Session) error { - if !session.CanHost() { + if !session.Profile().CanHost { h.logger.Debug().Str("session_id", session.ID()).Msg("is not allowed to host") return nil } diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index cd69e1d7..a88b6c06 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -7,7 +7,7 @@ import ( ) func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { - if !session.IsAdmin() { + if !session.Profile().IsAdmin { h.logger.Debug().Str("session_id", session.ID()).Msg("is not the admin") return nil } diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index fec66c55..f50d69f5 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -11,8 +11,8 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { message.SessionData{ Event: event.SESSION_CREATED, ID: session.ID(), - Profile: session.GetProfile(), - State: session.GetState(), + Profile: session.Profile(), + State: session.State(), }, nil) return nil @@ -33,7 +33,7 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error { return err } - if session.IsAdmin() { + if session.Profile().IsAdmin { if err := h.systemAdmin(session); err != nil { return err } @@ -53,7 +53,7 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { } func (h *MessageHandlerCtx) SessionProfileChanged(session types.Session) error { - profile := session.GetProfile() + profile := session.Profile() h.sessions.Broadcast( message.MemberProfile{ @@ -66,7 +66,7 @@ func (h *MessageHandlerCtx) SessionProfileChanged(session types.Session) error { } func (h *MessageHandlerCtx) SessionStateChanged(session types.Session) error { - state := session.GetState() + state := session.State() h.sessions.Broadcast( message.SessionState{ diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index cfc31113..22bc8786 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -7,7 +7,7 @@ import ( ) func (h *MessageHandlerCtx) signalRequest(session types.Session) error { - if !session.CanWatch() { + if !session.Profile().CanWatch { return nil } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 14e4bc7a..8752e607 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -29,8 +29,8 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { sessionId := session.ID() sessions[sessionId] = message.SessionData{ ID: sessionId, - Profile: session.GetProfile(), - State: session.GetState(), + Profile: session.Profile(), + State: session.State(), } } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index df7d46cd..ab023f14 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -107,7 +107,7 @@ func (manager *WebSocketManagerCtx) Start() { manager.desktop.OnClipboardUpdated(func() { session := manager.sessions.GetHost() - if session == nil || !session.CanAccessClipboard() { + if session == nil || !session.Profile().CanAccessClipboard { return } @@ -167,7 +167,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque return connection.Close() } - if !session.CanConnect() { + if !session.Profile().CanConnect { // TODO: Refactor, return error code. if err = connection.WriteJSON( message.SystemDisconnect{ From ecad2124fdf2d4a89d89fc4569cb20490051fca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 00:50:08 +0100 Subject: [PATCH 416/876] session state decoupled. --- internal/session/manager.go | 6 +++--- internal/session/session.go | 14 +++----------- internal/types/session.go | 5 +---- internal/websocket/manager.go | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index fddda4f1..eeacce0f 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -103,7 +103,7 @@ func (manager *SessionManagerCtx) Delete(id string) error { manager.sessionsMu.Unlock() var err error - if session.IsConnected() { + if session.State().IsConnected { err = session.Disconnect("session deleted") } @@ -175,7 +175,7 @@ func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) defer manager.sessionsMu.Unlock() for id, session := range manager.sessions { - if !session.IsConnected() { + if !session.State().IsConnected { continue } @@ -196,7 +196,7 @@ func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interfac defer manager.sessionsMu.Unlock() for id, session := range manager.sessions { - if !session.IsConnected() || !session.Profile().IsAdmin { + if !session.State().IsConnected || !session.Profile().IsAdmin { continue } diff --git a/internal/session/session.go b/internal/session/session.go index 603ad379..c382182c 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -45,22 +45,14 @@ func (session *SessionCtx) profileChanged() { } } -// --- -// state -// --- +func (session *SessionCtx) State() types.SessionState { + return session.state +} func (session *SessionCtx) IsHost() bool { return session.manager.host != nil && session.manager.host == session } -func (session *SessionCtx) IsConnected() bool { - return session.state.IsConnected -} - -func (session *SessionCtx) State() types.SessionState { - return session.state -} - // --- // webscoket // --- diff --git a/internal/types/session.go b/internal/types/session.go index 73c2716f..dc517b6c 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -20,11 +20,8 @@ type SessionState struct { type Session interface { ID() string Profile() MemberProfile - - // state - IsHost() bool - IsConnected() bool State() SessionState + IsHost() bool // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index ab023f14..f8a95e58 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -180,7 +180,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque return connection.Close() } - if session.IsConnected() { + if session.State().IsConnected { // TODO: Refactor, return error code. if err = connection.WriteJSON( message.SystemDisconnect{ From 594404824f0523f165b7316315ef712d6689b498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 01:05:00 +0100 Subject: [PATCH 417/876] fmt. --- internal/websocket/handler/system.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 8752e607..e9849c07 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -36,7 +36,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return session.Send( message.SystemInit{ - Event: event.SYSTEM_INIT, + Event: event.SYSTEM_INIT, SessionId: session.ID(), ControlHost: controlHost, ScreenSize: message.ScreenSize{ From 7c79b4875013cf7434e2c2eb448569cb026b9843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 01:08:50 +0100 Subject: [PATCH 418/876] added member provider. --- cmd/serve.go | 1 + internal/config/member.go | 44 +++++++++++++++++++ internal/member/database/dummy/adapter.go | 35 --------------- internal/member/database/manager.go | 22 ---------- internal/member/dummy/adapter.go | 35 +++++++++++++++ .../member/{database => }/file/adapter.go | 22 +++++----- internal/member/manager.go | 22 ++++++++++ .../member/{database => }/object/adapter.go | 18 ++++---- internal/types/member.go | 2 +- neko.go | 18 ++++++++ 10 files changed, 141 insertions(+), 78 deletions(-) create mode 100644 internal/config/member.go delete mode 100644 internal/member/database/dummy/adapter.go delete mode 100644 internal/member/database/manager.go create mode 100644 internal/member/dummy/adapter.go rename internal/member/{database => }/file/adapter.go (69%) create mode 100644 internal/member/manager.go rename internal/member/{database => }/object/adapter.go (62%) diff --git a/cmd/serve.go b/cmd/serve.go index 95ab608b..d1cc3c6e 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -21,6 +21,7 @@ func init() { neko.Service.Configs.Desktop, neko.Service.Configs.Capture, neko.Service.Configs.WebRTC, + neko.Service.Configs.Member, neko.Service.Configs.Session, neko.Service.Configs.Server, }, modules.Configs()...) diff --git a/internal/config/member.go b/internal/config/member.go new file mode 100644 index 00000000..8fe03cb8 --- /dev/null +++ b/internal/config/member.go @@ -0,0 +1,44 @@ +package config + +import ( + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +type Member struct { + Provider string + FilePath string + Password string + AdminPassword string +} + +func (Member) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().String("members_provider", "file", "choose members provider") + if err := viper.BindPFlag("members_provider", cmd.PersistentFlags().Lookup("members_provider")); err != nil { + return err + } + + cmd.PersistentFlags().String("members_file_path", "/home/neko/members.json", "mebmer file provider path") + if err := viper.BindPFlag("members_file_path", cmd.PersistentFlags().Lookup("members_file_path")); err != nil { + return err + } + + cmd.PersistentFlags().String("password", "neko", "password for connecting to stream") + if err := viper.BindPFlag("password", cmd.PersistentFlags().Lookup("password")); err != nil { + return err + } + + cmd.PersistentFlags().String("password_admin", "admin", "admin password for connecting to stream") + if err := viper.BindPFlag("password_admin", cmd.PersistentFlags().Lookup("password_admin")); err != nil { + return err + } + + return nil +} + +func (s *Member) Set() { + s.Provider = viper.GetString("members_provider") + s.FilePath = viper.GetString("members_file_path") + s.Password = viper.GetString("password") + s.AdminPassword = viper.GetString("password_admin") +} diff --git a/internal/member/database/dummy/adapter.go b/internal/member/database/dummy/adapter.go deleted file mode 100644 index 5155d213..00000000 --- a/internal/member/database/dummy/adapter.go +++ /dev/null @@ -1,35 +0,0 @@ -package dummy - -import ( - "demodesk/neko/internal/types" -) - -func New() types.MembersDatabase { - return &MembersDatabaseCtx{} -} - -type MembersDatabaseCtx struct{} - -func (manager *MembersDatabaseCtx) Connect() error { - return nil -} - -func (manager *MembersDatabaseCtx) Disconnect() error { - return nil -} - -func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { - return nil -} - -func (manager *MembersDatabaseCtx) Update(id string, profile types.MemberProfile) error { - return nil -} - -func (manager *MembersDatabaseCtx) Delete(id string) error { - return nil -} - -func (manager *MembersDatabaseCtx) Select() (map[string]types.MemberProfile, error) { - return map[string]types.MemberProfile{}, nil -} diff --git a/internal/member/database/manager.go b/internal/member/database/manager.go deleted file mode 100644 index a1c7bc5a..00000000 --- a/internal/member/database/manager.go +++ /dev/null @@ -1,22 +0,0 @@ -package database - -import ( - "demodesk/neko/internal/config" - "demodesk/neko/internal/session/database/dummy" - "demodesk/neko/internal/session/database/file" - "demodesk/neko/internal/session/database/object" - "demodesk/neko/internal/types" -) - -func New(config *config.Session) types.MembersDatabase { - switch config.DatabaseAdapter { - case "file": - return file.New(config.FilePath) - case "object": - return object.New() - case "dummy": - return dummy.New() - } - - return dummy.New() -} diff --git a/internal/member/dummy/adapter.go b/internal/member/dummy/adapter.go new file mode 100644 index 00000000..b4888048 --- /dev/null +++ b/internal/member/dummy/adapter.go @@ -0,0 +1,35 @@ +package dummy + +import ( + "demodesk/neko/internal/types" +) + +func New() types.MemberManager { + return &MemberManagerCtx{} +} + +type MemberManagerCtx struct{} + +func (manager *MemberManagerCtx) Connect() error { + return nil +} + +func (manager *MemberManagerCtx) Disconnect() error { + return nil +} + +func (manager *MemberManagerCtx) Insert(id string, profile types.MemberProfile) error { + return nil +} + +func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { + return nil +} + +func (manager *MemberManagerCtx) Delete(id string) error { + return nil +} + +func (manager *MemberManagerCtx) Select() (map[string]types.MemberProfile, error) { + return map[string]types.MemberProfile{}, nil +} diff --git a/internal/member/database/file/adapter.go b/internal/member/file/adapter.go similarity index 69% rename from internal/member/database/file/adapter.go rename to internal/member/file/adapter.go index 0508d4ed..6218f445 100644 --- a/internal/member/database/file/adapter.go +++ b/internal/member/file/adapter.go @@ -10,27 +10,27 @@ import ( "demodesk/neko/internal/types" ) -func New(file string) types.MembersDatabase { - return &MembersDatabaseCtx{ +func New(file string) types.MemberManager { + return &MemberManagerCtx{ file: file, mu: sync.Mutex{}, } } -type MembersDatabaseCtx struct { +type MemberManagerCtx struct { file string mu sync.Mutex } -func (manager *MembersDatabaseCtx) Connect() error { +func (manager *MemberManagerCtx) Connect() error { return nil } -func (manager *MembersDatabaseCtx) Disconnect() error { +func (manager *MemberManagerCtx) Disconnect() error { return nil } -func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { +func (manager *MemberManagerCtx) Insert(id string, profile types.MemberProfile) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -49,7 +49,7 @@ func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile return manager.serialize(profiles) } -func (manager *MembersDatabaseCtx) Update(id string, profile types.MemberProfile) error { +func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -68,7 +68,7 @@ func (manager *MembersDatabaseCtx) Update(id string, profile types.MemberProfile return manager.serialize(profiles) } -func (manager *MembersDatabaseCtx) Delete(id string) error { +func (manager *MemberManagerCtx) Delete(id string) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -87,7 +87,7 @@ func (manager *MembersDatabaseCtx) Delete(id string) error { return manager.serialize(profiles) } -func (manager *MembersDatabaseCtx) Select() (map[string]types.MemberProfile, error) { +func (manager *MemberManagerCtx) Select() (map[string]types.MemberProfile, error) { manager.mu.Lock() defer manager.mu.Unlock() @@ -95,7 +95,7 @@ func (manager *MembersDatabaseCtx) Select() (map[string]types.MemberProfile, err return profiles, err } -func (manager *MembersDatabaseCtx) deserialize() (map[string]types.MemberProfile, error) { +func (manager *MemberManagerCtx) deserialize() (map[string]types.MemberProfile, error) { file, err := os.OpenFile(manager.file, os.O_RDONLY|os.O_CREATE, os.ModePerm) if err != nil { return nil, err @@ -118,7 +118,7 @@ func (manager *MembersDatabaseCtx) deserialize() (map[string]types.MemberProfile return profiles, nil } -func (manager *MembersDatabaseCtx) serialize(data map[string]types.MemberProfile) error { +func (manager *MemberManagerCtx) serialize(data map[string]types.MemberProfile) error { raw, err := json.Marshal(data) if err != nil { return err diff --git a/internal/member/manager.go b/internal/member/manager.go new file mode 100644 index 00000000..0722dc0d --- /dev/null +++ b/internal/member/manager.go @@ -0,0 +1,22 @@ +package member + +import ( + "demodesk/neko/internal/config" + "demodesk/neko/internal/member/dummy" + "demodesk/neko/internal/member/file" + "demodesk/neko/internal/member/object" + "demodesk/neko/internal/types" +) + +func New(config *config.Member) types.MemberManager { + switch config.Provider { + case "file": + return file.New(config.FilePath) + case "object": + return object.New() + case "dummy": + return dummy.New() + } + + return dummy.New() +} diff --git a/internal/member/database/object/adapter.go b/internal/member/object/adapter.go similarity index 62% rename from internal/member/database/object/adapter.go rename to internal/member/object/adapter.go index 18c05c32..412ea012 100644 --- a/internal/member/database/object/adapter.go +++ b/internal/member/object/adapter.go @@ -7,27 +7,27 @@ import ( "demodesk/neko/internal/types" ) -func New() types.MembersDatabase { - return &MembersDatabaseCtx{ +func New() types.MemberManager { + return &MemberManagerCtx{ profiles: make(map[string]types.MemberProfile), mu: sync.Mutex{}, } } -type MembersDatabaseCtx struct { +type MemberManagerCtx struct { profiles map[string]types.MemberProfile mu sync.Mutex } -func (manager *MembersDatabaseCtx) Connect() error { +func (manager *MemberManagerCtx) Connect() error { return nil } -func (manager *MembersDatabaseCtx) Disconnect() error { +func (manager *MemberManagerCtx) Disconnect() error { return nil } -func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile) error { +func (manager *MemberManagerCtx) Insert(id string, profile types.MemberProfile) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -40,7 +40,7 @@ func (manager *MembersDatabaseCtx) Insert(id string, profile types.MemberProfile return nil } -func (manager *MembersDatabaseCtx) Update(id string, profile types.MemberProfile) error { +func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -53,7 +53,7 @@ func (manager *MembersDatabaseCtx) Update(id string, profile types.MemberProfile return nil } -func (manager *MembersDatabaseCtx) Delete(id string) error { +func (manager *MemberManagerCtx) Delete(id string) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -66,7 +66,7 @@ func (manager *MembersDatabaseCtx) Delete(id string) error { return nil } -func (manager *MembersDatabaseCtx) Select() (map[string]types.MemberProfile, error) { +func (manager *MemberManagerCtx) Select() (map[string]types.MemberProfile, error) { manager.mu.Lock() defer manager.mu.Unlock() diff --git a/internal/types/member.go b/internal/types/member.go index 403d6c54..90e4e196 100644 --- a/internal/types/member.go +++ b/internal/types/member.go @@ -1,6 +1,6 @@ package types -type MembersDatabase interface { +type MemberManager interface { Connect() error Disconnect() error diff --git a/neko.go b/neko.go index 7b912471..1dd41749 100644 --- a/neko.go +++ b/neko.go @@ -11,7 +11,9 @@ import ( "demodesk/neko/internal/config" "demodesk/neko/internal/desktop" "demodesk/neko/internal/http" + "demodesk/neko/internal/member" "demodesk/neko/internal/session" + "demodesk/neko/internal/types" "demodesk/neko/internal/webrtc" "demodesk/neko/internal/websocket" "demodesk/neko/modules" @@ -66,6 +68,7 @@ func init() { Desktop: &config.Desktop{}, Capture: &config.Capture{}, WebRTC: &config.WebRTC{}, + Member: &config.Member{}, Session: &config.Session{}, Server: &config.Server{}, }, @@ -106,6 +109,7 @@ type Configs struct { Desktop *config.Desktop Capture *config.Capture WebRTC *config.WebRTC + Member *config.Member Session *config.Session Server *config.Server } @@ -118,6 +122,7 @@ type Neko struct { desktopManager *desktop.DesktopManagerCtx captureManager *capture.CaptureManagerCtx webRTCManager *webrtc.WebRTCManagerCtx + memberManager types.MemberManager sessionManager *session.SessionManagerCtx webSocketManager *websocket.WebSocketManagerCtx apiManager *api.ApiManagerCtx @@ -129,6 +134,13 @@ func (neko *Neko) Preflight() { } func (neko *Neko) Start() { + neko.memberManager = member.New( + neko.Configs.Member, + ) + if err := neko.memberManager.Connect(); err != nil { + neko.logger.Panic().Err(err).Msg("unable to connect to member manager") + } + neko.sessionManager = session.New( neko.Configs.Session, ) @@ -181,6 +193,12 @@ func (neko *Neko) Start() { } func (neko *Neko) Shutdown() { + if err := neko.memberManager.Disconnect(); err != nil { + neko.logger.Err(err).Msg("member manager disconnect with an error") + } else { + neko.logger.Debug().Msg("member manager disconnect") + } + if err := neko.desktopManager.Shutdown(); err != nil { neko.logger.Err(err).Msg("desktop manager shutdown with an error") } else { From bf560d5289c234f2b8e3b22f76bdbf26b1d75c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 12:57:19 +0100 Subject: [PATCH 419/876] implemented member manager. --- internal/member/dummy/adapter.go | 35 ----- internal/member/dummy/manager.go | 47 +++++++ internal/member/file/adapter.go | 128 ----------------- internal/member/file/manager.go | 223 ++++++++++++++++++++++++++++++ internal/member/object/adapter.go | 74 ---------- internal/member/object/manager.go | 149 ++++++++++++++++++++ internal/types/member.go | 18 ++- internal/types/session.go | 10 -- 8 files changed, 435 insertions(+), 249 deletions(-) delete mode 100644 internal/member/dummy/adapter.go create mode 100644 internal/member/dummy/manager.go delete mode 100644 internal/member/file/adapter.go create mode 100644 internal/member/file/manager.go delete mode 100644 internal/member/object/adapter.go create mode 100644 internal/member/object/manager.go diff --git a/internal/member/dummy/adapter.go b/internal/member/dummy/adapter.go deleted file mode 100644 index b4888048..00000000 --- a/internal/member/dummy/adapter.go +++ /dev/null @@ -1,35 +0,0 @@ -package dummy - -import ( - "demodesk/neko/internal/types" -) - -func New() types.MemberManager { - return &MemberManagerCtx{} -} - -type MemberManagerCtx struct{} - -func (manager *MemberManagerCtx) Connect() error { - return nil -} - -func (manager *MemberManagerCtx) Disconnect() error { - return nil -} - -func (manager *MemberManagerCtx) Insert(id string, profile types.MemberProfile) error { - return nil -} - -func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { - return nil -} - -func (manager *MemberManagerCtx) Delete(id string) error { - return nil -} - -func (manager *MemberManagerCtx) Select() (map[string]types.MemberProfile, error) { - return map[string]types.MemberProfile{}, nil -} diff --git a/internal/member/dummy/manager.go b/internal/member/dummy/manager.go new file mode 100644 index 00000000..3ef7d123 --- /dev/null +++ b/internal/member/dummy/manager.go @@ -0,0 +1,47 @@ +package dummy + +import ( + "demodesk/neko/internal/types" +) + +func New() types.MemberManager { + return &MemberManagerCtx{} +} + +type MemberManagerCtx struct{} + +func (manager *MemberManagerCtx) Connect() error { + return nil +} + +func (manager *MemberManagerCtx) Disconnect() error { + return nil +} + +func (manager *MemberManagerCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { + return username, types.MemberProfile{}, nil +} + +func (manager *MemberManagerCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { + return "", nil +} + +func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) { + return types.MemberProfile{}, nil +} + +func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { + return map[string]types.MemberProfile{}, nil +} + +func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { + return nil +} + +func (manager *MemberManagerCtx) UpdatePassword(id string, passwrod string) error { + return nil +} + +func (manager *MemberManagerCtx) Delete(id string) error { + return nil +} diff --git a/internal/member/file/adapter.go b/internal/member/file/adapter.go deleted file mode 100644 index 6218f445..00000000 --- a/internal/member/file/adapter.go +++ /dev/null @@ -1,128 +0,0 @@ -package file - -import ( - "encoding/json" - "fmt" - "io/ioutil" - "os" - "sync" - - "demodesk/neko/internal/types" -) - -func New(file string) types.MemberManager { - return &MemberManagerCtx{ - file: file, - mu: sync.Mutex{}, - } -} - -type MemberManagerCtx struct { - file string - mu sync.Mutex -} - -func (manager *MemberManagerCtx) Connect() error { - return nil -} - -func (manager *MemberManagerCtx) Disconnect() error { - return nil -} - -func (manager *MemberManagerCtx) Insert(id string, profile types.MemberProfile) error { - manager.mu.Lock() - defer manager.mu.Unlock() - - profiles, err := manager.deserialize() - if err != nil { - return err - } - - _, ok := profiles[id] - if ok { - return fmt.Errorf("Member ID already exists.") - } - - profiles[id] = profile - - return manager.serialize(profiles) -} - -func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { - manager.mu.Lock() - defer manager.mu.Unlock() - - profiles, err := manager.deserialize() - if err != nil { - return err - } - - _, ok := profiles[id] - if !ok { - return fmt.Errorf("Member ID does not exist.") - } - - profiles[id] = profile - - return manager.serialize(profiles) -} - -func (manager *MemberManagerCtx) Delete(id string) error { - manager.mu.Lock() - defer manager.mu.Unlock() - - profiles, err := manager.deserialize() - if err != nil { - return err - } - - _, ok := profiles[id] - if !ok { - return fmt.Errorf("Member ID does not exist.") - } - - delete(profiles, id) - - return manager.serialize(profiles) -} - -func (manager *MemberManagerCtx) Select() (map[string]types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() - - profiles, err := manager.deserialize() - return profiles, err -} - -func (manager *MemberManagerCtx) deserialize() (map[string]types.MemberProfile, error) { - file, err := os.OpenFile(manager.file, os.O_RDONLY|os.O_CREATE, os.ModePerm) - if err != nil { - return nil, err - } - - raw, err := ioutil.ReadAll(file) - if err != nil { - return nil, err - } - - if len(raw) == 0 { - return map[string]types.MemberProfile{}, nil - } - - var profiles map[string]types.MemberProfile - if err := json.Unmarshal([]byte(raw), &profiles); err != nil { - return nil, err - } - - return profiles, nil -} - -func (manager *MemberManagerCtx) serialize(data map[string]types.MemberProfile) error { - raw, err := json.Marshal(data) - if err != nil { - return err - } - - return ioutil.WriteFile(manager.file, raw, os.ModePerm) -} diff --git a/internal/member/file/manager.go b/internal/member/file/manager.go new file mode 100644 index 00000000..c570b676 --- /dev/null +++ b/internal/member/file/manager.go @@ -0,0 +1,223 @@ +package file + +import ( + "encoding/json" + "fmt" + "io/ioutil" + "os" + "sync" + + "demodesk/neko/internal/types" +) + +func New(file string) types.MemberManager { + return &MemberManagerCtx{ + file: file, + mu: sync.Mutex{}, + } +} + +type MemberManagerCtx struct { + file string + mu sync.Mutex +} + +type MemberEntry struct { + Password string `json:"password"` + Profile types.MemberProfile `json:"profile"` +} + +func (manager *MemberManagerCtx) Connect() error { + return nil +} + +func (manager *MemberManagerCtx) Disconnect() error { + return nil +} + +func (manager *MemberManagerCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + + // id will be also username + id := username + + entry, err := manager.getEntry(id) + if err != nil { + return "", types.MemberProfile{}, err + } + + // TODO: Use hash function. + if entry.Password != password { + return "", types.MemberProfile{}, fmt.Errorf("Invalid password.") + } + + return id, entry.Profile, nil +} + +func (manager *MemberManagerCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + + // id will be also username + id := username + + entries, err := manager.deserialize() + if err != nil { + return "", err + } + + entry, ok := entries[id] + if ok { + return "", fmt.Errorf("Member ID already exists.") + } + + // TODO: Use hash function. + entry.Password = password + entry.Profile = profile + entries[id] = entry + + return id, manager.serialize(entries) +} + +func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + entries, err := manager.deserialize() + if err != nil { + return err + } + + entry, ok := entries[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + entry.Profile = profile + entries[id] = entry + + return manager.serialize(entries) +} + +func (manager *MemberManagerCtx) UpdatePassword(id string, password string) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + entries, err := manager.deserialize() + if err != nil { + return err + } + + entry, ok := entries[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + // TODO: Use hash function. + entry.Password = password + entries[id] = entry + + return manager.serialize(entries) +} + +func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + + entry, err := manager.getEntry(id) + if err != nil { + return types.MemberProfile{}, err + } + + return entry.Profile, nil +} + +func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + + profiles := map[string]types.MemberProfile{} + + entries, err := manager.deserialize() + if err != nil { + return profiles, err + } + + i := 0 + for id, entry := range entries { + if i < offset || i > offset + limit { + continue + } + + profiles[id] = entry.Profile + i = i + 1 + } + + return profiles, nil +} + +func (manager *MemberManagerCtx) Delete(id string) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + entries, err := manager.deserialize() + if err != nil { + return err + } + + _, ok := entries[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + delete(entries, id) + + return manager.serialize(entries) +} + +func (manager *MemberManagerCtx) deserialize() (map[string]MemberEntry, error) { + file, err := os.OpenFile(manager.file, os.O_RDONLY|os.O_CREATE, os.ModePerm) + if err != nil { + return nil, err + } + + raw, err := ioutil.ReadAll(file) + if err != nil { + return nil, err + } + + if len(raw) == 0 { + return map[string]MemberEntry{}, nil + } + + var entries map[string]MemberEntry + if err := json.Unmarshal([]byte(raw), &entries); err != nil { + return nil, err + } + + return entries, nil +} + +func (manager *MemberManagerCtx) getEntry(id string) (MemberEntry, error) { + entries, err := manager.deserialize() + if err != nil { + return MemberEntry{}, err + } + + entry, ok := entries[id] + if !ok { + return MemberEntry{}, fmt.Errorf("Member ID does not exist.") + } + + return entry, nil +} + +func (manager *MemberManagerCtx) serialize(data map[string]MemberEntry) error { + raw, err := json.Marshal(data) + if err != nil { + return err + } + + return ioutil.WriteFile(manager.file, raw, os.ModePerm) +} diff --git a/internal/member/object/adapter.go b/internal/member/object/adapter.go deleted file mode 100644 index 412ea012..00000000 --- a/internal/member/object/adapter.go +++ /dev/null @@ -1,74 +0,0 @@ -package object - -import ( - "fmt" - "sync" - - "demodesk/neko/internal/types" -) - -func New() types.MemberManager { - return &MemberManagerCtx{ - profiles: make(map[string]types.MemberProfile), - mu: sync.Mutex{}, - } -} - -type MemberManagerCtx struct { - profiles map[string]types.MemberProfile - mu sync.Mutex -} - -func (manager *MemberManagerCtx) Connect() error { - return nil -} - -func (manager *MemberManagerCtx) Disconnect() error { - return nil -} - -func (manager *MemberManagerCtx) Insert(id string, profile types.MemberProfile) error { - manager.mu.Lock() - defer manager.mu.Unlock() - - _, ok := manager.profiles[id] - if ok { - return fmt.Errorf("Member ID already exists.") - } - - manager.profiles[id] = profile - return nil -} - -func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { - manager.mu.Lock() - defer manager.mu.Unlock() - - _, ok := manager.profiles[id] - if !ok { - return fmt.Errorf("Member ID does not exist.") - } - - manager.profiles[id] = profile - return nil -} - -func (manager *MemberManagerCtx) Delete(id string) error { - manager.mu.Lock() - defer manager.mu.Unlock() - - _, ok := manager.profiles[id] - if !ok { - return fmt.Errorf("Member ID does not exist.") - } - - delete(manager.profiles, id) - return nil -} - -func (manager *MemberManagerCtx) Select() (map[string]types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() - - return manager.profiles, nil -} diff --git a/internal/member/object/manager.go b/internal/member/object/manager.go new file mode 100644 index 00000000..ed2c148f --- /dev/null +++ b/internal/member/object/manager.go @@ -0,0 +1,149 @@ +package object + +import ( + "fmt" + "sync" + + "demodesk/neko/internal/types" +) + +func New() types.MemberManager { + return &MemberManagerCtx{ + entries: make(map[string]MemberEntry), + mu: sync.Mutex{}, + } +} + +type MemberManagerCtx struct { + entries map[string]MemberEntry + mu sync.Mutex +} + +type MemberEntry struct { + Password string `json:"password"` + Profile types.MemberProfile `json:"profile"` +} + +func (manager *MemberManagerCtx) Connect() error { + return nil +} + +func (manager *MemberManagerCtx) Disconnect() error { + return nil +} + +func (manager *MemberManagerCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + + // id will be also username + id := username + + entry, ok := manager.entries[id] + if !ok { + return "", types.MemberProfile{}, fmt.Errorf("Member ID does not exist.") + } + + // TODO: Use hash function. + if entry.Password != password { + return "", types.MemberProfile{}, fmt.Errorf("Invalid password.") + } + + return id, entry.Profile, nil +} + +func (manager *MemberManagerCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + + // id will be also username + id := username + + entry, ok := manager.entries[id] + if ok { + return "", fmt.Errorf("Member ID already exists.") + } + + // TODO: Use hash function. + entry.Password = password + entry.Profile = profile + manager.entries[id] = entry + + return id, nil +} + +func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + entry, ok := manager.entries[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + entry.Profile = profile + manager.entries[id] = entry + + return nil +} + +func (manager *MemberManagerCtx) UpdatePassword(id string, password string) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + entry, ok := manager.entries[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + // TODO: Use hash function. + entry.Password = password + manager.entries[id] = entry + + return nil +} + +func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + + entry, ok := manager.entries[id] + if ok { + return types.MemberProfile{}, fmt.Errorf("Member ID already exists.") + } + + return entry.Profile, nil +} + +func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + + profiles := map[string]types.MemberProfile{} + + i := 0 + for id, entry := range manager.entries { + if i < offset || i > offset + limit { + continue + } + + profiles[id] = entry.Profile + i = i + 1 + } + + return profiles, nil +} + +func (manager *MemberManagerCtx) Delete(id string) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + _, ok := manager.entries[id] + if !ok { + return fmt.Errorf("Member ID does not exist.") + } + + delete(manager.entries, id) + + return nil +} diff --git a/internal/types/member.go b/internal/types/member.go index 90e4e196..8b680370 100644 --- a/internal/types/member.go +++ b/internal/types/member.go @@ -1,11 +1,25 @@ package types +type MemberProfile struct { + Name string `json:"name"` + IsAdmin bool `json:"is_admin"` + CanLogin bool `json:"can_login"` + CanConnect bool `json:"can_connect"` + CanWatch bool `json:"can_watch"` + CanHost bool `json:"can_host"` + CanAccessClipboard bool `json:"can_access_clipboard"` +} + type MemberManager interface { Connect() error Disconnect() error - Insert(id string, profile MemberProfile) error + Authenticate(username string, password string) (string, MemberProfile, error) + + Insert(username string, password string, profile MemberProfile) (string, error) + Select(id string) (MemberProfile, error) + SelectAll(limit int, offset int) (map[string]MemberProfile, error) Update(id string, profile MemberProfile) error + UpdatePassword(id string, passwrod string) error Delete(id string) error - Select() (map[string]MemberProfile, error) } diff --git a/internal/types/session.go b/internal/types/session.go index dc517b6c..1a69f103 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -2,16 +2,6 @@ package types import "net/http" -type MemberProfile struct { - Name string `json:"name"` - IsAdmin bool `json:"is_admin"` - CanLogin bool `json:"can_login"` - CanConnect bool `json:"can_connect"` - CanWatch bool `json:"can_watch"` - CanHost bool `json:"can_host"` - CanAccessClipboard bool `json:"can_access_clipboard"` -} - type SessionState struct { IsConnected bool `json:"is_connected"` IsWatching bool `json:"is_watching"` From f57332ba2a65c521e9a66006a4be8fd4ea5a4fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 13:06:33 +0100 Subject: [PATCH 420/876] dummy allow all logins. --- internal/member/dummy/manager.go | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/internal/member/dummy/manager.go b/internal/member/dummy/manager.go index 3ef7d123..ef210f5e 100644 --- a/internal/member/dummy/manager.go +++ b/internal/member/dummy/manager.go @@ -1,6 +1,8 @@ package dummy import ( + "fmt" + "demodesk/neko/internal/types" ) @@ -19,29 +21,37 @@ func (manager *MemberManagerCtx) Disconnect() error { } func (manager *MemberManagerCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { - return username, types.MemberProfile{}, nil + return username, types.MemberProfile{ + Name: username, + IsAdmin: true, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + }, nil } func (manager *MemberManagerCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { - return "", nil + return "", fmt.Errorf("Not implemented.") } func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) { - return types.MemberProfile{}, nil + return types.MemberProfile{}, fmt.Errorf("Not implemented.") } func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { - return map[string]types.MemberProfile{}, nil + return map[string]types.MemberProfile{}, fmt.Errorf("Not implemented.") } func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { - return nil + return fmt.Errorf("Not implemented.") } func (manager *MemberManagerCtx) UpdatePassword(id string, passwrod string) error { - return nil + return fmt.Errorf("Not implemented.") } func (manager *MemberManagerCtx) Delete(id string) error { - return nil + return fmt.Errorf("Not implemented.") } From fceae3818b104afabb8bb0ec3f42d8f9bcd0354f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 13:06:48 +0100 Subject: [PATCH 421/876] default object members provider. --- internal/config/member.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/config/member.go b/internal/config/member.go index 8fe03cb8..445d0bb4 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -13,12 +13,12 @@ type Member struct { } func (Member) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().String("members_provider", "file", "choose members provider") + cmd.PersistentFlags().String("members_provider", "object", "choose members provider") if err := viper.BindPFlag("members_provider", cmd.PersistentFlags().Lookup("members_provider")); err != nil { return err } - cmd.PersistentFlags().String("members_file_path", "/home/neko/members.json", "mebmer file provider path") + cmd.PersistentFlags().String("members_file_path", "", "mebmer file provider path") if err := viper.BindPFlag("members_file_path", cmd.PersistentFlags().Lookup("members_file_path")); err != nil { return err } From 00586baffc320f5f32bd85d9a11aa0c527d211cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 13:07:03 +0100 Subject: [PATCH 422/876] member providers extracted config. --- internal/member/file/manager.go | 21 ++++++++------------- internal/member/file/types.go | 14 ++++++++++++++ internal/member/manager.go | 9 +++++++-- internal/member/object/manager.go | 11 ++++------- internal/member/object/types.go | 15 +++++++++++++++ 5 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 internal/member/file/types.go create mode 100644 internal/member/object/types.go diff --git a/internal/member/file/manager.go b/internal/member/file/manager.go index c570b676..662203f5 100644 --- a/internal/member/file/manager.go +++ b/internal/member/file/manager.go @@ -10,21 +10,16 @@ import ( "demodesk/neko/internal/types" ) -func New(file string) types.MemberManager { +func New(config Config) types.MemberManager { return &MemberManagerCtx{ - file: file, - mu: sync.Mutex{}, + config: config, + mu: sync.Mutex{}, } } type MemberManagerCtx struct { - file string - mu sync.Mutex -} - -type MemberEntry struct { - Password string `json:"password"` - Profile types.MemberProfile `json:"profile"` + config Config + mu sync.Mutex } func (manager *MemberManagerCtx) Connect() error { @@ -146,7 +141,7 @@ func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]ty i := 0 for id, entry := range entries { - if i < offset || i > offset + limit { + if i < offset || i > offset+limit { continue } @@ -177,7 +172,7 @@ func (manager *MemberManagerCtx) Delete(id string) error { } func (manager *MemberManagerCtx) deserialize() (map[string]MemberEntry, error) { - file, err := os.OpenFile(manager.file, os.O_RDONLY|os.O_CREATE, os.ModePerm) + file, err := os.OpenFile(manager.config.File, os.O_RDONLY|os.O_CREATE, os.ModePerm) if err != nil { return nil, err } @@ -219,5 +214,5 @@ func (manager *MemberManagerCtx) serialize(data map[string]MemberEntry) error { return err } - return ioutil.WriteFile(manager.file, raw, os.ModePerm) + return ioutil.WriteFile(manager.config.File, raw, os.ModePerm) } diff --git a/internal/member/file/types.go b/internal/member/file/types.go new file mode 100644 index 00000000..4a79b652 --- /dev/null +++ b/internal/member/file/types.go @@ -0,0 +1,14 @@ +package file + +import ( + "demodesk/neko/internal/types" +) + +type MemberEntry struct { + Password string `json:"password"` + Profile types.MemberProfile `json:"profile"` +} + +type Config struct { + File string +} diff --git a/internal/member/manager.go b/internal/member/manager.go index 0722dc0d..b1aa012e 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -11,9 +11,14 @@ import ( func New(config *config.Member) types.MemberManager { switch config.Provider { case "file": - return file.New(config.FilePath) + return file.New(file.Config{ + File: config.FilePath, + }) case "object": - return object.New() + return object.New(object.Config{ + AdminPassword: config.AdminPassword, + UserPassword: config.Password, + }) case "dummy": return dummy.New() } diff --git a/internal/member/object/manager.go b/internal/member/object/manager.go index ed2c148f..c18330d9 100644 --- a/internal/member/object/manager.go +++ b/internal/member/object/manager.go @@ -7,23 +7,20 @@ import ( "demodesk/neko/internal/types" ) -func New() types.MemberManager { +func New(config Config) types.MemberManager { return &MemberManagerCtx{ + config: config, entries: make(map[string]MemberEntry), mu: sync.Mutex{}, } } type MemberManagerCtx struct { + config Config entries map[string]MemberEntry mu sync.Mutex } -type MemberEntry struct { - Password string `json:"password"` - Profile types.MemberProfile `json:"profile"` -} - func (manager *MemberManagerCtx) Connect() error { return nil } @@ -123,7 +120,7 @@ func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]ty i := 0 for id, entry := range manager.entries { - if i < offset || i > offset + limit { + if i < offset || i > offset+limit { continue } diff --git a/internal/member/object/types.go b/internal/member/object/types.go new file mode 100644 index 00000000..e3b1b719 --- /dev/null +++ b/internal/member/object/types.go @@ -0,0 +1,15 @@ +package object + +import ( + "demodesk/neko/internal/types" +) + +type MemberEntry struct { + Password string `json:"password"` + Profile types.MemberProfile `json:"profile"` +} + +type Config struct { + AdminPassword string + UserPassword string +} From 8f277c61c9af616a8600c9d062d12a26668ad37d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 13:11:26 +0100 Subject: [PATCH 423/876] members object provider default from config. --- internal/member/object/manager.go | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/internal/member/object/manager.go b/internal/member/object/manager.go index c18330d9..374bd35b 100644 --- a/internal/member/object/manager.go +++ b/internal/member/object/manager.go @@ -22,7 +22,35 @@ type MemberManagerCtx struct { } func (manager *MemberManagerCtx) Connect() error { - return nil + var err error + + if manager.config.AdminPassword != "" { + // create default admin account at startup + _, err = manager.Insert("admin", manager.config.AdminPassword, types.MemberProfile{ + Name: "Administrator", + IsAdmin: true, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + }) + } + + if manager.config.UserPassword != "" { + // create default user account at startup + _, err = manager.Insert("user", manager.config.UserPassword, types.MemberProfile{ + Name: "User", + IsAdmin: false, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + }) + } + + return err } func (manager *MemberManagerCtx) Disconnect() error { From 4898cecd5668d601f99fd7f807e5a5f9ec74f12b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 14:44:03 +0100 Subject: [PATCH 424/876] members minor bugfixes. --- internal/member/dummy/manager.go | 2 +- internal/member/file/manager.go | 18 +++++++++--------- internal/member/object/manager.go | 30 ++++++++++++++---------------- internal/types/member.go | 2 +- 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/internal/member/dummy/manager.go b/internal/member/dummy/manager.go index ef210f5e..f58456b1 100644 --- a/internal/member/dummy/manager.go +++ b/internal/member/dummy/manager.go @@ -44,7 +44,7 @@ func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]ty return map[string]types.MemberProfile{}, fmt.Errorf("Not implemented.") } -func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { +func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberProfile) error { return fmt.Errorf("Not implemented.") } diff --git a/internal/member/file/manager.go b/internal/member/file/manager.go index 662203f5..06b8d546 100644 --- a/internal/member/file/manager.go +++ b/internal/member/file/manager.go @@ -62,20 +62,21 @@ func (manager *MemberManagerCtx) Insert(username string, password string, profil return "", err } - entry, ok := entries[id] + _, ok := entries[id] if ok { return "", fmt.Errorf("Member ID already exists.") } - // TODO: Use hash function. - entry.Password = password - entry.Profile = profile - entries[id] = entry + entries[id] = MemberEntry{ + // TODO: Use hash function. + Password: password, + Profile: profile, + } return id, manager.serialize(entries) } -func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { +func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberProfile) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -141,11 +142,10 @@ func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]ty i := 0 for id, entry := range entries { - if i < offset || i > offset+limit { - continue + if i >= offset && (limit == 0 || i < offset+limit) { + profiles[id] = entry.Profile } - profiles[id] = entry.Profile i = i + 1 } diff --git a/internal/member/object/manager.go b/internal/member/object/manager.go index 374bd35b..f2384202 100644 --- a/internal/member/object/manager.go +++ b/internal/member/object/manager.go @@ -10,14 +10,14 @@ import ( func New(config Config) types.MemberManager { return &MemberManagerCtx{ config: config, - entries: make(map[string]MemberEntry), + entries: make(map[string]*MemberEntry), mu: sync.Mutex{}, } } type MemberManagerCtx struct { config Config - entries map[string]MemberEntry + entries map[string]*MemberEntry mu sync.Mutex } @@ -84,20 +84,21 @@ func (manager *MemberManagerCtx) Insert(username string, password string, profil // id will be also username id := username - entry, ok := manager.entries[id] + _, ok := manager.entries[id] if ok { return "", fmt.Errorf("Member ID already exists.") } - // TODO: Use hash function. - entry.Password = password - entry.Profile = profile - manager.entries[id] = entry + manager.entries[id] = &MemberEntry{ + // TODO: Use hash function. + Password: password, + Profile: profile, + } return id, nil } -func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) error { +func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberProfile) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -107,7 +108,6 @@ func (manager *MemberManagerCtx) Update(id string, profile types.MemberProfile) } entry.Profile = profile - manager.entries[id] = entry return nil } @@ -123,7 +123,6 @@ func (manager *MemberManagerCtx) UpdatePassword(id string, password string) erro // TODO: Use hash function. entry.Password = password - manager.entries[id] = entry return nil } @@ -133,8 +132,8 @@ func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) defer manager.mu.Unlock() entry, ok := manager.entries[id] - if ok { - return types.MemberProfile{}, fmt.Errorf("Member ID already exists.") + if !ok { + return types.MemberProfile{}, fmt.Errorf("Member ID does not exist.") } return entry.Profile, nil @@ -144,15 +143,14 @@ func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]ty manager.mu.Lock() defer manager.mu.Unlock() - profiles := map[string]types.MemberProfile{} + profiles := make(map[string]types.MemberProfile) i := 0 for id, entry := range manager.entries { - if i < offset || i > offset+limit { - continue + if i >= offset && (limit == 0 || i < offset+limit) { + profiles[id] = entry.Profile } - profiles[id] = entry.Profile i = i + 1 } diff --git a/internal/types/member.go b/internal/types/member.go index 8b680370..5ef65a92 100644 --- a/internal/types/member.go +++ b/internal/types/member.go @@ -19,7 +19,7 @@ type MemberManager interface { Insert(username string, password string, profile MemberProfile) (string, error) Select(id string) (MemberProfile, error) SelectAll(limit int, offset int) (map[string]MemberProfile, error) - Update(id string, profile MemberProfile) error + UpdateProfile(id string, profile MemberProfile) error UpdatePassword(id string, passwrod string) error Delete(id string) error } From 4d2fb157f9649ee19975a448c72312ff87a0838c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 14:44:32 +0100 Subject: [PATCH 425/876] API implement members. --- internal/api/members/controler.go | 91 ++++++++++++++++++++++--------- internal/api/members/handler.go | 31 +++++++---- internal/api/router.go | 5 +- neko.go | 16 +++--- 4 files changed, 97 insertions(+), 46 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 579f0e3b..3a52c7f7 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -1,6 +1,7 @@ package members import ( + "strconv" "net/http" "demodesk/neko/internal/types" @@ -12,12 +13,40 @@ type MemberDataPayload struct { *types.MemberProfile } +type MemberCreatePayload struct { + Username string `json:"username"` + Password string `json:"password"` + Profile types.MemberProfile `json:"profile"` +} + +type MemberPasswordPayload struct { + Password string `json:"password"` +} + func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { + limit, err := strconv.Atoi(r.URL.Query().Get("limit")) + if err != nil { + // TODO: Default zero. + limit = 0 + } + + offset, err := strconv.Atoi(r.URL.Query().Get("offset")) + if err != nil { + // TODO: Default zero. + offset = 0 + } + + entries, err := h.members.SelectAll(limit, offset) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + members := []MemberDataPayload{} - for _, session := range h.sessions.List() { - profile := session.Profile() + for id, profile := range entries { + profile := profile members = append(members, MemberDataPayload{ - ID: session.ID(), + ID: id, MemberProfile: &profile, }) } @@ -26,9 +55,9 @@ func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { } func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { - data := &MemberDataPayload{ + data := &MemberCreatePayload{ // default values - MemberProfile: &types.MemberProfile{ + Profile: types.MemberProfile{ IsAdmin: false, CanLogin: true, CanConnect: true, @@ -37,56 +66,64 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { CanAccessClipboard: true, }, } - + if !utils.HttpJsonRequest(w, r, data) { return } - if data.Name == "" { - utils.HttpBadRequest(w, "Name cannot be empty.") + if data.Username == "" { + utils.HttpBadRequest(w, "Username cannot be empty.") return } - if data.ID == "" { - var err error - if data.ID, err = utils.NewUID(32); err != nil { - utils.HttpInternalServerError(w, err) - return - } - } else { - if _, ok := h.sessions.Get(data.ID); ok { - utils.HttpBadRequest(w, "Member ID already exists.") - return - } + if data.Password == "" { + utils.HttpBadRequest(w, "Password cannot be empty.") + return } - session, _, err := h.sessions.Create(data.ID, *data.MemberProfile) + id, err := h.members.Insert(data.Username, data.Password, data.Profile) if err != nil { utils.HttpInternalServerError(w, err) return } - + utils.HttpSuccess(w, MemberDataPayload{ - ID: session.ID(), + ID: id, }) } func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - profile := member.Profile() + profile := member.Profile utils.HttpSuccess(w, profile) } -func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersUpdateProfile(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - profile := member.Profile() + profile := member.Profile if !utils.HttpJsonRequest(w, r, &profile) { return } - if err := h.sessions.Update(member.ID(), profile); err != nil { + if err := h.members.UpdateProfile(member.ID, profile); err != nil { + utils.HttpInternalServerError(w, err) + return + } + + utils.HttpSuccess(w) +} + +func (h *MembersHandler) membersUpdatePassword(w http.ResponseWriter, r *http.Request) { + member := GetMember(r) + data := MemberPasswordPayload{} + + if !utils.HttpJsonRequest(w, r, &data) { + return + } + + if err := h.members.UpdatePassword(member.ID, data.Password); err != nil { utils.HttpInternalServerError(w, err) return } @@ -97,7 +134,7 @@ func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) { func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) { member := GetMember(r) - if err := h.sessions.Delete(member.ID()); err != nil { + if err := h.members.Delete(member.ID); err != nil { utils.HttpInternalServerError(w, err) return } diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 555058a7..0988f9b9 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -18,16 +18,16 @@ const ( ) type MembersHandler struct { - sessions types.SessionManager + members types.MemberManager } func New( - sessions types.SessionManager, + members types.MemberManager, ) *MembersHandler { // Init return &MembersHandler{ - sessions: sessions, + members: members, } } @@ -38,29 +38,38 @@ func (h *MembersHandler) Route(r chi.Router) { r.Post("/", h.membersCreate) r.With(h.ExtractMember).Route("/{memberId}", func(r chi.Router) { r.Get("/", h.membersRead) - r.Post("/", h.membersUpdate) + r.Post("/", h.membersUpdateProfile) + r.Post("/password", h.membersUpdatePassword) r.Delete("/", h.membersDelete) }) }) } -func SetMember(r *http.Request, session types.Session) *http.Request { +type MemberData struct { + ID string + Profile types.MemberProfile +} + +func SetMember(r *http.Request, session MemberData) *http.Request { ctx := context.WithValue(r.Context(), keyMemberCtx, session) return r.WithContext(ctx) } -func GetMember(r *http.Request) types.Session { - return r.Context().Value(keyMemberCtx).(types.Session) +func GetMember(r *http.Request) MemberData { + return r.Context().Value(keyMemberCtx).(MemberData) } func (h *MembersHandler) ExtractMember(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { memberId := chi.URLParam(r, "memberId") - session, ok := h.sessions.Get(memberId) - if !ok { - utils.HttpNotFound(w, "Member was not found.") + profile, err := h.members.Select(memberId) + if err != nil { + utils.HttpNotFound(w, err) } else { - next.ServeHTTP(w, SetMember(r, session)) + next.ServeHTTP(w, SetMember(r, MemberData{ + ID: memberId, + Profile: profile, + })) } }) } diff --git a/internal/api/router.go b/internal/api/router.go index b1fe988a..84a7b377 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -15,6 +15,7 @@ import ( type ApiManagerCtx struct { sessions types.SessionManager + members types.MemberManager desktop types.DesktopManager capture types.CaptureManager routers map[string]func(chi.Router) @@ -22,6 +23,7 @@ type ApiManagerCtx struct { func New( sessions types.SessionManager, + members types.MemberManager, desktop types.DesktopManager, capture types.CaptureManager, conf *config.Server, @@ -29,6 +31,7 @@ func New( return &ApiManagerCtx{ sessions: sessions, + members: members, desktop: desktop, capture: capture, routers: make(map[string]func(chi.Router)), @@ -45,7 +48,7 @@ func (api *ApiManagerCtx) Route(r chi.Router) { r.Post("/logout", api.Logout) r.Get("/whoami", api.Whoami) - membersHandler := members.New(api.sessions) + membersHandler := members.New(api.members) r.Route("/members", membersHandler.Route) roomHandler := room.New(api.sessions, api.desktop, api.capture) diff --git a/neko.go b/neko.go index 1dd41749..3b8c40fa 100644 --- a/neko.go +++ b/neko.go @@ -134,17 +134,18 @@ func (neko *Neko) Preflight() { } func (neko *Neko) Start() { - neko.memberManager = member.New( - neko.Configs.Member, - ) - if err := neko.memberManager.Connect(); err != nil { - neko.logger.Panic().Err(err).Msg("unable to connect to member manager") - } - neko.sessionManager = session.New( neko.Configs.Session, ) + neko.memberManager = member.New( + neko.Configs.Member, + ) + + if err := neko.memberManager.Connect(); err != nil { + neko.logger.Panic().Err(err).Msg("unable to connect to member manager") + } + neko.desktopManager = desktop.New( neko.Configs.Desktop, ) @@ -173,6 +174,7 @@ func (neko *Neko) Start() { neko.apiManager = api.New( neko.sessionManager, + neko.memberManager, neko.desktopManager, neko.captureManager, neko.Configs.Server, From fad3ab0062bafbdfb6ab53f0ab479962b80f825c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 16:19:23 +0100 Subject: [PATCH 426/876] MemberData split ID and profile, return on create. --- internal/api/members/controler.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 3a52c7f7..3ed94df7 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -9,8 +9,8 @@ import ( ) type MemberDataPayload struct { - ID string `json:"id"` - *types.MemberProfile + ID string `json:"id"` + Profile types.MemberProfile `json:"profile"` } type MemberCreatePayload struct { @@ -44,10 +44,9 @@ func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { members := []MemberDataPayload{} for id, profile := range entries { - profile := profile members = append(members, MemberDataPayload{ - ID: id, - MemberProfile: &profile, + ID: id, + Profile: profile, }) } @@ -88,7 +87,8 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { } utils.HttpSuccess(w, MemberDataPayload{ - ID: id, + ID: id, + Profile: data.Profile, }) } From 19e732f3eaafccf165ad7ed77f1d460da0d292d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 16:23:14 +0100 Subject: [PATCH 427/876] fix typo. --- internal/member/dummy/manager.go | 2 +- internal/types/member.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/member/dummy/manager.go b/internal/member/dummy/manager.go index f58456b1..677134ee 100644 --- a/internal/member/dummy/manager.go +++ b/internal/member/dummy/manager.go @@ -48,7 +48,7 @@ func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberPr return fmt.Errorf("Not implemented.") } -func (manager *MemberManagerCtx) UpdatePassword(id string, passwrod string) error { +func (manager *MemberManagerCtx) UpdatePassword(id string, password string) error { return fmt.Errorf("Not implemented.") } diff --git a/internal/types/member.go b/internal/types/member.go index 5ef65a92..a201e5c2 100644 --- a/internal/types/member.go +++ b/internal/types/member.go @@ -20,6 +20,6 @@ type MemberManager interface { Select(id string) (MemberProfile, error) SelectAll(limit int, offset int) (map[string]MemberProfile, error) UpdateProfile(id string, profile MemberProfile) error - UpdatePassword(id string, passwrod string) error + UpdatePassword(id string, password string) error Delete(id string) error } From 4207775fb3fbbb5108b7438d47e248d6dcbdc961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 16:58:18 +0100 Subject: [PATCH 428/876] split member manager and provider. --- internal/member/dummy/manager.go | 24 +++--- .../member/file/{manager.go => provider.go} | 86 +++++++++---------- internal/member/manager.go | 67 +++++++++++++-- .../member/object/{manager.go => provider.go} | 78 ++++++++--------- internal/types/member.go | 6 +- neko.go | 3 +- 6 files changed, 161 insertions(+), 103 deletions(-) rename internal/member/file/{manager.go => provider.go} (51%) rename internal/member/object/{manager.go => provider.go} (52%) diff --git a/internal/member/dummy/manager.go b/internal/member/dummy/manager.go index 677134ee..ff56cf2f 100644 --- a/internal/member/dummy/manager.go +++ b/internal/member/dummy/manager.go @@ -6,21 +6,21 @@ import ( "demodesk/neko/internal/types" ) -func New() types.MemberManager { - return &MemberManagerCtx{} +func New() types.MemberProvider { + return &MemberProviderCtx{} } -type MemberManagerCtx struct{} +type MemberProviderCtx struct{} -func (manager *MemberManagerCtx) Connect() error { +func (provider *MemberProviderCtx) Connect() error { return nil } -func (manager *MemberManagerCtx) Disconnect() error { +func (provider *MemberProviderCtx) Disconnect() error { return nil } -func (manager *MemberManagerCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { +func (provider *MemberProviderCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { return username, types.MemberProfile{ Name: username, IsAdmin: true, @@ -32,26 +32,26 @@ func (manager *MemberManagerCtx) Authenticate(username string, password string) }, nil } -func (manager *MemberManagerCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { +func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { return "", fmt.Errorf("Not implemented.") } -func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) { +func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { return types.MemberProfile{}, fmt.Errorf("Not implemented.") } -func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { +func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { return map[string]types.MemberProfile{}, fmt.Errorf("Not implemented.") } -func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberProfile) error { +func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { return fmt.Errorf("Not implemented.") } -func (manager *MemberManagerCtx) UpdatePassword(id string, password string) error { +func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { return fmt.Errorf("Not implemented.") } -func (manager *MemberManagerCtx) Delete(id string) error { +func (provider *MemberProviderCtx) Delete(id string) error { return fmt.Errorf("Not implemented.") } diff --git a/internal/member/file/manager.go b/internal/member/file/provider.go similarity index 51% rename from internal/member/file/manager.go rename to internal/member/file/provider.go index 06b8d546..adddf7a9 100644 --- a/internal/member/file/manager.go +++ b/internal/member/file/provider.go @@ -10,34 +10,34 @@ import ( "demodesk/neko/internal/types" ) -func New(config Config) types.MemberManager { - return &MemberManagerCtx{ +func New(config Config) types.MemberProvider { + return &MemberProviderCtx{ config: config, mu: sync.Mutex{}, } } -type MemberManagerCtx struct { +type MemberProviderCtx struct { config Config mu sync.Mutex } -func (manager *MemberManagerCtx) Connect() error { +func (provider *MemberProviderCtx) Connect() error { return nil } -func (manager *MemberManagerCtx) Disconnect() error { +func (provider *MemberProviderCtx) Disconnect() error { return nil } -func (manager *MemberManagerCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { + provider.mu.Lock() + defer provider.mu.Unlock() // id will be also username id := username - entry, err := manager.getEntry(id) + entry, err := provider.getEntry(id) if err != nil { return "", types.MemberProfile{}, err } @@ -50,14 +50,14 @@ func (manager *MemberManagerCtx) Authenticate(username string, password string) return id, entry.Profile, nil } -func (manager *MemberManagerCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { + provider.mu.Lock() + defer provider.mu.Unlock() // id will be also username id := username - entries, err := manager.deserialize() + entries, err := provider.deserialize() if err != nil { return "", err } @@ -73,14 +73,14 @@ func (manager *MemberManagerCtx) Insert(username string, password string, profil Profile: profile, } - return id, manager.serialize(entries) + return id, provider.serialize(entries) } -func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberProfile) error { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { + provider.mu.Lock() + defer provider.mu.Unlock() - entries, err := manager.deserialize() + entries, err := provider.deserialize() if err != nil { return err } @@ -93,14 +93,14 @@ func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberPr entry.Profile = profile entries[id] = entry - return manager.serialize(entries) + return provider.serialize(entries) } -func (manager *MemberManagerCtx) UpdatePassword(id string, password string) error { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { + provider.mu.Lock() + defer provider.mu.Unlock() - entries, err := manager.deserialize() + entries, err := provider.deserialize() if err != nil { return err } @@ -114,14 +114,14 @@ func (manager *MemberManagerCtx) UpdatePassword(id string, password string) erro entry.Password = password entries[id] = entry - return manager.serialize(entries) + return provider.serialize(entries) } -func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { + provider.mu.Lock() + defer provider.mu.Unlock() - entry, err := manager.getEntry(id) + entry, err := provider.getEntry(id) if err != nil { return types.MemberProfile{}, err } @@ -129,13 +129,13 @@ func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) return entry.Profile, nil } -func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { + provider.mu.Lock() + defer provider.mu.Unlock() profiles := map[string]types.MemberProfile{} - entries, err := manager.deserialize() + entries, err := provider.deserialize() if err != nil { return profiles, err } @@ -152,11 +152,11 @@ func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]ty return profiles, nil } -func (manager *MemberManagerCtx) Delete(id string) error { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) Delete(id string) error { + provider.mu.Lock() + defer provider.mu.Unlock() - entries, err := manager.deserialize() + entries, err := provider.deserialize() if err != nil { return err } @@ -168,11 +168,11 @@ func (manager *MemberManagerCtx) Delete(id string) error { delete(entries, id) - return manager.serialize(entries) + return provider.serialize(entries) } -func (manager *MemberManagerCtx) deserialize() (map[string]MemberEntry, error) { - file, err := os.OpenFile(manager.config.File, os.O_RDONLY|os.O_CREATE, os.ModePerm) +func (provider *MemberProviderCtx) deserialize() (map[string]MemberEntry, error) { + file, err := os.OpenFile(provider.config.File, os.O_RDONLY|os.O_CREATE, os.ModePerm) if err != nil { return nil, err } @@ -194,8 +194,8 @@ func (manager *MemberManagerCtx) deserialize() (map[string]MemberEntry, error) { return entries, nil } -func (manager *MemberManagerCtx) getEntry(id string) (MemberEntry, error) { - entries, err := manager.deserialize() +func (provider *MemberProviderCtx) getEntry(id string) (MemberEntry, error) { + entries, err := provider.deserialize() if err != nil { return MemberEntry{}, err } @@ -208,11 +208,11 @@ func (manager *MemberManagerCtx) getEntry(id string) (MemberEntry, error) { return entry, nil } -func (manager *MemberManagerCtx) serialize(data map[string]MemberEntry) error { +func (provider *MemberProviderCtx) serialize(data map[string]MemberEntry) error { raw, err := json.Marshal(data) if err != nil { return err } - return ioutil.WriteFile(manager.config.File, raw, os.ModePerm) + return ioutil.WriteFile(provider.config.File, raw, os.ModePerm) } diff --git a/internal/member/manager.go b/internal/member/manager.go index b1aa012e..68fc8799 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -1,6 +1,11 @@ package member import ( + "sync" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + "demodesk/neko/internal/config" "demodesk/neko/internal/member/dummy" "demodesk/neko/internal/member/file" @@ -8,20 +13,70 @@ import ( "demodesk/neko/internal/types" ) -func New(config *config.Member) types.MemberManager { +func New(config *config.Member) *MemberManagerCtx { + manager := &MemberManagerCtx{ + logger: log.With().Str("module", "member").Logger(), + config: config, + } + switch config.Provider { case "file": - return file.New(file.Config{ + manager.provider = file.New(file.Config{ File: config.FilePath, }) case "object": - return object.New(object.Config{ + manager.provider = object.New(object.Config{ AdminPassword: config.AdminPassword, UserPassword: config.Password, }) case "dummy": - return dummy.New() + fallthrough + default: + manager.provider = dummy.New() } - - return dummy.New() + + return manager +} + +type MemberManagerCtx struct { + logger zerolog.Logger + config *config.Member + mu sync.Mutex + provider types.MemberProvider +} + +func (manager *MemberManagerCtx) Connect() error { + return manager.provider.Connect() +} + +func (manager *MemberManagerCtx) Disconnect() error { + return manager.provider.Disconnect() +} + +func (manager *MemberManagerCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { + return manager.provider.Authenticate(username, password) +} + +func (manager *MemberManagerCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { + return manager.provider.Insert(username, password, profile) +} + +func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) { + return manager.provider.Select(id) +} + +func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { + return manager.provider.SelectAll(limit, offset) +} + +func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberProfile) error { + return manager.provider.UpdateProfile(id, profile) +} + +func (manager *MemberManagerCtx) UpdatePassword(id string, password string) error { + return manager.provider.UpdatePassword(id, password) +} + +func (manager *MemberManagerCtx) Delete(id string) error { + return manager.provider.Delete(id) } diff --git a/internal/member/object/manager.go b/internal/member/object/provider.go similarity index 52% rename from internal/member/object/manager.go rename to internal/member/object/provider.go index f2384202..8af151f3 100644 --- a/internal/member/object/manager.go +++ b/internal/member/object/provider.go @@ -7,26 +7,26 @@ import ( "demodesk/neko/internal/types" ) -func New(config Config) types.MemberManager { - return &MemberManagerCtx{ +func New(config Config) types.MemberProvider { + return &MemberProviderCtx{ config: config, entries: make(map[string]*MemberEntry), mu: sync.Mutex{}, } } -type MemberManagerCtx struct { +type MemberProviderCtx struct { config Config entries map[string]*MemberEntry mu sync.Mutex } -func (manager *MemberManagerCtx) Connect() error { +func (provider *MemberProviderCtx) Connect() error { var err error - if manager.config.AdminPassword != "" { + if provider.config.AdminPassword != "" { // create default admin account at startup - _, err = manager.Insert("admin", manager.config.AdminPassword, types.MemberProfile{ + _, err = provider.Insert("admin", provider.config.AdminPassword, types.MemberProfile{ Name: "Administrator", IsAdmin: true, CanLogin: true, @@ -37,9 +37,9 @@ func (manager *MemberManagerCtx) Connect() error { }) } - if manager.config.UserPassword != "" { + if provider.config.UserPassword != "" { // create default user account at startup - _, err = manager.Insert("user", manager.config.UserPassword, types.MemberProfile{ + _, err = provider.Insert("user", provider.config.UserPassword, types.MemberProfile{ Name: "User", IsAdmin: false, CanLogin: true, @@ -53,18 +53,18 @@ func (manager *MemberManagerCtx) Connect() error { return err } -func (manager *MemberManagerCtx) Disconnect() error { +func (provider *MemberProviderCtx) Disconnect() error { return nil } -func (manager *MemberManagerCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { + provider.mu.Lock() + defer provider.mu.Unlock() // id will be also username id := username - entry, ok := manager.entries[id] + entry, ok := provider.entries[id] if !ok { return "", types.MemberProfile{}, fmt.Errorf("Member ID does not exist.") } @@ -77,19 +77,19 @@ func (manager *MemberManagerCtx) Authenticate(username string, password string) return id, entry.Profile, nil } -func (manager *MemberManagerCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { + provider.mu.Lock() + defer provider.mu.Unlock() // id will be also username id := username - _, ok := manager.entries[id] + _, ok := provider.entries[id] if ok { return "", fmt.Errorf("Member ID already exists.") } - manager.entries[id] = &MemberEntry{ + provider.entries[id] = &MemberEntry{ // TODO: Use hash function. Password: password, Profile: profile, @@ -98,11 +98,11 @@ func (manager *MemberManagerCtx) Insert(username string, password string, profil return id, nil } -func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberProfile) error { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { + provider.mu.Lock() + defer provider.mu.Unlock() - entry, ok := manager.entries[id] + entry, ok := provider.entries[id] if !ok { return fmt.Errorf("Member ID does not exist.") } @@ -112,11 +112,11 @@ func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberPr return nil } -func (manager *MemberManagerCtx) UpdatePassword(id string, password string) error { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { + provider.mu.Lock() + defer provider.mu.Unlock() - entry, ok := manager.entries[id] + entry, ok := provider.entries[id] if !ok { return fmt.Errorf("Member ID does not exist.") } @@ -127,11 +127,11 @@ func (manager *MemberManagerCtx) UpdatePassword(id string, password string) erro return nil } -func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { + provider.mu.Lock() + defer provider.mu.Unlock() - entry, ok := manager.entries[id] + entry, ok := provider.entries[id] if !ok { return types.MemberProfile{}, fmt.Errorf("Member ID does not exist.") } @@ -139,14 +139,14 @@ func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) return entry.Profile, nil } -func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { + provider.mu.Lock() + defer provider.mu.Unlock() profiles := make(map[string]types.MemberProfile) i := 0 - for id, entry := range manager.entries { + for id, entry := range provider.entries { if i >= offset && (limit == 0 || i < offset+limit) { profiles[id] = entry.Profile } @@ -157,16 +157,16 @@ func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]ty return profiles, nil } -func (manager *MemberManagerCtx) Delete(id string) error { - manager.mu.Lock() - defer manager.mu.Unlock() +func (provider *MemberProviderCtx) Delete(id string) error { + provider.mu.Lock() + defer provider.mu.Unlock() - _, ok := manager.entries[id] + _, ok := provider.entries[id] if !ok { return fmt.Errorf("Member ID does not exist.") } - delete(manager.entries, id) + delete(provider.entries, id) return nil } diff --git a/internal/types/member.go b/internal/types/member.go index a201e5c2..f4c9a72c 100644 --- a/internal/types/member.go +++ b/internal/types/member.go @@ -10,7 +10,7 @@ type MemberProfile struct { CanAccessClipboard bool `json:"can_access_clipboard"` } -type MemberManager interface { +type MemberProvider interface { Connect() error Disconnect() error @@ -23,3 +23,7 @@ type MemberManager interface { UpdatePassword(id string, password string) error Delete(id string) error } + +type MemberManager interface { + MemberProvider +} diff --git a/neko.go b/neko.go index 3b8c40fa..1818e1b8 100644 --- a/neko.go +++ b/neko.go @@ -13,7 +13,6 @@ import ( "demodesk/neko/internal/http" "demodesk/neko/internal/member" "demodesk/neko/internal/session" - "demodesk/neko/internal/types" "demodesk/neko/internal/webrtc" "demodesk/neko/internal/websocket" "demodesk/neko/modules" @@ -122,7 +121,7 @@ type Neko struct { desktopManager *desktop.DesktopManagerCtx captureManager *capture.CaptureManagerCtx webRTCManager *webrtc.WebRTCManagerCtx - memberManager types.MemberManager + memberManager *member.MemberManagerCtx sessionManager *session.SessionManagerCtx webSocketManager *websocket.WebSocketManagerCtx apiManager *api.ApiManagerCtx From 9483882c894789b01093f8dfa8082cd842e41236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 19:36:30 +0100 Subject: [PATCH 429/876] member mutex move to manager. --- internal/member/file/provider.go | 24 ------------------------ internal/member/manager.go | 27 +++++++++++++++++++++++++++ internal/member/object/provider.go | 24 ------------------------ 3 files changed, 27 insertions(+), 48 deletions(-) diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index adddf7a9..6ec004bf 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -5,7 +5,6 @@ import ( "fmt" "io/ioutil" "os" - "sync" "demodesk/neko/internal/types" ) @@ -13,13 +12,11 @@ import ( func New(config Config) types.MemberProvider { return &MemberProviderCtx{ config: config, - mu: sync.Mutex{}, } } type MemberProviderCtx struct { config Config - mu sync.Mutex } func (provider *MemberProviderCtx) Connect() error { @@ -31,9 +28,6 @@ func (provider *MemberProviderCtx) Disconnect() error { } func (provider *MemberProviderCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { - provider.mu.Lock() - defer provider.mu.Unlock() - // id will be also username id := username @@ -51,9 +45,6 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string } func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { - provider.mu.Lock() - defer provider.mu.Unlock() - // id will be also username id := username @@ -77,9 +68,6 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof } func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { - provider.mu.Lock() - defer provider.mu.Unlock() - entries, err := provider.deserialize() if err != nil { return err @@ -97,9 +85,6 @@ func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.Member } func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { - provider.mu.Lock() - defer provider.mu.Unlock() - entries, err := provider.deserialize() if err != nil { return err @@ -118,9 +103,6 @@ func (provider *MemberProviderCtx) UpdatePassword(id string, password string) er } func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { - provider.mu.Lock() - defer provider.mu.Unlock() - entry, err := provider.getEntry(id) if err != nil { return types.MemberProfile{}, err @@ -130,9 +112,6 @@ func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error } func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { - provider.mu.Lock() - defer provider.mu.Unlock() - profiles := map[string]types.MemberProfile{} entries, err := provider.deserialize() @@ -153,9 +132,6 @@ func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string] } func (provider *MemberProviderCtx) Delete(id string) error { - provider.mu.Lock() - defer provider.mu.Unlock() - entries, err := provider.deserialize() if err != nil { return err diff --git a/internal/member/manager.go b/internal/member/manager.go index 68fc8799..2b874a6b 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -46,37 +46,64 @@ type MemberManagerCtx struct { } func (manager *MemberManagerCtx) Connect() error { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.provider.Connect() } func (manager *MemberManagerCtx) Disconnect() error { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.provider.Disconnect() } func (manager *MemberManagerCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.provider.Authenticate(username, password) } func (manager *MemberManagerCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.provider.Insert(username, password, profile) } func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.provider.Select(id) } func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.provider.SelectAll(limit, offset) } func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberProfile) error { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.provider.UpdateProfile(id, profile) } func (manager *MemberManagerCtx) UpdatePassword(id string, password string) error { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.provider.UpdatePassword(id, password) } func (manager *MemberManagerCtx) Delete(id string) error { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.provider.Delete(id) } diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index 8af151f3..7cfa1dde 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -2,7 +2,6 @@ package object import ( "fmt" - "sync" "demodesk/neko/internal/types" ) @@ -11,14 +10,12 @@ func New(config Config) types.MemberProvider { return &MemberProviderCtx{ config: config, entries: make(map[string]*MemberEntry), - mu: sync.Mutex{}, } } type MemberProviderCtx struct { config Config entries map[string]*MemberEntry - mu sync.Mutex } func (provider *MemberProviderCtx) Connect() error { @@ -58,9 +55,6 @@ func (provider *MemberProviderCtx) Disconnect() error { } func (provider *MemberProviderCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { - provider.mu.Lock() - defer provider.mu.Unlock() - // id will be also username id := username @@ -78,9 +72,6 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string } func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { - provider.mu.Lock() - defer provider.mu.Unlock() - // id will be also username id := username @@ -99,9 +90,6 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof } func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { - provider.mu.Lock() - defer provider.mu.Unlock() - entry, ok := provider.entries[id] if !ok { return fmt.Errorf("Member ID does not exist.") @@ -113,9 +101,6 @@ func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.Member } func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { - provider.mu.Lock() - defer provider.mu.Unlock() - entry, ok := provider.entries[id] if !ok { return fmt.Errorf("Member ID does not exist.") @@ -128,9 +113,6 @@ func (provider *MemberProviderCtx) UpdatePassword(id string, password string) er } func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { - provider.mu.Lock() - defer provider.mu.Unlock() - entry, ok := provider.entries[id] if !ok { return types.MemberProfile{}, fmt.Errorf("Member ID does not exist.") @@ -140,9 +122,6 @@ func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error } func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { - provider.mu.Lock() - defer provider.mu.Unlock() - profiles := make(map[string]types.MemberProfile) i := 0 @@ -158,9 +137,6 @@ func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string] } func (provider *MemberProviderCtx) Delete(id string) error { - provider.mu.Lock() - defer provider.mu.Unlock() - _, ok := provider.entries[id] if !ok { return fmt.Errorf("Member ID does not exist.") From 304cb5d6556285df0ed49ef8693aaae77fcfee67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 19:58:15 +0100 Subject: [PATCH 430/876] add CanLogin check for Authenticate. --- internal/session/auth.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/session/auth.go b/internal/session/auth.go index 5eb23bdb..e98c755f 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -19,6 +19,10 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, return nil, fmt.Errorf("session not found") } + if !session.Profile().CanLogin { + return nil, fmt.Errorf("login disabled") + } + return session, nil } From 524c76ae3ca5bfbd37ef76058dc8aaf4a699c24e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 19:59:34 +0100 Subject: [PATCH 431/876] member manager login & logout. --- internal/api/session.go | 15 ++----------- internal/member/manager.go | 44 +++++++++++++++++++++++++++++++++++--- internal/types/member.go | 3 +++ neko.go | 1 + 4 files changed, 47 insertions(+), 16 deletions(-) diff --git a/internal/api/session.go b/internal/api/session.go index fce14a28..9cbf9435 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -30,17 +30,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { return } - // TODO: Proper login. - session, token, err := api.sessions.Create(data.Username, types.MemberProfile{ - Name: data.Username, - IsAdmin: true, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanAccessClipboard: true, - }) - + session, token, err := api.members.Login(data.Username, data.Password) if err != nil { utils.HttpUnauthorized(w, err) return @@ -70,8 +60,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) - // TODO: Proper logout. - err := api.sessions.Delete(session.ID()) + err := api.members.Logout(session.ID()) if err != nil { utils.HttpUnauthorized(w, err) return diff --git a/internal/member/manager.go b/internal/member/manager.go index 2b874a6b..6315bb95 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -1,6 +1,7 @@ package member import ( + "fmt" "sync" "github.com/rs/zerolog" @@ -13,10 +14,11 @@ import ( "demodesk/neko/internal/types" ) -func New(config *config.Member) *MemberManagerCtx { +func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx { manager := &MemberManagerCtx{ - logger: log.With().Str("module", "member").Logger(), - config: config, + logger: log.With().Str("module", "member").Logger(), + sessions: sessions, + config: config, } switch config.Provider { @@ -40,6 +42,7 @@ func New(config *config.Member) *MemberManagerCtx { type MemberManagerCtx struct { logger zerolog.Logger + sessions types.SessionManager config *config.Member mu sync.Mutex provider types.MemberProvider @@ -91,6 +94,13 @@ func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberPr manager.mu.Lock() defer manager.mu.Unlock() + // update corresponding session, if exists + if _, ok := manager.sessions.Get(id); ok { + if err := manager.sessions.Update(id, profile); err != nil { + manager.logger.Err(err).Msg("error while updating session") + } + } + return manager.provider.UpdateProfile(id, profile) } @@ -105,5 +115,33 @@ func (manager *MemberManagerCtx) Delete(id string) error { manager.mu.Lock() defer manager.mu.Unlock() + // destroy corresponding session, if exists + if _, ok := manager.sessions.Get(id); ok { + if err := manager.sessions.Delete(id); err != nil { + manager.logger.Err(err).Msg("error while deleting session") + } + } + return manager.provider.Delete(id) } + +// +// member -> session +// + +func (manager *MemberManagerCtx) Login(username string, password string) (types.Session, string, error) { + id, profile, err := manager.provider.Authenticate(username, password) + if err != nil { + return nil, "", err + } + + return manager.sessions.Create(id, profile) +} + +func (manager *MemberManagerCtx) Logout(id string) error { + if _, ok := manager.sessions.Get(id); !ok { + return fmt.Errorf("session not found") + } + + return manager.sessions.Delete(id) +} diff --git a/internal/types/member.go b/internal/types/member.go index f4c9a72c..be7d1e38 100644 --- a/internal/types/member.go +++ b/internal/types/member.go @@ -26,4 +26,7 @@ type MemberProvider interface { type MemberManager interface { MemberProvider + + Login(username string, password string) (Session, string, error) + Logout(id string) error } diff --git a/neko.go b/neko.go index 1818e1b8..48edad16 100644 --- a/neko.go +++ b/neko.go @@ -138,6 +138,7 @@ func (neko *Neko) Start() { ) neko.memberManager = member.New( + neko.sessionManager, neko.Configs.Member, ) From 85bb26d77cd37b996cb68974aa26ed391a14252a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 20:26:30 +0100 Subject: [PATCH 432/876] member session mutexes & login if not connected. --- internal/member/manager.go | 67 +++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/internal/member/manager.go b/internal/member/manager.go index 6315bb95..fd502dea 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -41,86 +41,91 @@ func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx } type MemberManagerCtx struct { - logger zerolog.Logger - sessions types.SessionManager - config *config.Member - mu sync.Mutex - provider types.MemberProvider + logger zerolog.Logger + sessions types.SessionManager + config *config.Member + providerMu sync.Mutex + provider types.MemberProvider + sessionMu sync.Mutex } func (manager *MemberManagerCtx) Connect() error { - manager.mu.Lock() - defer manager.mu.Unlock() + manager.providerMu.Lock() + defer manager.providerMu.Unlock() return manager.provider.Connect() } func (manager *MemberManagerCtx) Disconnect() error { - manager.mu.Lock() - defer manager.mu.Unlock() + manager.providerMu.Lock() + defer manager.providerMu.Unlock() return manager.provider.Disconnect() } func (manager *MemberManagerCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() + manager.providerMu.Lock() + defer manager.providerMu.Unlock() return manager.provider.Authenticate(username, password) } func (manager *MemberManagerCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { - manager.mu.Lock() - defer manager.mu.Unlock() + manager.providerMu.Lock() + defer manager.providerMu.Unlock() return manager.provider.Insert(username, password, profile) } func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() + manager.providerMu.Lock() + defer manager.providerMu.Unlock() return manager.provider.Select(id) } func (manager *MemberManagerCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { - manager.mu.Lock() - defer manager.mu.Unlock() + manager.providerMu.Lock() + defer manager.providerMu.Unlock() return manager.provider.SelectAll(limit, offset) } func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberProfile) error { - manager.mu.Lock() - defer manager.mu.Unlock() + manager.providerMu.Lock() + defer manager.providerMu.Unlock() // update corresponding session, if exists + manager.sessionMu.Lock() if _, ok := manager.sessions.Get(id); ok { if err := manager.sessions.Update(id, profile); err != nil { manager.logger.Err(err).Msg("error while updating session") } } + manager.sessionMu.Unlock() return manager.provider.UpdateProfile(id, profile) } func (manager *MemberManagerCtx) UpdatePassword(id string, password string) error { - manager.mu.Lock() - defer manager.mu.Unlock() + manager.providerMu.Lock() + defer manager.providerMu.Unlock() return manager.provider.UpdatePassword(id, password) } func (manager *MemberManagerCtx) Delete(id string) error { - manager.mu.Lock() - defer manager.mu.Unlock() + manager.providerMu.Lock() + defer manager.providerMu.Unlock() // destroy corresponding session, if exists + manager.sessionMu.Lock() if _, ok := manager.sessions.Get(id); ok { if err := manager.sessions.Delete(id); err != nil { manager.logger.Err(err).Msg("error while deleting session") } } + manager.sessionMu.Unlock() return manager.provider.Delete(id) } @@ -130,15 +135,31 @@ func (manager *MemberManagerCtx) Delete(id string) error { // func (manager *MemberManagerCtx) Login(username string, password string) (types.Session, string, error) { + manager.sessionMu.Lock() + defer manager.sessionMu.Unlock() + id, profile, err := manager.provider.Authenticate(username, password) if err != nil { return nil, "", err } + session, ok := manager.sessions.Get(id) + if ok { + if session.State().IsConnected { + return nil, "", fmt.Errorf("session is already connected") + } + + // delete existing session + manager.sessions.Delete(id) + } + return manager.sessions.Create(id, profile) } func (manager *MemberManagerCtx) Logout(id string) error { + manager.sessionMu.Lock() + defer manager.sessionMu.Unlock() + if _, ok := manager.sessions.Get(id); !ok { return fmt.Errorf("session not found") } From 900ae006b894116ddc947dead1035d4b2d3e6944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 Mar 2021 20:26:58 +0100 Subject: [PATCH 433/876] fmt. --- internal/api/members/controler.go | 10 +++++----- internal/member/file/provider.go | 2 +- internal/member/manager.go | 2 +- internal/member/object/provider.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 3ed94df7..76c01694 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -1,16 +1,16 @@ package members import ( - "strconv" "net/http" + "strconv" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" ) type MemberDataPayload struct { - ID string `json:"id"` - Profile types.MemberProfile `json:"profile"` + ID string `json:"id"` + Profile types.MemberProfile `json:"profile"` } type MemberCreatePayload struct { @@ -65,7 +65,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { CanAccessClipboard: true, }, } - + if !utils.HttpJsonRequest(w, r, data) { return } @@ -85,7 +85,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { utils.HttpInternalServerError(w, err) return } - + utils.HttpSuccess(w, MemberDataPayload{ ID: id, Profile: data.Profile, diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index 6ec004bf..e6435051 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -61,7 +61,7 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof entries[id] = MemberEntry{ // TODO: Use hash function. Password: password, - Profile: profile, + Profile: profile, } return id, provider.serialize(entries) diff --git a/internal/member/manager.go b/internal/member/manager.go index fd502dea..2938d75d 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -36,7 +36,7 @@ func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx default: manager.provider = dummy.New() } - + return manager } diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index 7cfa1dde..8a194b2c 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -83,7 +83,7 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof provider.entries[id] = &MemberEntry{ // TODO: Use hash function. Password: password, - Profile: profile, + Profile: profile, } return id, nil From edfe9adde0c03517106745488a745176a89d321e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 15 Mar 2021 13:01:35 +0100 Subject: [PATCH 434/876] change authorization methods request priorities. --- internal/session/auth.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/session/auth.go b/internal/session/auth.go index e98c755f..99725cee 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -27,12 +27,6 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, } func getToken(r *http.Request) (string, bool) { - // get from Cookie - cookie, err := r.Cookie("NEKO_SESSION") - if err == nil { - return cookie.Value, true - } - // get from Header reqToken := r.Header.Get("Authorization") splitToken := strings.Split(reqToken, "Bearer ") @@ -40,6 +34,12 @@ func getToken(r *http.Request) (string, bool) { return strings.TrimSpace(splitToken[1]), true } + // get from Cookie + cookie, err := r.Cookie("NEKO_SESSION") + if err == nil { + return cookie.Value, true + } + // get from URL token := r.URL.Query().Get("token") if token != "" { From 45c9d0c1204362ae172fdcd0ddc5685a0be4f9d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 15 Mar 2021 13:34:14 +0100 Subject: [PATCH 435/876] add API TOKEN to sessions. --- internal/config/session.go | 7 +++++++ internal/session/manager.go | 33 ++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/internal/config/session.go b/internal/config/session.go index b7de9c84..06664165 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -7,6 +7,7 @@ import ( type Session struct { ImplicitHosting bool + APIToken string } func (Session) Init(cmd *cobra.Command) error { @@ -15,9 +16,15 @@ func (Session) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().String("api_token", "", "API token for interacting with external services") + if err := viper.BindPFlag("api_token", cmd.PersistentFlags().Lookup("api_token")); err != nil { + return err + } + return nil } func (s *Session) Set() { s.ImplicitHosting = viper.GetBool("implicit_hosting") + s.APIToken = viper.GetString("api_token") } diff --git a/internal/session/manager.go b/internal/session/manager.go index eeacce0f..e4e82f0a 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -14,7 +14,7 @@ import ( ) func New(config *config.Session) *SessionManagerCtx { - return &SessionManagerCtx{ + manager := &SessionManagerCtx{ logger: log.With().Str("module", "session").Logger(), config: config, host: nil, @@ -24,6 +24,23 @@ func New(config *config.Session) *SessionManagerCtx { sessionsMu: sync.Mutex{}, emmiter: events.New(), } + + // create API session + if config.APIToken != "" { + manager.apiSession = &SessionCtx{ + id: "API", + token: config.APIToken, + manager: manager, + logger: manager.logger.With().Str("session_id", "API").Logger(), + profile: types.MemberProfile{ + Name: "API Session", + IsAdmin: true, + CanLogin: true, + }, + } + } + + return manager } type SessionManagerCtx struct { @@ -35,6 +52,7 @@ type SessionManagerCtx struct { sessions map[string]*SessionCtx sessionsMu sync.Mutex emmiter events.EventEmmiter + apiSession *SessionCtx } func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, string, error) { @@ -58,7 +76,7 @@ func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) id: id, token: token, manager: manager, - logger: manager.logger.With().Str("id", id).Logger(), + logger: manager.logger.With().Str("session_id", id).Logger(), profile: profile, } @@ -124,11 +142,16 @@ func (manager *SessionManagerCtx) GetByToken(token string) (types.Session, bool) id, ok := manager.tokens[token] manager.sessionsMu.Unlock() - if !ok { - return nil, false + if ok { + return manager.Get(id) } - return manager.Get(id) + // is API session + if manager.apiSession != nil && manager.apiSession.token == token { + return manager.apiSession, true + } + + return nil, false } func (manager *SessionManagerCtx) List() []types.Session { From 0824c24bf610d6b90e6ef3d6f1e5269a3da6b384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 15 Mar 2021 16:28:38 +0100 Subject: [PATCH 436/876] add more privileges to API user. --- internal/session/manager.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index e4e82f0a..f418a6a4 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -33,9 +33,13 @@ func New(config *config.Session) *SessionManagerCtx { manager: manager, logger: manager.logger.With().Str("session_id", "API").Logger(), profile: types.MemberProfile{ - Name: "API Session", - IsAdmin: true, - CanLogin: true, + Name: "API Session", + IsAdmin: true, + CanLogin: true, + CanConnect: false, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, }, } } From a1be9002f7798384a43a97c9f14d09dad4baeda7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 15 Mar 2021 16:34:13 +0100 Subject: [PATCH 437/876] ICE servers as URIs with auth. --- internal/webrtc/manager.go | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 10a66706..49a597e8 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -3,6 +3,7 @@ package webrtc import ( "fmt" "io" + "net/url" "strings" "sync" "time" @@ -423,6 +424,35 @@ func (manager *WebRTCManagerCtx) apiConfiguration() *webrtc.Configuration { } } + ICEServers := []webrtc.ICEServer{} + for _, server := range manager.config.ICEServers { + u, err := url.Parse(server) + + // if it is not valid URL, just pass it down + if err != nil { + ICEServers = append(ICEServers, webrtc.ICEServer{ + URLs: []string{server}, + }) + continue + } + + var pwdInt interface{} + pwd, ok := u.User.Password() + if ok { + pwdInt = pwd + } else { + pwdInt = false + } + + ICEServers = append(ICEServers, webrtc.ICEServer{ + URLs: []string{ + u.Scheme + ":" + u.Host + u.Path + "?" + u.RawQuery, + }, + Username: u.User.Username(), + Credential: pwdInt, + }) + } + return &webrtc.Configuration{ ICEServers: []webrtc.ICEServer{ { From 3c3f50af681fd0669de7fad3c6787c3603edaf0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 15 Mar 2021 16:40:03 +0100 Subject: [PATCH 438/876] webrtc use ICEServers. --- internal/webrtc/manager.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 49a597e8..1d147e1c 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -454,11 +454,7 @@ func (manager *WebRTCManagerCtx) apiConfiguration() *webrtc.Configuration { } return &webrtc.Configuration{ - ICEServers: []webrtc.ICEServer{ - { - URLs: manager.config.ICEServers, - }, - }, + ICEServers: ICEServers, SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, } } From fd075972626387ab4f0489a6b7e43cb9a318fced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 15 Mar 2021 17:15:34 +0100 Subject: [PATCH 439/876] Revert "webrtc use ICEServers." --- internal/webrtc/manager.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 1d147e1c..49a597e8 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -454,7 +454,11 @@ func (manager *WebRTCManagerCtx) apiConfiguration() *webrtc.Configuration { } return &webrtc.Configuration{ - ICEServers: ICEServers, + ICEServers: []webrtc.ICEServer{ + { + URLs: manager.config.ICEServers, + }, + }, SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, } } From c8328a56c05e29cf0070f368256efee84a5b25f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 15 Mar 2021 17:15:58 +0100 Subject: [PATCH 440/876] Revert "ICE servers as URIs with auth." --- internal/webrtc/manager.go | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 49a597e8..10a66706 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -3,7 +3,6 @@ package webrtc import ( "fmt" "io" - "net/url" "strings" "sync" "time" @@ -424,35 +423,6 @@ func (manager *WebRTCManagerCtx) apiConfiguration() *webrtc.Configuration { } } - ICEServers := []webrtc.ICEServer{} - for _, server := range manager.config.ICEServers { - u, err := url.Parse(server) - - // if it is not valid URL, just pass it down - if err != nil { - ICEServers = append(ICEServers, webrtc.ICEServer{ - URLs: []string{server}, - }) - continue - } - - var pwdInt interface{} - pwd, ok := u.User.Password() - if ok { - pwdInt = pwd - } else { - pwdInt = false - } - - ICEServers = append(ICEServers, webrtc.ICEServer{ - URLs: []string{ - u.Scheme + ":" + u.Host + u.Path + "?" + u.RawQuery, - }, - Username: u.User.Username(), - Credential: pwdInt, - }) - } - return &webrtc.Configuration{ ICEServers: []webrtc.ICEServer{ { From 0270939ee20918d8a2cd49b0b161ec25066dbc8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 10:16:57 +0100 Subject: [PATCH 441/876] version 1.3.0. --- neko.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neko.go b/neko.go index 48edad16..4448dfe4 100644 --- a/neko.go +++ b/neko.go @@ -39,11 +39,11 @@ var ( // gitBranch = "dev" - // Major version when you make incompatible API changes, + // Major version when you make incompatible API changes. major = "dev" - // Minor version when you add functionality in a backwards-compatible manner, and + // Minor version when you add functionality in a backwards-compatible manner. minor = "dev" - // Patch version when you make backwards-compatible bug fixeneko. + // Patch version when you make backwards-compatible bug fixes. patch = "dev" ) From 3b0c16b30890fd3125eac86d4c9d5a0f2ab9b5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 10:22:03 +0100 Subject: [PATCH 442/876] handler: include event in error. --- internal/websocket/handler/handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 6e8ac8df..fab9b25f 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -113,7 +113,7 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { } if err != nil { - h.logger.Error().Err(err).Msg("message handler has failed") + h.logger.Error().Err(err).Str("event", header.Event).Msg("message handler has failed") } return true From 971e3bff4e76e0722f4a55c18f8ce4127d8f4b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 10:25:13 +0100 Subject: [PATCH 443/876] handler: log unknown event. --- internal/websocket/handler/handler.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index fab9b25f..ae915480 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -109,6 +109,7 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { return h.sendBroadcast(session, payload) }) default: + h.logger.Warn().Str("event", header.Event).Msg("unknown message event") return false } From 58d029f455e58123d1dba8a7e073c59a3ea37fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 10:45:22 +0100 Subject: [PATCH 444/876] WS upgrade no returning error. --- internal/http/manager.go | 1 - internal/types/websocket.go | 2 +- internal/websocket/manager.go | 35 +++++++++++++++++++++++++---------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/internal/http/manager.go b/internal/http/manager.go index 185df234..6084eb52 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -44,7 +44,6 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c router.Route("/api", ApiManager.Route) router.Get("/api/ws", func(w http.ResponseWriter, r *http.Request) { - //nolint WebSocketManager.Upgrade(w, r, func(r *http.Request) bool { return conf.AllowOrigin(r.Header.Get("Origin")) }) diff --git a/internal/types/websocket.go b/internal/types/websocket.go index 154d5b74..9953b598 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -15,5 +15,5 @@ type WebSocketManager interface { Start() Shutdown() error AddHandler(handler HandlerFunction) - Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin CheckOrigin) error + Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin CheckOrigin) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index f8a95e58..e3a0b76d 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -138,7 +138,7 @@ func (manager *WebSocketManagerCtx) AddHandler(handler types.HandlerFunction) { manager.handlers = append(manager.handlers, handler) } -func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin types.CheckOrigin) error { +func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin types.CheckOrigin) { manager.logger.Debug().Msg("attempting to upgrade connection") upgrader := websocket.Upgrader{ @@ -148,12 +148,12 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque connection, err := upgrader.Upgrade(w, r, nil) if err != nil { manager.logger.Error().Err(err).Msg("failed to upgrade connection") - return err + return } session, err := manager.sessions.Authenticate(r) if err != nil { - manager.logger.Warn().Err(err).Msg("authentication failed") + manager.logger.Debug().Err(err).Msg("authentication failed") // TODO: Refactor, return error code. if err = connection.WriteJSON( @@ -161,36 +161,52 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque Event: event.SYSTEM_DISCONNECT, Message: err.Error(), }); err != nil { - manager.logger.Error().Err(err).Msg("failed to send disconnect") + manager.logger.Error().Err(err).Msg("failed to send disconnect event") } - return connection.Close() + if err := connection.Close(); err != nil { + manager.logger.Warn().Err(err).Msg("connection closed with an error") + } + + return } if !session.Profile().CanConnect { + manager.logger.Debug().Str("session_id", session.ID()).Msg("connection disabled") + // TODO: Refactor, return error code. if err = connection.WriteJSON( message.SystemDisconnect{ Event: event.SYSTEM_DISCONNECT, Message: "connection disabled", }); err != nil { - manager.logger.Error().Err(err).Msg("failed to send disconnect") + manager.logger.Error().Err(err).Msg("failed to send disconnect event") } - return connection.Close() + if err := connection.Close(); err != nil { + manager.logger.Warn().Err(err).Msg("connection closed with an error") + } + + return } if session.State().IsConnected { + manager.logger.Debug().Str("session_id", session.ID()).Msg("already connected") + // TODO: Refactor, return error code. if err = connection.WriteJSON( message.SystemDisconnect{ Event: event.SYSTEM_DISCONNECT, Message: "already connected", }); err != nil { - manager.logger.Error().Err(err).Msg("failed to send disconnect") + manager.logger.Error().Err(err).Msg("failed to send disconnect event") } - return connection.Close() + if err := connection.Close(); err != nil { + manager.logger.Warn().Err(err).Msg("connection closed with an error") + } + + return } session.SetWebSocketPeer(&WebSocketPeerCtx{ @@ -218,7 +234,6 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque }() manager.handle(connection, session) - return nil } func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session types.Session) { From a9aa62f062d40553535117f6a8bb1ab31d6da1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 10:53:03 +0100 Subject: [PATCH 445/876] lint & logging fixes. --- internal/member/manager.go | 6 ++++-- internal/session/manager.go | 5 +---- internal/websocket/filechooserdialog.go | 2 +- internal/websocket/handler/keyboard.go | 1 + internal/websocket/handler/send.go | 1 + internal/websocket/handler/signal.go | 7 ++++--- internal/websocket/handler/system.go | 5 ++--- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/internal/member/manager.go b/internal/member/manager.go index 2938d75d..dcb5eb32 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -149,8 +149,10 @@ func (manager *MemberManagerCtx) Login(username string, password string) (types. return nil, "", fmt.Errorf("session is already connected") } - // delete existing session - manager.sessions.Delete(id) + // TODO: Replace session. + if err := manager.sessions.Delete(id); err != nil { + return nil, "", err + } } return manager.sessions.Create(id, profile) diff --git a/internal/session/manager.go b/internal/session/manager.go index f418a6a4..7c50268c 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -117,10 +117,7 @@ func (manager *SessionManagerCtx) Delete(id string) error { return fmt.Errorf("Session id not found.") } - if _, ok := manager.tokens[session.token]; ok { - delete(manager.tokens, session.token) - } - + delete(manager.tokens, session.token) delete(manager.sessions, id) manager.sessionsMu.Unlock() diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index 08bd0762..ea732a12 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -50,8 +50,8 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { ID: activeSession.ID(), }); err != nil { manager.logger.Warn(). - Str("session_id", session.ID()). Err(err). + Str("session_id", session.ID()). Msgf("could not send event `%s` to session", event.FILE_CHOOSER_DIALOG_OPENED) } }) diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 0e706333..112552ee 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -27,5 +27,6 @@ func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *me NumLock: payload.NumLock, CapsLock: payload.CapsLock, }) + return nil } diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index 4c6a1b7a..70e2763e 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -29,5 +29,6 @@ func (h *MessageHandlerCtx) sendBroadcast(session types.Session, payload *messag Subject: payload.Subject, Body: payload.Body, }, []string{session.ID()}) + return nil } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 22bc8786..3c390ab1 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -8,6 +8,7 @@ import ( func (h *MessageHandlerCtx) signalRequest(session types.Session) error { if !session.Profile().CanWatch { + h.logger.Debug().Str("session_id", session.ID()).Msg("not allowed to watch") return nil } @@ -33,7 +34,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { peer := session.GetWebRTCPeer() if peer == nil { - h.logger.Debug().Msg("webRTC peer does not exist") + h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") return nil } @@ -43,7 +44,7 @@ func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *message.SignalCandidate) error { peer := session.GetWebRTCPeer() if peer == nil { - h.logger.Debug().Msg("webRTC peer does not exist") + h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") return nil } @@ -53,7 +54,7 @@ func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *mess func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message.SignalVideo) error { peer := session.GetWebRTCPeer() if peer == nil { - h.logger.Debug().Msg("webRTC peer does not exist") + h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") return nil } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index e9849c07..b2279ca7 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -23,7 +23,6 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return nil } - // TODO: Sessions. sessions := map[string]message.SessionData{} for _, session := range h.sessions.List() { sessionId := session.ID() @@ -52,11 +51,11 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { screenSizesList := []message.ScreenSize{} for _, size := range h.desktop.ScreenConfigurations() { - for _, fps := range size.Rates { + for _, rate := range size.Rates { screenSizesList = append(screenSizesList, message.ScreenSize{ Width: size.Width, Height: size.Height, - Rate: fps, + Rate: rate, }) } } From 0b4c6f50aa0e1284be0a9848ed73386f68f7a551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 13:57:43 +0100 Subject: [PATCH 446/876] remove leftover code. --- internal/websocket/manager.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index e3a0b76d..9bf9bbab 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -40,7 +40,6 @@ type WebSocketManagerCtx struct { desktop types.DesktopManager handler *handler.MessageHandlerCtx handlers []types.HandlerFunction - shutdown chan bool } func (manager *WebSocketManagerCtx) Start() { @@ -130,7 +129,6 @@ func (manager *WebSocketManagerCtx) Start() { } func (manager *WebSocketManagerCtx) Shutdown() error { - manager.shutdown <- true return nil } From a74bf9986b3aafc89bcbaba5aa2508c23341c7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 14:08:38 +0100 Subject: [PATCH 447/876] supervisord kill neko with SIGINT. --- runtime/supervisord.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf index 61c505c3..e27d23f5 100644 --- a/runtime/supervisord.conf +++ b/runtime/supervisord.conf @@ -44,6 +44,8 @@ redirect_stderr=true [program:neko] environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" command=/usr/bin/neko serve +stopsignal=INT +stopwaitsecs=3 autorestart=true priority=800 user=%(ENV_USER)s From 524d895db8aa4b76477b68c6ba29553dc8d1ab05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 15:24:58 +0100 Subject: [PATCH 448/876] scope config variables. --- Dockerfile | 2 +- cmd/root.go | 2 + internal/capture/manager.go | 2 +- internal/config/capture.go | 78 ++++++++++++++++--------------------- internal/config/desktop.go | 6 +-- internal/config/member.go | 42 ++++++++++++-------- internal/config/server.go | 38 +++++++----------- internal/config/session.go | 12 +++--- internal/config/webrtc.go | 36 ++++++++--------- internal/member/manager.go | 4 +- 10 files changed, 107 insertions(+), 115 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9491939e..77c85932 100644 --- a/Dockerfile +++ b/Dockerfile @@ -104,7 +104,7 @@ COPY runtime/icon-theme /home/$USERNAME/.icons/default # set default envs ENV USER=$USERNAME ENV DISPLAY=:99.0 -ENV NEKO_BIND=:8080 +ENV NEKO_SERVER_BIND=:8080 # # copy executabe from previous stage diff --git a/cmd/root.go b/cmd/root.go index 41835a9c..f6e9e395 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,6 +6,7 @@ import ( "os" "path/filepath" "runtime" + "strings" "time" "github.com/rs/zerolog" @@ -93,6 +94,7 @@ func init() { } viper.SetEnvPrefix("NEKO") + viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) viper.AutomaticEnv() // read in environment variables that match if err := viper.ReadInConfig(); err != nil { diff --git a/internal/capture/manager.go b/internal/capture/manager.go index d24d17b9..6e6950a8 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -62,7 +62,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt desktop: desktop, streaming: false, broadcast: broadcastNew(broadcastPipeline), - screencast: screencastNew(config.Screencast, screencastPipeline), + screencast: screencastNew(config.ScreencastEnabled, screencastPipeline), audio: streamNew(config.AudioCodec, func() string { if config.AudioPipeline != "" { return config.AudioPipeline diff --git a/internal/config/capture.go b/internal/config/capture.go index 0638fc9b..52eac0da 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -3,6 +3,7 @@ package config import ( "os" + "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -18,7 +19,7 @@ type Capture struct { BroadcastPipeline string - Screencast bool + ScreencastEnabled bool ScreencastRate string ScreencastQuality string ScreencastPipeline string @@ -26,60 +27,45 @@ type Capture struct { func (Capture) Init(cmd *cobra.Command) error { // audio - cmd.PersistentFlags().String("audio_device", "auto_null.monitor", "audio device to capture") - if err := viper.BindPFlag("audio_device", cmd.PersistentFlags().Lookup("audio_device")); err != nil { + cmd.PersistentFlags().String("capture.audio.device", "auto_null.monitor", "audio device to capture") + if err := viper.BindPFlag("capture.audio.device", cmd.PersistentFlags().Lookup("capture.audio.device")); err != nil { return err } - cmd.PersistentFlags().String("audio_pipeline", "", "gstreamer pipeline used for audio streaming") - if err := viper.BindPFlag("audio_pipeline", cmd.PersistentFlags().Lookup("audio_pipeline")); err != nil { + cmd.PersistentFlags().String("capture.audio.codec", "opus", "audio codec to be used") + if err := viper.BindPFlag("capture.audio.codec", cmd.PersistentFlags().Lookup("capture.audio.codec")); err != nil { return err } - cmd.PersistentFlags().Bool("opus", false, "use Opus audio codec") - if err := viper.BindPFlag("opus", cmd.PersistentFlags().Lookup("opus")); err != nil { - return err - } - - cmd.PersistentFlags().Bool("g722", false, "use G722 audio codec") - if err := viper.BindPFlag("g722", cmd.PersistentFlags().Lookup("g722")); err != nil { - return err - } - - cmd.PersistentFlags().Bool("pcmu", false, "use PCMU audio codec") - if err := viper.BindPFlag("pcmu", cmd.PersistentFlags().Lookup("pcmu")); err != nil { - return err - } - - cmd.PersistentFlags().Bool("pcma", false, "use PCMA audio codec") - if err := viper.BindPFlag("pcma", cmd.PersistentFlags().Lookup("pcma")); err != nil { + cmd.PersistentFlags().String("capture.audio.pipeline", "", "gstreamer pipeline used for audio streaming") + if err := viper.BindPFlag("capture.audio.pipeline", cmd.PersistentFlags().Lookup("capture.audio.pipeline")); err != nil { return err } // broadcast - cmd.PersistentFlags().String("broadcast_pipeline", "", "gstreamer pipeline used for broadcasting") - if err := viper.BindPFlag("broadcast_pipeline", cmd.PersistentFlags().Lookup("broadcast_pipeline")); err != nil { + cmd.PersistentFlags().String("capture.broadcast.pipeline", "", "gstreamer pipeline used for broadcasting") + if err := viper.BindPFlag("capture.broadcast.pipeline", cmd.PersistentFlags().Lookup("capture.broadcast.pipeline")); err != nil { return err } // screencast - cmd.PersistentFlags().Bool("screencast", false, "enable screencast") - if err := viper.BindPFlag("screencast", cmd.PersistentFlags().Lookup("screencast")); err != nil { + cmd.PersistentFlags().Bool("capture.screencast.enabled", false, "enable screencast") + if err := viper.BindPFlag("capture.screencast.enabled", cmd.PersistentFlags().Lookup("capture.screencast.enabled")); err != nil { return err } - cmd.PersistentFlags().String("screencast_rate", "10/1", "screencast frame rate") - if err := viper.BindPFlag("screencast_rate", cmd.PersistentFlags().Lookup("screencast_rate")); err != nil { + cmd.PersistentFlags().String("capture.screencast.rate", "10/1", "screencast frame rate") + if err := viper.BindPFlag("capture.screencast.rate", cmd.PersistentFlags().Lookup("capture.screencast.rate")); err != nil { return err } - cmd.PersistentFlags().String("screencast_quality", "60", "screencast JPEG quality") - if err := viper.BindPFlag("screencast_quality", cmd.PersistentFlags().Lookup("screencast_quality")); err != nil { + cmd.PersistentFlags().String("capture.screencast.quality", "60", "screencast JPEG quality") + if err := viper.BindPFlag("capture.screencast.quality", cmd.PersistentFlags().Lookup("capture.screencast.quality")); err != nil { return err } - cmd.PersistentFlags().String("screencast_pipeline", "", "gstreamer pipeline used for screencasting") - if err := viper.BindPFlag("screencast_pipeline", cmd.PersistentFlags().Lookup("screencast_pipeline")); err != nil { + cmd.PersistentFlags().String("capture.screencast.pipeline", "", "gstreamer pipeline used for screencasting") + if err := viper.BindPFlag("capture.screencast.pipeline", cmd.PersistentFlags().Lookup("capture.screencast.pipeline")); err != nil { return err } @@ -90,26 +76,28 @@ func (s *Capture) Set() { // Display is provided by env variable s.Display = os.Getenv("DISPLAY") - s.AudioDevice = viper.GetString("audio_device") - s.AudioPipeline = viper.GetString("audio_pipeline") + s.AudioDevice = viper.GetString("capture.audio.device") + s.AudioPipeline = viper.GetString("capture.audio.pipeline") - if viper.GetBool("opus") { + audioCodec := viper.GetString("capture.audio.codec") + switch audioCodec { + case "opus": s.AudioCodec = codec.Opus() - } else if viper.GetBool("g722") { + case "g722": s.AudioCodec = codec.G722() - } else if viper.GetBool("pcmu") { + case "pcmu": s.AudioCodec = codec.PCMU() - } else if viper.GetBool("pcma") { + case "pcma": s.AudioCodec = codec.PCMA() - } else { - // default + default: + log.Warn().Str("codec", audioCodec).Msgf("unknown audio codec, using Opus") s.AudioCodec = codec.Opus() } - s.BroadcastPipeline = viper.GetString("broadcast_pipeline") + s.BroadcastPipeline = viper.GetString("capturebroadcast.pipeline") - s.Screencast = viper.GetBool("screencast") - s.ScreencastRate = viper.GetString("screencast_rate") - s.ScreencastQuality = viper.GetString("screencast_quality") - s.ScreencastPipeline = viper.GetString("screencast_pipeline") + s.ScreencastEnabled = viper.GetBool("capture.screencast.enabled") + s.ScreencastRate = viper.GetString("capture.screencast.rate") + s.ScreencastQuality = viper.GetString("capture.screencast.quality") + s.ScreencastPipeline = viper.GetString("capture.screencast.pipeline") } diff --git a/internal/config/desktop.go b/internal/config/desktop.go index 416924df..8dfe1d61 100644 --- a/internal/config/desktop.go +++ b/internal/config/desktop.go @@ -18,8 +18,8 @@ type Desktop struct { } func (Desktop) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().String("screen", "1280x720@30", "default screen size and framerate") - if err := viper.BindPFlag("screen", cmd.PersistentFlags().Lookup("screen")); err != nil { + cmd.PersistentFlags().String("desktop.screen", "1280x720@30", "default screen size and framerate") + if err := viper.BindPFlag("desktop.screen", cmd.PersistentFlags().Lookup("desktop.screen")); err != nil { return err } @@ -35,7 +35,7 @@ func (s *Desktop) Set() { s.ScreenRate = 30 r := regexp.MustCompile(`([0-9]{1,4})x([0-9]{1,4})@([0-9]{1,3})`) - res := r.FindStringSubmatch(viper.GetString("screen")) + res := r.FindStringSubmatch(viper.GetString("desktop.screen")) if len(res) > 0 { width, err1 := strconv.ParseInt(res[1], 10, 64) diff --git a/internal/config/member.go b/internal/config/member.go index 445d0bb4..2875c8f7 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -6,30 +6,36 @@ import ( ) type Member struct { - Provider string - FilePath string - Password string - AdminPassword string + Provider string + + // file provider + FilePath string + + // object provider + ObjectUserPassword string + ObjectAdminPassword string } func (Member) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().String("members_provider", "object", "choose members provider") - if err := viper.BindPFlag("members_provider", cmd.PersistentFlags().Lookup("members_provider")); err != nil { + cmd.PersistentFlags().String("member.provider", "object", "choose member provider") + if err := viper.BindPFlag("member.provider", cmd.PersistentFlags().Lookup("member.provider")); err != nil { return err } - cmd.PersistentFlags().String("members_file_path", "", "mebmer file provider path") - if err := viper.BindPFlag("members_file_path", cmd.PersistentFlags().Lookup("members_file_path")); err != nil { + // file provider + cmd.PersistentFlags().String("member.file.path", "", "member file provider: storage path") + if err := viper.BindPFlag("member.file.path", cmd.PersistentFlags().Lookup("member.file.path")); err != nil { return err } - cmd.PersistentFlags().String("password", "neko", "password for connecting to stream") - if err := viper.BindPFlag("password", cmd.PersistentFlags().Lookup("password")); err != nil { + // object provider + cmd.PersistentFlags().String("member.object.user_password", "", "member object provider: user password") + if err := viper.BindPFlag("member.object.user_password", cmd.PersistentFlags().Lookup("member.object.user_password")); err != nil { return err } - cmd.PersistentFlags().String("password_admin", "admin", "admin password for connecting to stream") - if err := viper.BindPFlag("password_admin", cmd.PersistentFlags().Lookup("password_admin")); err != nil { + cmd.PersistentFlags().String("member.object.admin_password", "", "member object provider: admin password") + if err := viper.BindPFlag("member.object.admin_password", cmd.PersistentFlags().Lookup("member.object.admin_password")); err != nil { return err } @@ -37,8 +43,12 @@ func (Member) Init(cmd *cobra.Command) error { } func (s *Member) Set() { - s.Provider = viper.GetString("members_provider") - s.FilePath = viper.GetString("members_file_path") - s.Password = viper.GetString("password") - s.AdminPassword = viper.GetString("password_admin") + s.Provider = viper.GetString("member.provider") + + // file provider + s.FilePath = viper.GetString("member.file.path") + + // object provider + s.ObjectUserPassword = viper.GetString("member.object.user_password") + s.ObjectAdminPassword = viper.GetString("member.object.admin_password") } diff --git a/internal/config/server.go b/internal/config/server.go index a093ec65..c98e2337 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -13,56 +13,48 @@ type Server struct { Bind string Static string CORS []string - //Proxy bool } func (Server) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().String("bind", "127.0.0.1:8080", "address/port/socket to serve neko") - if err := viper.BindPFlag("bind", cmd.PersistentFlags().Lookup("bind")); err != nil { + cmd.PersistentFlags().String("server.bind", "127.0.0.1:8080", "address/port/socket to serve neko") + if err := viper.BindPFlag("server.bind", cmd.PersistentFlags().Lookup("server.bind")); err != nil { return err } - cmd.PersistentFlags().String("cert", "", "path to the SSL cert used to secure the neko server") - if err := viper.BindPFlag("cert", cmd.PersistentFlags().Lookup("cert")); err != nil { + cmd.PersistentFlags().String("server.cert", "", "path to the SSL cert used to secure the neko server") + if err := viper.BindPFlag("server.cert", cmd.PersistentFlags().Lookup("server.cert")); err != nil { return err } - cmd.PersistentFlags().String("key", "", "path to the SSL key used to secure the neko server") - if err := viper.BindPFlag("key", cmd.PersistentFlags().Lookup("key")); err != nil { + cmd.PersistentFlags().String("server.key", "", "path to the SSL key used to secure the neko server") + if err := viper.BindPFlag("server.key", cmd.PersistentFlags().Lookup("server.key")); err != nil { return err } - cmd.PersistentFlags().String("static", "", "path to neko client files to serve") - if err := viper.BindPFlag("static", cmd.PersistentFlags().Lookup("static")); err != nil { + cmd.PersistentFlags().String("server.static", "", "path to neko client files to serve") + if err := viper.BindPFlag("server.static", cmd.PersistentFlags().Lookup("server.static")); err != nil { return err } - cmd.PersistentFlags().StringSlice("cors", []string{"*"}, "list of allowed origins for CORS") - if err := viper.BindPFlag("cors", cmd.PersistentFlags().Lookup("cors")); err != nil { + cmd.PersistentFlags().StringSlice("server.cors", []string{"*"}, "list of allowed origins for CORS") + if err := viper.BindPFlag("server.cors", cmd.PersistentFlags().Lookup("server.cors")); err != nil { return err } - //cmd.PersistentFlags().Bool("proxy", false, "allow reverse proxies") - //if err := viper.BindPFlag("proxy", cmd.PersistentFlags().Lookup("proxy")); err != nil { - // return err - //} - return nil } func (s *Server) Set() { - s.Cert = viper.GetString("cert") - s.Key = viper.GetString("key") - s.Bind = viper.GetString("bind") - s.Static = viper.GetString("static") + s.Cert = viper.GetString("server.cert") + s.Key = viper.GetString("server.key") + s.Bind = viper.GetString("server.bind") + s.Static = viper.GetString("server.static") - s.CORS = viper.GetStringSlice("cors") + s.CORS = viper.GetStringSlice("server.cors") in, _ := utils.ArrayIn("*", s.CORS) if len(s.CORS) == 0 || in { s.CORS = []string{"*"} } - - //s.Proxy = viper.GetBool("proxy") } func (s *Server) AllowOrigin(origin string) bool { diff --git a/internal/config/session.go b/internal/config/session.go index 06664165..7fd88478 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -11,13 +11,13 @@ type Session struct { } func (Session) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().Bool("implicit_hosting", true, "allow implicit control switching") - if err := viper.BindPFlag("implicit_hosting", cmd.PersistentFlags().Lookup("implicit_hosting")); err != nil { + cmd.PersistentFlags().Bool("session.implicit_hosting", true, "allow implicit control switching") + if err := viper.BindPFlag("session.implicit_hosting", cmd.PersistentFlags().Lookup("session.implicit_hosting")); err != nil { return err } - cmd.PersistentFlags().String("api_token", "", "API token for interacting with external services") - if err := viper.BindPFlag("api_token", cmd.PersistentFlags().Lookup("api_token")); err != nil { + cmd.PersistentFlags().String("session.api_token", "", "API token for interacting with external services") + if err := viper.BindPFlag("session.api_token", cmd.PersistentFlags().Lookup("session.api_token")); err != nil { return err } @@ -25,6 +25,6 @@ func (Session) Init(cmd *cobra.Command) error { } func (s *Session) Set() { - s.ImplicitHosting = viper.GetBool("implicit_hosting") - s.APIToken = viper.GetString("api_token") + s.ImplicitHosting = viper.GetBool("session.implicit_hosting") + s.APIToken = viper.GetString("session.api_token") } diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 616081e2..d51383ca 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -29,33 +29,33 @@ const ( ) func (WebRTC) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().Bool("icelite", false, "configures whether or not the ice agent should be a lite agent") - if err := viper.BindPFlag("icelite", cmd.PersistentFlags().Lookup("icelite")); err != nil { + cmd.PersistentFlags().Bool("webrtc.icelite", false, "configures whether or not the ICE agent should be a lite agent") + if err := viper.BindPFlag("webrtc.icelite", cmd.PersistentFlags().Lookup("webrtc.icelite")); err != nil { return err } - cmd.PersistentFlags().Bool("icetrickle", true, "configures whether cadidates should be sent asynchronously using Trickle ICE") - if err := viper.BindPFlag("icetrickle", cmd.PersistentFlags().Lookup("icetrickle")); err != nil { + cmd.PersistentFlags().Bool("webrtc.icetrickle", true, "configures whether cadidates should be sent asynchronously using Trickle ICE") + if err := viper.BindPFlag("webrtc.icetrickle", cmd.PersistentFlags().Lookup("webrtc.icetrickle")); err != nil { return err } - cmd.PersistentFlags().StringSlice("iceserver", []string{"stun:stun.l.google.com:19302"}, "describes a single STUN and TURN server that can be used by the ICEAgent to establish a connection with a peer") - if err := viper.BindPFlag("iceserver", cmd.PersistentFlags().Lookup("iceserver")); err != nil { + cmd.PersistentFlags().StringSlice("webrtc.iceserver", []string{"stun:stun.l.google.com:19302"}, "describes a single STUN and TURN server that can be used by the ICEAgent to establish a connection with a peer") + if err := viper.BindPFlag("webrtc.iceserver", cmd.PersistentFlags().Lookup("webrtc.iceserver")); err != nil { return err } - cmd.PersistentFlags().StringSlice("nat1to1", []string{}, "sets a list of external IP addresses of 1:1 (D)NAT and a candidate type for which the external IP address is used") - if err := viper.BindPFlag("nat1to1", cmd.PersistentFlags().Lookup("nat1to1")); err != nil { + cmd.PersistentFlags().StringSlice("webrtc.nat1to1", []string{}, "sets a list of external IP addresses of 1:1 (D)NAT and a candidate type for which the external IP address is used") + if err := viper.BindPFlag("webrtc.nat1to1", cmd.PersistentFlags().Lookup("webrtc.nat1to1")); err != nil { return err } - cmd.PersistentFlags().String("ip_retrieval_url", "https://checkip.amazonaws.com", "URL address used for retrieval of the external IP address") - if err := viper.BindPFlag("ip_retrieval_url", cmd.PersistentFlags().Lookup("ip_retrieval_url")); err != nil { + cmd.PersistentFlags().String("webrtc.ip_retrieval_url", "https://checkip.amazonaws.com", "URL address used for retrieval of the external IP address") + if err := viper.BindPFlag("webrtc.ip_retrieval_url", cmd.PersistentFlags().Lookup("webrtc.ip_retrieval_url")); err != nil { return err } - cmd.PersistentFlags().String("epr", fmt.Sprintf("%d-%d", defEprMin, defEprMax), "limits the pool of ephemeral ports that ICE UDP connections can allocate from") - if err := viper.BindPFlag("epr", cmd.PersistentFlags().Lookup("epr")); err != nil { + cmd.PersistentFlags().String("webrtc.epr", fmt.Sprintf("%d-%d", defEprMin, defEprMax), "limits the pool of ephemeral ports that ICE UDP connections can allocate from") + if err := viper.BindPFlag("webrtc.epr", cmd.PersistentFlags().Lookup("webrtc.epr")); err != nil { return err } @@ -63,12 +63,12 @@ func (WebRTC) Init(cmd *cobra.Command) error { } func (s *WebRTC) Set() { - s.ICELite = viper.GetBool("icelite") - s.ICETrickle = viper.GetBool("icetrickle") - s.ICEServers = viper.GetStringSlice("iceserver") + s.ICELite = viper.GetBool("webrtc.icelite") + s.ICETrickle = viper.GetBool("webrtc.icetrickle") + s.ICEServers = viper.GetStringSlice("webrtc.iceserver") - s.NAT1To1IPs = viper.GetStringSlice("nat1to1") - s.IpRetrievalUrl = viper.GetString("ip_retrieval_url") + s.NAT1To1IPs = viper.GetStringSlice("webrtc.nat1to1") + s.IpRetrievalUrl = viper.GetString("webrtc.ip_retrieval_url") if s.IpRetrievalUrl != "" && len(s.NAT1To1IPs) == 0 { ip, err := utils.HttpRequestGET(s.IpRetrievalUrl) if err == nil { @@ -81,7 +81,7 @@ func (s *WebRTC) Set() { min := uint16(defEprMin) max := uint16(defEprMax) - epr := viper.GetString("epr") + epr := viper.GetString("webrtc.epr") ports := strings.SplitN(epr, "-", -1) if len(ports) > 1 { start, err := strconv.ParseUint(ports[0], 10, 16) diff --git a/internal/member/manager.go b/internal/member/manager.go index dcb5eb32..83f2851b 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -28,8 +28,8 @@ func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx }) case "object": manager.provider = object.New(object.Config{ - AdminPassword: config.AdminPassword, - UserPassword: config.Password, + AdminPassword: config.ObjectAdminPassword, + UserPassword: config.ObjectUserPassword, }) case "dummy": fallthrough From 0233daf1255056ac22f51711ac77e8c104af9b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 15:28:40 +0100 Subject: [PATCH 449/876] members: direct providers config. --- internal/config/member.go | 18 +++++++++--------- internal/member/file/provider.go | 4 ++-- internal/member/file/types.go | 2 +- internal/member/manager.go | 9 ++------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/internal/config/member.go b/internal/config/member.go index 2875c8f7..13c4261a 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -3,17 +3,17 @@ package config import ( "github.com/spf13/cobra" "github.com/spf13/viper" + + "demodesk/neko/internal/member/file" + "demodesk/neko/internal/member/object" ) type Member struct { Provider string - // file provider - FilePath string - - // object provider - ObjectUserPassword string - ObjectAdminPassword string + // providers + File file.Config + Object object.Config } func (Member) Init(cmd *cobra.Command) error { @@ -46,9 +46,9 @@ func (s *Member) Set() { s.Provider = viper.GetString("member.provider") // file provider - s.FilePath = viper.GetString("member.file.path") + s.File.Path = viper.GetString("member.file.path") // object provider - s.ObjectUserPassword = viper.GetString("member.object.user_password") - s.ObjectAdminPassword = viper.GetString("member.object.admin_password") + s.Object.UserPassword = viper.GetString("member.object.user_password") + s.Object.AdminPassword = viper.GetString("member.object.admin_password") } diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index e6435051..4a9db72d 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -148,7 +148,7 @@ func (provider *MemberProviderCtx) Delete(id string) error { } func (provider *MemberProviderCtx) deserialize() (map[string]MemberEntry, error) { - file, err := os.OpenFile(provider.config.File, os.O_RDONLY|os.O_CREATE, os.ModePerm) + file, err := os.OpenFile(provider.config.Path, os.O_RDONLY|os.O_CREATE, os.ModePerm) if err != nil { return nil, err } @@ -190,5 +190,5 @@ func (provider *MemberProviderCtx) serialize(data map[string]MemberEntry) error return err } - return ioutil.WriteFile(provider.config.File, raw, os.ModePerm) + return ioutil.WriteFile(provider.config.Path, raw, os.ModePerm) } diff --git a/internal/member/file/types.go b/internal/member/file/types.go index 4a79b652..32ed0b0e 100644 --- a/internal/member/file/types.go +++ b/internal/member/file/types.go @@ -10,5 +10,5 @@ type MemberEntry struct { } type Config struct { - File string + Path string } diff --git a/internal/member/manager.go b/internal/member/manager.go index 83f2851b..f52a417f 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -23,14 +23,9 @@ func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx switch config.Provider { case "file": - manager.provider = file.New(file.Config{ - File: config.FilePath, - }) + manager.provider = file.New(config.File) case "object": - manager.provider = object.New(object.Config{ - AdminPassword: config.ObjectAdminPassword, - UserPassword: config.ObjectUserPassword, - }) + manager.provider = object.New(config.Object) case "dummy": fallthrough default: From c91e500f00027d6e4fc5957c9d0bb6207c1bdb64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 15:38:51 +0100 Subject: [PATCH 450/876] fix dummy member provider. --- .../member/dummy/{manager.go => provider.go} | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) rename internal/member/dummy/{manager.go => provider.go} (66%) diff --git a/internal/member/dummy/manager.go b/internal/member/dummy/provider.go similarity index 66% rename from internal/member/dummy/manager.go rename to internal/member/dummy/provider.go index ff56cf2f..abd7b4f5 100644 --- a/internal/member/dummy/manager.go +++ b/internal/member/dummy/provider.go @@ -7,10 +7,21 @@ import ( ) func New() types.MemberProvider { - return &MemberProviderCtx{} + return &MemberProviderCtx{ + profile: types.MemberProfile{ + IsAdmin: true, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + }, + } } -type MemberProviderCtx struct{} +type MemberProviderCtx struct { + profile types.MemberProfile +} func (provider *MemberProviderCtx) Connect() error { return nil @@ -21,15 +32,8 @@ func (provider *MemberProviderCtx) Disconnect() error { } func (provider *MemberProviderCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { - return username, types.MemberProfile{ - Name: username, - IsAdmin: true, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanAccessClipboard: true, - }, nil + provider.profile.Name = username + return username, provider.profile, nil } func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { @@ -37,15 +41,16 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof } func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { - return types.MemberProfile{}, fmt.Errorf("Not implemented.") + provider.profile.Name = id + return provider.profile, nil } func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { - return map[string]types.MemberProfile{}, fmt.Errorf("Not implemented.") + return map[string]types.MemberProfile{}, nil } func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { - return fmt.Errorf("Not implemented.") + return nil } func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { @@ -53,5 +58,5 @@ func (provider *MemberProviderCtx) UpdatePassword(id string, password string) er } func (provider *MemberProviderCtx) Delete(id string) error { - return fmt.Errorf("Not implemented.") + return nil } From d06a5a2ac78c37335d05e47e5c34e65583cf188d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 17 Mar 2021 11:19:35 +0100 Subject: [PATCH 451/876] typo fix. --- internal/config/capture.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/config/capture.go b/internal/config/capture.go index 52eac0da..095ad736 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -94,7 +94,7 @@ func (s *Capture) Set() { s.AudioCodec = codec.Opus() } - s.BroadcastPipeline = viper.GetString("capturebroadcast.pipeline") + s.BroadcastPipeline = viper.GetString("capture.broadcast.pipeline") s.ScreencastEnabled = viper.GetBool("capture.screencast.enabled") s.ScreencastRate = viper.GetString("capture.screencast.rate") From 4abe0a5dbab076dd091fbe82f8d7676f2a898fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 17 Mar 2021 14:09:10 +0100 Subject: [PATCH 452/876] move cookies to session + config. --- internal/api/session.go | 33 ++------------------------------ internal/config/session.go | 26 +++++++++++++++++++++++++ internal/session/auth.go | 39 +++++++++++++++++++++++++++++++++++--- internal/types/session.go | 2 ++ 4 files changed, 66 insertions(+), 34 deletions(-) diff --git a/internal/api/session.go b/internal/api/session.go index 9cbf9435..e45b8cc3 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -2,17 +2,12 @@ package api import ( "net/http" - "os" - "time" "demodesk/neko/internal/http/auth" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" ) -var CookieExpirationDate = time.Now().Add(365 * 24 * time.Hour) -var UnsecureCookies = os.Getenv("DISABLE_SECURE_COOKIES") == "true" - type SessionLoginPayload struct { Username string `json:"username"` Password string `json:"password"` @@ -36,19 +31,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { return } - sameSite := http.SameSiteNoneMode - if UnsecureCookies { - sameSite = http.SameSiteDefaultMode - } - - http.SetCookie(w, &http.Cookie{ - Name: "NEKO_SESSION", - Value: token, - Expires: CookieExpirationDate, - Secure: !UnsecureCookies, - SameSite: sameSite, - HttpOnly: true, - }) + api.sessions.CookieSetToken(w, token) utils.HttpSuccess(w, SessionDataPayload{ ID: session.ID(), @@ -66,19 +49,7 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { return } - sameSite := http.SameSiteNoneMode - if UnsecureCookies { - sameSite = http.SameSiteDefaultMode - } - - http.SetCookie(w, &http.Cookie{ - Name: "NEKO_SESSION", - Value: "", - Expires: time.Unix(0, 0), - Secure: !UnsecureCookies, - SameSite: sameSite, - HttpOnly: true, - }) + api.sessions.CookieClearToken(w) utils.HttpSuccess(w, true) } diff --git a/internal/config/session.go b/internal/config/session.go index 7fd88478..5cc946c9 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -1,6 +1,8 @@ package config import ( + "time" + "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -8,6 +10,10 @@ import ( type Session struct { ImplicitHosting bool APIToken string + + CookieName string + CookieExpiration time.Time + CookieSecure bool } func (Session) Init(cmd *cobra.Command) error { @@ -21,10 +27,30 @@ func (Session) Init(cmd *cobra.Command) error { return err } + // cookie + cmd.PersistentFlags().String("session.cookie.name", "NEKO_SESSION", "name of the cookie that holds token") + if err := viper.BindPFlag("session.cookie.name", cmd.PersistentFlags().Lookup("session.cookie.name")); err != nil { + return err + } + + cmd.PersistentFlags().Int("session.cookie.expiration", 365*24, "expiration of the cookie in hours") + if err := viper.BindPFlag("session.cookie.expiration", cmd.PersistentFlags().Lookup("session.cookie.expiration")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("session.cookie.secure", true, "use secure cookies") + if err := viper.BindPFlag("session.cookie.secure", cmd.PersistentFlags().Lookup("session.cookie.secure")); err != nil { + return err + } + return nil } func (s *Session) Set() { s.ImplicitHosting = viper.GetBool("session.implicit_hosting") s.APIToken = viper.GetString("session.api_token") + + s.CookieName = viper.GetString("session.cookie.name") + s.CookieExpiration = time.Now().Add(time.Duration(viper.GetInt("session.cookie.expiration")) * time.Hour) + s.CookieSecure = viper.GetBool("session.cookie.secure") } diff --git a/internal/session/auth.go b/internal/session/auth.go index 99725cee..5619a234 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -4,12 +4,45 @@ import ( "fmt" "net/http" "strings" + "time" "demodesk/neko/internal/types" ) +func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token string) { + sameSite := http.SameSiteDefaultMode + if manager.config.CookieSecure { + sameSite = http.SameSiteNoneMode + } + + http.SetCookie(w, &http.Cookie{ + Name: manager.config.CookieName, + Value: token, + Expires: manager.config.CookieExpiration, + Secure: manager.config.CookieSecure, + SameSite: sameSite, + HttpOnly: true, + }) +} + +func (manager *SessionManagerCtx) CookieClearToken(w http.ResponseWriter) { + sameSite := http.SameSiteDefaultMode + if manager.config.CookieSecure { + sameSite = http.SameSiteNoneMode + } + + http.SetCookie(w, &http.Cookie{ + Name: manager.config.CookieName, + Value: "", + Expires: time.Unix(0, 0), + Secure: manager.config.CookieSecure, + SameSite: sameSite, + HttpOnly: true, + }) +} + func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, error) { - token, ok := getToken(r) + token, ok := manager.getToken(r) if !ok { return nil, fmt.Errorf("no authentication provided") } @@ -26,7 +59,7 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, return session, nil } -func getToken(r *http.Request) (string, bool) { +func (manager *SessionManagerCtx) getToken(r *http.Request) (string, bool) { // get from Header reqToken := r.Header.Get("Authorization") splitToken := strings.Split(reqToken, "Bearer ") @@ -35,7 +68,7 @@ func getToken(r *http.Request) (string, bool) { } // get from Cookie - cookie, err := r.Cookie("NEKO_SESSION") + cookie, err := r.Cookie(manager.config.CookieName) if err == nil { return cookie.Value, true } diff --git a/internal/types/session.go b/internal/types/session.go index 1a69f103..94a6c68a 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -50,5 +50,7 @@ type SessionManager interface { ImplicitHosting() bool + CookieSetToken(w http.ResponseWriter, token string) + CookieClearToken(w http.ResponseWriter) Authenticate(r *http.Request) (Session, error) } From 552223d0314ce407919cade589f55839d0e62106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 17 Mar 2021 15:47:49 +0100 Subject: [PATCH 453/876] iceservers with auth. --- internal/config/webrtc.go | 21 +++++++++++--- internal/types/message/messages.go | 11 ++++--- internal/types/webrtc.go | 9 ++++-- internal/utils/json.go | 21 +++++++++++++- internal/webrtc/manager.go | 43 ++++++++++++++++++---------- internal/websocket/handler/signal.go | 11 ++++--- 6 files changed, 82 insertions(+), 34 deletions(-) diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index d51383ca..8c8cf46e 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -10,12 +10,13 @@ import ( "github.com/spf13/viper" "demodesk/neko/internal/utils" + "demodesk/neko/internal/types" ) type WebRTC struct { ICELite bool ICETrickle bool - ICEServers []string + ICEServers []types.ICEServer EphemeralMin uint16 EphemeralMax uint16 @@ -26,6 +27,7 @@ type WebRTC struct { const ( defEprMin = 59000 defEprMax = 59100 + defStun = "stun:stun.l.google.com:19302" ) func (WebRTC) Init(cmd *cobra.Command) error { @@ -39,8 +41,8 @@ func (WebRTC) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().StringSlice("webrtc.iceserver", []string{"stun:stun.l.google.com:19302"}, "describes a single STUN and TURN server that can be used by the ICEAgent to establish a connection with a peer") - if err := viper.BindPFlag("webrtc.iceserver", cmd.PersistentFlags().Lookup("webrtc.iceserver")); err != nil { + cmd.PersistentFlags().String("webrtc.iceservers", "[]", "STUN and TURN servers in JSON format with `urls`, `username`, `password` keys") + if err := viper.BindPFlag("webrtc.iceservers", cmd.PersistentFlags().Lookup("webrtc.iceservers")); err != nil { return err } @@ -65,7 +67,18 @@ func (WebRTC) Init(cmd *cobra.Command) error { func (s *WebRTC) Set() { s.ICELite = viper.GetBool("webrtc.icelite") s.ICETrickle = viper.GetBool("webrtc.icetrickle") - s.ICEServers = viper.GetStringSlice("webrtc.iceserver") + + if err := viper.UnmarshalKey("webrtc.iceservers", &s.ICEServers, viper.DecodeHook( + utils.JsonStringAutoDecode(s.ICEServers), + )); err != nil { + log.Warn().Err(err).Msgf("unable to parse ICE servers") + } + + if len(s.ICEServers) == 0 { + s.ICEServers = append(s.ICEServers, types.ICEServer{ + URLs: []string{defStun}, + }) + } s.NAT1To1IPs = viper.GetStringSlice("webrtc.nat1to1") s.IpRetrievalUrl = viper.GetString("webrtc.ip_retrieval_url") diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index f6b6f112..21bb9aaa 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -40,12 +40,11 @@ type SystemDisconnect struct { ///////////////////////////// type SignalProvide struct { - Event string `json:"event,omitempty"` - SDP string `json:"sdp"` - Lite bool `json:"lite"` - ICE []string `json:"ice"` - Videos []string `json:"videos"` - Video string `json:"video"` + Event string `json:"event,omitempty"` + SDP string `json:"sdp"` + ICEServers []types.ICEServer `json:"iceservers"` + Videos []string `json:"videos"` + Video string `json:"video"` } type SignalCandidate struct { diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 4560d681..39072103 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -2,6 +2,12 @@ package types import "github.com/pion/webrtc/v3" +type ICEServer struct { + URLs []string `mapstructure:"urls" json:"urls"` + Username string `mapstructure:"username" json:"username"` + Credential string `mapstructure:"credential" json:"credential"` +} + type WebRTCPeer interface { SignalAnswer(sdp string) error SignalCandidate(candidate webrtc.ICECandidateInit) error @@ -17,8 +23,7 @@ type WebRTCManager interface { Start() Shutdown() error - ICELite() bool - ICEServers() []string + ICEServers() []ICEServer CreatePeer(session Session, videoID string) (*webrtc.SessionDescription, error) } diff --git a/internal/utils/json.go b/internal/utils/json.go index 7ea0494d..752a08e1 100644 --- a/internal/utils/json.go +++ b/internal/utils/json.go @@ -1,6 +1,9 @@ package utils -import "encoding/json" +import ( + "encoding/json" + "reflect" +) func Unmarshal(in interface{}, raw []byte, callback func() error) error { if err := json.Unmarshal(raw, &in); err != nil { @@ -8,3 +11,19 @@ func Unmarshal(in interface{}, raw []byte, callback func() error) error { } return callback() } + +func JsonStringAutoDecode(m interface{}) func(rf reflect.Kind, rt reflect.Kind, data interface{}) (interface{}, error) { + return func(rf reflect.Kind, rt reflect.Kind, data interface{}) (interface{}, error) { + if rf != reflect.String || rt == reflect.String { + return data, nil + } + + raw := data.(string) + if raw != "" && (raw[0:1] == "{" || raw[0:1] == "[") { + err := json.Unmarshal([]byte(raw), &m) + return m, err + } + + return data, nil + } +} diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 10a66706..cd50c671 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -77,12 +77,17 @@ func (manager *WebRTCManagerCtx) Start() { audio.RemoveListener(&audioListener) } + var servers []string + for _, server := range manager.config.ICEServers { + servers = append(servers, server.URLs...) + } + manager.logger.Info(). - Str("ice_lite", fmt.Sprintf("%t", manager.config.ICELite)). - Str("ice_trickle", fmt.Sprintf("%t", manager.config.ICETrickle)). - Str("ice_servers", strings.Join(manager.config.ICEServers, ",")). - Str("ephemeral_port_range", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)). - Str("nat_ips", strings.Join(manager.config.NAT1To1IPs, ",")). + Str("icelite", fmt.Sprintf("%t", manager.config.ICELite)). + Str("icetrickle", fmt.Sprintf("%t", manager.config.ICETrickle)). + Str("iceservers", strings.Join(servers, ",")). + Str("nat1to1", strings.Join(manager.config.NAT1To1IPs, ",")). + Str("epr", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)). Msgf("webrtc starting") manager.curImage.Start() @@ -98,11 +103,7 @@ func (manager *WebRTCManagerCtx) Shutdown() error { return nil } -func (manager *WebRTCManagerCtx) ICELite() bool { - return manager.config.ICELite -} - -func (manager *WebRTCManagerCtx) ICEServers() []string { +func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { return manager.config.ICEServers } @@ -423,12 +424,24 @@ func (manager *WebRTCManagerCtx) apiConfiguration() *webrtc.Configuration { } } + ICEServers := []webrtc.ICEServer{} + for _, server := range manager.config.ICEServers { + var credential interface{} + if server.Credential != "" { + credential = server.Credential + } else { + credential = false + } + + ICEServers = append(ICEServers, webrtc.ICEServer{ + URLs: server.URLs, + Username: server.Username, + Credential: credential, + }) + } + return &webrtc.Configuration{ - ICEServers: []webrtc.ICEServer{ - { - URLs: manager.config.ICEServers, - }, - }, + ICEServers: ICEServers, SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, } } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 3c390ab1..ecfb1b59 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -22,12 +22,11 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { return session.Send( message.SignalProvide{ - Event: event.SIGNAL_PROVIDE, - SDP: offer.SDP, - Lite: h.webrtc.ICELite(), - ICE: h.webrtc.ICEServers(), - Videos: videos, - Video: defaultVideo, + Event: event.SIGNAL_PROVIDE, + SDP: offer.SDP, + ICEServers: h.webrtc.ICEServers(), + Videos: videos, + Video: defaultVideo, }) } From 9c6c107ee00769a281fa0a10a5a13e76552da727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Mar 2021 13:17:10 +0100 Subject: [PATCH 454/876] move broadcast constants to config. --- internal/capture/manager.go | 6 +++--- internal/config/capture.go | 23 ++++++++++++++++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 6e6950a8..4a1ebfe2 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -34,14 +34,14 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! audio/x-raw,channels=2 "+ "! audioconvert "+ "! queue "+ - "! voaacenc bitrate=128000 "+ + "! voaacenc bitrate=%d "+ "! mux. "+ "ximagesrc display-name=%s show-pointer=true use-damage=false "+ "! video/x-raw "+ "! videoconvert "+ "! queue "+ - "! x264enc threads=4 bitrate=4096 key-int-max=15 byte-stream=true tune=zerolatency speed-preset=veryfast "+ - "! mux.", config.AudioDevice, config.Display, + "! x264enc threads=4 bitrate=%d key-int-max=15 byte-stream=true tune=zerolatency speed-preset=%s "+ + "! mux.", config.AudioDevice, config.BroadcastAudioBitrate*1000, config.Display, config.BroadcastVideoBitrate, config.BroadcastPreset, ) } diff --git a/internal/config/capture.go b/internal/config/capture.go index 095ad736..d3612263 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -17,7 +17,10 @@ type Capture struct { AudioCodec codec.RTPCodec AudioPipeline string - BroadcastPipeline string + BroadcastAudioBitrate int + BroadcastVideoBitrate int + BroadcastPreset string + BroadcastPipeline string ScreencastEnabled bool ScreencastRate string @@ -43,6 +46,21 @@ func (Capture) Init(cmd *cobra.Command) error { } // broadcast + cmd.PersistentFlags().Int("capture.screencast.audio_bitrate", 128, "broadcast audio bitrate in KB/s") + if err := viper.BindPFlag("capture.screencast.audio_bitrate", cmd.PersistentFlags().Lookup("capture.screencast.audio_bitrate")); err != nil { + return err + } + + cmd.PersistentFlags().Int("capture.screencast.video_bitrate", 4096, "broadcast video bitrate in KB/s") + if err := viper.BindPFlag("capture.screencast.video_bitrate", cmd.PersistentFlags().Lookup("capture.screencast.video_bitrate")); err != nil { + return err + } + + cmd.PersistentFlags().String("capture.screencast.preset", "veryfast", "broadcast speed preset for h264 encoding") + if err := viper.BindPFlag("capture.screencast.preset", cmd.PersistentFlags().Lookup("capture.screencast.preset")); err != nil { + return err + } + cmd.PersistentFlags().String("capture.broadcast.pipeline", "", "gstreamer pipeline used for broadcasting") if err := viper.BindPFlag("capture.broadcast.pipeline", cmd.PersistentFlags().Lookup("capture.broadcast.pipeline")); err != nil { return err @@ -94,6 +112,9 @@ func (s *Capture) Set() { s.AudioCodec = codec.Opus() } + s.BroadcastAudioBitrate = viper.GetInt("capture.broadcast.audio_bitrate") + s.BroadcastVideoBitrate = viper.GetInt("capture.broadcast.video_bitrate") + s.BroadcastPreset = viper.GetString("capture.broadcast.preset") s.BroadcastPipeline = viper.GetString("capture.broadcast.pipeline") s.ScreencastEnabled = viper.GetBool("capture.screencast.enabled") From aefb367505f56e3f0cbad6d6104c81e2410b5033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Mar 2021 13:38:27 +0100 Subject: [PATCH 455/876] fix initial image error & add cache max. --- internal/webrtc/cursor/image.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 037161b7..2d46aba8 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -17,6 +17,7 @@ func NewImage(desktop types.DesktopManager) *ImageCtx { desktop: desktop, listeners: map[uintptr]*func(entry *ImageEntry){}, cache: map[uint64]*ImageEntry{}, + maxSerial: 200, // TODO: Cleanup? } } @@ -28,6 +29,7 @@ type ImageCtx struct { cacheMu sync.Mutex cache map[uint64]*ImageEntry current *ImageEntry + maxSerial uint64 } type ImageEntry struct { @@ -43,6 +45,7 @@ func (manager *ImageCtx) Start() { return } + manager.current = entry for _, emit := range manager.listeners { (*emit)(entry) } @@ -61,7 +64,7 @@ func (manager *ImageCtx) Shutdown() { func (manager *ImageCtx) GetCached(serial uint64) (*ImageEntry, error) { // zero means no serial available - if serial == 0 { + if serial == 0 || serial > manager.maxSerial { return manager.fetchEntry() } @@ -126,6 +129,5 @@ func (manager *ImageCtx) fetchEntry() (*ImageEntry, error) { Image: img, } - manager.current = entry return entry, nil } From 77e31bb1bc59c0ccdb37b847d5d50472197305bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Mar 2021 13:38:32 +0100 Subject: [PATCH 456/876] fmt. --- internal/config/webrtc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 8c8cf46e..55bdea31 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko/internal/utils" "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" ) type WebRTC struct { From 916222b6df7c5c9dff2ac3d21b5b5ae83a7de5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Mar 2021 19:37:37 +0100 Subject: [PATCH 457/876] use config file from the environment variable. --- cmd/root.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index f6e9e395..f697e693 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -37,16 +37,11 @@ func init() { zerolog.TimeFieldFormat = "" zerolog.SetGlobalLevel(zerolog.InfoLevel) - if viper.GetBool("debug") { - zerolog.SetGlobalLevel(zerolog.DebugLevel) - } - console := zerolog.ConsoleWriter{Out: os.Stdout} if !viper.GetBool("logs") { log.Logger = log.Output(console) } else { - logs := filepath.Join(".", "logs") if runtime.GOOS == "linux" { logs = "/var/log/neko" @@ -81,9 +76,13 @@ func init() { ////// // configs ////// - config := viper.GetString("config") + config := viper.GetString("config") // Use config file from the flag. + if config == "" { + config = os.Getenv("NEKO_CONFIG") // Use config file from the environment variable. + } + if config != "" { - viper.SetConfigFile(config) // Use config file from the flag. + viper.SetConfigFile(config) } else { if runtime.GOOS == "linux" { viper.AddConfigPath("/etc/neko/") @@ -106,14 +105,17 @@ func init() { } } - // debug mode from ENV or config - if viper.GetBool("debug") { + ////// + // debug + ////// + debug := viper.GetBool("debug") + if debug { zerolog.SetGlobalLevel(zerolog.DebugLevel) } file := viper.ConfigFileUsed() logger := log.With(). - Bool("debug", viper.GetBool("debug")). + Bool("debug", debug). Str("logging", viper.GetString("logs")). Str("config", file). Logger() From 27b1ca54c0ee5e95a2211717c92f6561c498e4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Mar 2021 19:47:28 +0100 Subject: [PATCH 458/876] add config file checking. --- cmd/root.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/root.go b/cmd/root.go index f697e693..afc7c2ae 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -123,7 +123,11 @@ func init() { if file == "" { logger.Warn().Msg("preflight complete without config file") } else { - logger.Info().Msg("preflight complete") + if _, err := os.Stat(config); os.IsNotExist(err) { + logger.Error().Msg("preflight complete with nonexistent config file") + } else { + logger.Info().Msg("preflight complete") + } } neko.Service.Configs.Root.Set() From 79af4409b5617000ac7de4fcab0ce98e8f8e3622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Mar 2021 19:50:37 +0100 Subject: [PATCH 459/876] viper ConfigFileUsed instead of env. --- cmd/root.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/root.go b/cmd/root.go index afc7c2ae..ccbd2a0d 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -123,7 +123,7 @@ func init() { if file == "" { logger.Warn().Msg("preflight complete without config file") } else { - if _, err := os.Stat(config); os.IsNotExist(err) { + if _, err := os.Stat(file); os.IsNotExist(err) { logger.Error().Msg("preflight complete with nonexistent config file") } else { logger.Info().Msg("preflight complete") From 2a0d9da5ac6cf2ae6e0a5c92b73d875a01e482ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Mar 2021 21:08:55 +0100 Subject: [PATCH 460/876] update packages. --- go.mod | 13 ++++----- go.sum | 87 ++++++++++++---------------------------------------------- 2 files changed, 24 insertions(+), 76 deletions(-) diff --git a/go.mod b/go.mod index a71c2dfe..2001c500 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module demodesk/neko go 1.16 require ( - github.com/go-chi/chi v1.5.2 + github.com/go-chi/chi v1.5.4 github.com/go-chi/cors v1.1.1 github.com/google/uuid v1.2.0 // indirect github.com/gorilla/websocket v1.4.2 @@ -11,19 +11,18 @@ require ( github.com/magiconair/properties v1.8.4 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/pelletier/go-toml v1.8.1 // indirect - github.com/pion/interceptor v0.0.10 // indirect github.com/pion/logging v0.2.2 - github.com/pion/webrtc/v3 v3.0.11 + github.com/pion/transport v0.12.3 // indirect + github.com/pion/webrtc/v3 v3.0.15 github.com/rs/zerolog v1.20.0 github.com/spf13/afero v1.5.1 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/spf13/cobra v1.1.3 github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.7.1 - golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect - golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d // indirect - golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43 // indirect + golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 // indirect + golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 // indirect + golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e // indirect golang.org/x/text v0.3.5 // indirect gopkg.in/ini.v1 v1.62.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 583d2dfc..0192d70e 100644 --- a/go.sum +++ b/go.sum @@ -11,7 +11,6 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -21,7 +20,6 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= @@ -36,19 +34,15 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-chi/chi v1.5.1 h1:kfTK3Cxd/dkMu/rKs5ZceWYp+t5CtiE7vmaTv3LjC6w= -github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k= -github.com/go-chi/chi v1.5.2 h1:YcLIBANL4OTaAOcTdp//sskGa0yGACQMCtbnr7YEn0Q= -github.com/go-chi/chi v1.5.2/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k= +github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= +github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= github.com/go-chi/cors v1.1.1 h1:eHuqxsIw89iXcWnWUN8R72JMibABJTN/4IOYI5WERvw= github.com/go-chi/cors v1.1.1/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -61,11 +55,9 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= @@ -84,7 +76,6 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -118,7 +109,6 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -140,13 +130,11 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -156,40 +144,31 @@ github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eI github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0= github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= -github.com/pion/dtls/v2 v2.0.4 h1:WuUcqi6oYMu/noNTz92QrF1DaFj4eXbhQ6dzaaAwOiI= github.com/pion/dtls/v2 v2.0.4/go.mod h1:qAkFscX0ZHoI1E07RfYPoRw3manThveu+mlTDdOxoGI= -github.com/pion/dtls/v2 v2.0.7 h1:PNcUs/G1l9hb4jzMEorgFMxIBdp7fRN4LIApOTMtCYs= -github.com/pion/dtls/v2 v2.0.7/go.mod h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10= -github.com/pion/ice/v2 v2.0.14 h1:FxXxauyykf89SWAtkQCfnHkno6G8+bhRkNguSh9zU+4= -github.com/pion/ice/v2 v2.0.14/go.mod h1:wqaUbOq5ObDNU5ox1hRsEst0rWfsKuH1zXjQFEWiZwM= +github.com/pion/dtls/v2 v2.0.8 h1:reGe8rNIMfO/UAeFLqO61tl64t154Qfkr4U3Gzu1tsg= +github.com/pion/dtls/v2 v2.0.8/go.mod h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10= github.com/pion/ice/v2 v2.0.15 h1:KZrwa2ciL9od8+TUVJiYTNsCW9J5lktBjGwW1MacEnQ= github.com/pion/ice/v2 v2.0.15/go.mod h1:ZIiVGevpgAxF/cXiIVmuIUtCb3Xs4gCzCbXB6+nFkSI= -github.com/pion/interceptor v0.0.9 h1:fk5hTdyLO3KURQsf/+RjMpEm4NE3yeTY9Kh97b5BvwA= -github.com/pion/interceptor v0.0.9/go.mod h1:dHgEP5dtxOTf21MObuBAjJeAayPxLUAZjerGH8Xr07c= github.com/pion/interceptor v0.0.10 h1:dXFyFWRJFwmzQqyn0U8dUAbOJu+JJnMVAqxmvTu30B4= github.com/pion/interceptor v0.0.10/go.mod h1:qzeuWuD/ZXvPqOnxNcnhWfkCZ2e1kwwslicyyPnhoK4= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= @@ -207,29 +186,24 @@ github.com/pion/sctp v1.7.11 h1:UCnj7MsobLKLuP/Hh+JMiI/6W5Bs/VF45lWKgHFjSIE= github.com/pion/sctp v1.7.11/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8= github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= -github.com/pion/srtp/v2 v2.0.1 h1:kgfh65ob3EcnFYA4kUBvU/menCp9u7qaJLXwWgpobzs= -github.com/pion/srtp/v2 v2.0.1/go.mod h1:c8NWHhhkFf/drmHTAblkdu8++lsISEBBdAuiyxgqIsE= +github.com/pion/srtp/v2 v2.0.2 h1:664iGzVmaY7KYS5M0gleY0DscRo9ReDfTxQrq4UgGoU= +github.com/pion/srtp/v2 v2.0.2/go.mod h1:VEyLv4CuxrwGY8cxM+Ng3bmVy8ckz/1t6A0q/msKOw0= github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= -github.com/pion/transport v0.8.10 h1:lTiobMEw2PG6BH/mgIVqTV2mBp/mPT+IJLaN8ZxgdHk= github.com/pion/transport v0.8.10/go.mod h1:tBmha/UCjpum5hqTWhfAEs3CO4/tHSg0MYRhSzR+CZ8= -github.com/pion/transport v0.10.0 h1:9M12BSneJm6ggGhJyWpDveFOstJsTiQjkLf4M44rm80= github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE= github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A= -github.com/pion/transport v0.12.0/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/transport v0.12.1/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= -github.com/pion/transport v0.12.2 h1:WYEjhloRHt1R86LhUKjC5y+P52Y11/QqEUalvtzVoys= github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= +github.com/pion/transport v0.12.3 h1:vdBfvfU/0Wq8kd2yhUMSDB/x+O4Z9MYVl2fJ5BT4JZw= +github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= github.com/pion/udp v0.1.0 h1:uGxQsNyrqG3GLINv36Ff60covYmfrLoxzwnCsIYspXI= github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths= -github.com/pion/webrtc/v3 v3.0.4 h1:Tiw3H9fpfcwkvaxonB+Gv1DG9tmgYBQaM1vBagDHP40= -github.com/pion/webrtc/v3 v3.0.4/go.mod h1:1TmFSLpPYFTFXFHPtoq9eGP1ASTa9LC6FBh7sUY8cd4= -github.com/pion/webrtc/v3 v3.0.11 h1:RIxUbkWJn6YvLVmHZSzc30yQLyME5vGDkpqrV7EHxz4= -github.com/pion/webrtc/v3 v3.0.11/go.mod h1:WEvXneGTeqNmiR59v5jTsxMc4yXQyOQcRsrdAbNwSEU= +github.com/pion/webrtc/v3 v3.0.15 h1:g8MMJohjQoj0+pTrU329tWM6dvCieNTgnjtqv1kmEdY= +github.com/pion/webrtc/v3 v3.0.15/go.mod h1:uUt2nRSsCnK/nfzTAfOmaeLan26ZJ0aP9iwjc/gcC2Y= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -238,16 +212,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3 h1:9iH4JKXLzFbOAdtqv/a+j8aewx2Y8lAjAydhbaScPF8= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0 h1:7etb9YClo3a6HjLzfl6rIQaU+FDfi0VSX39io3aQ+DM= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084 h1:sofwID9zm4tzrgykg80hfFph1mryUeLRsUfoocVVmRY= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -267,23 +237,17 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.5.1 h1:VHu76Lk0LSP1x254maIu2bplkWpfBWI+B+6fdoZprcg= github.com/spf13/afero v1.5.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -294,11 +258,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -320,10 +281,9 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 h1:gzMM0EjIYiRmJI3+jBdFuoynZlpxa2JQZsolKu09BXo= +golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -364,10 +324,10 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d h1:1aflnvSoWWLI2k/dMUAl5lvU1YO4Mb4hz0gh+1rjcxU= -golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 h1:b0LrWgu8+q7z4J+0Y3Umo5q1dL7NXBkKBWkaVkAq17E= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -398,16 +358,13 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210123111255-9b0068b26619 h1:yLLDsUUPDliIQpKl7BjVb1igwngIMH2GBjo1VpwLTE0= -golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43 h1:SgQ6LNaYJU0JIuEHv9+s6EbhSCwYeAf5Yvj6lpYlqAE= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e h1:XNp2Flc/1eWQGk5BLzqTAN7fQIwIbfyVTuVxXxZh73M= +golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= @@ -433,7 +390,6 @@ golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -463,7 +419,6 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -471,22 +426,16 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= From cd15e0b03e4ade0abebc1707b7a94c7999fa11b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 19 Mar 2021 11:28:06 +0100 Subject: [PATCH 461/876] ice server omitempty credentials. --- internal/types/webrtc.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 39072103..c31b11a8 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -4,8 +4,8 @@ import "github.com/pion/webrtc/v3" type ICEServer struct { URLs []string `mapstructure:"urls" json:"urls"` - Username string `mapstructure:"username" json:"username"` - Credential string `mapstructure:"credential" json:"credential"` + Username string `mapstructure:"username" json:"username,omitempty"` + Credential string `mapstructure:"credential" json:"credential,omitempty"` } type WebRTCPeer interface { From 5a79212b322fc5686806787b7fc04c0fcaa7ff1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 19 Mar 2021 15:04:01 +0100 Subject: [PATCH 462/876] add healthcheck. --- Dockerfile | 5 +++++ internal/api/router.go | 5 +++++ internal/http/logger.go | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/Dockerfile b/Dockerfile index 77c85932..96000a7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -110,6 +110,11 @@ ENV NEKO_SERVER_BIND=:8080 # copy executabe from previous stage COPY --from=build /src/bin/neko /usr/bin/neko +# +# add healthcheck +HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ + CMD wget -O - http://localhost:${NEKO_SERVER_BIND#*:}/api/health || exit 1 + # # run neko CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"] diff --git a/internal/api/router.go b/internal/api/router.go index 84a7b377..477e94da 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -58,6 +58,11 @@ func (api *ApiManagerCtx) Route(r chi.Router) { r.Route(path, router) } }) + + r.Get("/health", func(w http.ResponseWriter, r *http.Request) { + //nolint + w.Write([]byte("true")) + }) } func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { diff --git a/internal/http/logger.go b/internal/http/logger.go index dabffea1..419be2a7 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -13,6 +13,12 @@ func Logger(next http.Handler) http.Handler { fn := func(w http.ResponseWriter, r *http.Request) { req := map[string]interface{}{} + // exclude healthcheck from logs + if r.RequestURI == "/api/health" { + next.ServeHTTP(w, r) + return + } + if reqID := middleware.GetReqID(r.Context()); reqID != "" { req["id"] = reqID } From 0eef9d4d98adf4de8f22d6d9e6a86c73723ee406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 21 Mar 2021 21:26:53 +0100 Subject: [PATCH 463/876] update auth middlewares. --- internal/api/room/control.go | 15 --------------- internal/api/room/handler.go | 16 ++++++++-------- internal/http/auth/auth.go | 12 ++++++------ 3 files changed, 14 insertions(+), 29 deletions(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 6a7806bd..b58a3b70 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -41,11 +41,6 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { } session := auth.GetSession(r) - if !session.Profile().CanHost { - utils.HttpBadRequest(w, "Session is not allowed to host.") - return - } - h.sessions.SetHost(session) utils.HttpSuccess(w) @@ -58,11 +53,6 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { return } - if !session.Profile().CanHost { - utils.HttpBadRequest(w, "Session is not allowed to host.") - return - } - h.desktop.ResetKeys() h.sessions.ClearHost() @@ -71,11 +61,6 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) - if !session.Profile().CanHost { - utils.HttpBadRequest(w, "Session is not allowed to host.") - return - } - h.sessions.SetHost(session) utils.HttpSuccess(w) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 689000f6..4f14e751 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -37,7 +37,7 @@ func (h *RoomHandler) Route(r chi.Router) { r.Post("/stop", h.boradcastStop) }) - r.With(auth.HostsOnly).Route("/clipboard", func(r chi.Router) { + r.With(auth.CanAccessClipboardOnly).With(auth.HostsOnly).Route("/clipboard", func(r chi.Router) { r.Get("/", h.clipboardGetText) r.Post("/", h.clipboardSetText) r.Get("/image.png", h.clipboardGetImage) @@ -52,7 +52,7 @@ func (h *RoomHandler) Route(r chi.Router) { //r.Get("/targets", h.clipboardGetTargets) }) - r.Route("/keyboard", func(r chi.Router) { + r.With(auth.CanHostOnly).Route("/keyboard", func(r chi.Router) { r.Get("/map", h.keyboardMapGet) r.With(auth.HostsOnly).Post("/map", h.keyboardMapSet) @@ -60,7 +60,7 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.HostsOnly).Post("/modifiers", h.keyboardModifiersSet) }) - r.Route("/control", func(r chi.Router) { + r.With(auth.CanHostOnly).Route("/control", func(r chi.Router) { r.Get("/", h.controlStatus) r.Post("/request", h.controlRequest) r.Post("/release", h.controlRelease) @@ -70,13 +70,13 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Post("/reset", h.controlReset) }) - r.Route("/screen", func(r chi.Router) { - r.With(auth.CanWatchOnly).Get("/", h.screenConfiguration) - r.With(auth.CanWatchOnly).Get("/shot.jpg", h.screenShotGet) - r.With(auth.CanWatchOnly).Get("/cast.jpg", h.screenCastGet) - + r.With(auth.CanWatchOnly).Route("/screen", func(r chi.Router) { + r.Get("/", h.screenConfiguration) r.With(auth.AdminsOnly).Post("/", h.screenConfigurationChange) r.With(auth.AdminsOnly).Get("/configurations", h.screenConfigurationsList) + + r.Get("/cast.jpg", h.screenCastGet) + r.With(auth.AdminsOnly).Get("/shot.jpg", h.screenShotGet) }) r.With(h.uploadMiddleware).Route("/upload", func(r chi.Router) { diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index bfb79fea..6de99f4a 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -45,11 +45,11 @@ func HostsOnly(next http.Handler) http.Handler { }) } -func HostsOrAdminsOnly(next http.Handler) http.Handler { +func CanWatchOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) - if !session.IsHost() && !session.Profile().IsAdmin { - utils.HttpForbidden(w, "Only host can do this.") + if !session.Profile().CanWatch { + utils.HttpForbidden(w, "Only for sessions, that can watch.") } else { next.ServeHTTP(w, r) } @@ -67,11 +67,11 @@ func CanHostOnly(next http.Handler) http.Handler { }) } -func CanWatchOnly(next http.Handler) http.Handler { +func CanAccessClipboardOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) - if !session.Profile().CanWatch { - utils.HttpForbidden(w, "Only for sessions, that can watch.") + if !session.Profile().CanAccessClipboard { + utils.HttpForbidden(w, "Only for sessions, that can access clipboard.") } else { next.ServeHTTP(w, r) } From e4d82673da3b466a2795bae5d2227726cc06365b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 21 Mar 2021 21:32:52 +0100 Subject: [PATCH 464/876] fix 401 and 403 texts. --- internal/http/auth/auth.go | 8 ++++---- internal/utils/http.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index 6de99f4a..22dbc475 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -27,7 +27,7 @@ func AdminsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().IsAdmin { - utils.HttpForbidden(w) + utils.HttpForbidden(w, "Only admin can do this.") } else { next.ServeHTTP(w, r) } @@ -49,7 +49,7 @@ func CanWatchOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().CanWatch { - utils.HttpForbidden(w, "Only for sessions, that can watch.") + utils.HttpForbidden(w, "Only sessions, that can watch.") } else { next.ServeHTTP(w, r) } @@ -60,7 +60,7 @@ func CanHostOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().CanHost { - utils.HttpForbidden(w, "Only for sessions, that can host.") + utils.HttpForbidden(w, "Only sessions, that can host.") } else { next.ServeHTTP(w, r) } @@ -71,7 +71,7 @@ func CanAccessClipboardOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().CanAccessClipboard { - utils.HttpForbidden(w, "Only for sessions, that can access clipboard.") + utils.HttpForbidden(w, "Only sessions, that can access clipboard.") } else { next.ServeHTTP(w, r) } diff --git a/internal/utils/http.go b/internal/utils/http.go index 11debe8c..f85008f4 100644 --- a/internal/utils/http.go +++ b/internal/utils/http.go @@ -57,11 +57,11 @@ func HttpBadRequest(w http.ResponseWriter, res ...interface{}) { } func HttpUnauthorized(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusUnauthorized, "Access token does not have the required scope.", res...) + defHttpError(w, http.StatusUnauthorized, "Invalid or missing access token.", res...) } func HttpForbidden(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusForbidden, "Invalid or missing access token.", res...) + defHttpError(w, http.StatusForbidden, "Access token does not have the required scope.", res...) } func HttpNotFound(w http.ResponseWriter, res ...interface{}) { From 52e586790efd2d4be6cb7546a2f9e3a17a8a4b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 21 Mar 2021 21:42:53 +0100 Subject: [PATCH 465/876] fix static files serving Path. --- internal/http/manager.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/http/manager.go b/internal/http/manager.go index 6084eb52..d66879e3 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -52,10 +52,10 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c if conf.Static != "" { fs := http.FileServer(http.Dir(conf.Static)) router.Get("/*", func(w http.ResponseWriter, r *http.Request) { - if _, err := os.Stat(conf.Static + r.RequestURI); os.IsNotExist(err) { - http.StripPrefix(r.RequestURI, fs).ServeHTTP(w, r) - } else { + if _, err := os.Stat(conf.Static + r.URL.Path); !os.IsNotExist(err) { fs.ServeHTTP(w, r) + } else { + utils.HttpNotFound(w) } }) } From 7c9c7ec7cb830852cef9de58eb9eefe7f51c4182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 22 Mar 2021 16:37:37 +0100 Subject: [PATCH 466/876] video qualities: modify only FPS. --- internal/capture/manager.go | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 4a1ebfe2..a624fb1a 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -2,7 +2,6 @@ package capture import ( "fmt" - "math" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -93,56 +92,41 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt }), "hq": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() - width := int(math.Ceil(float64(screen.Width)/6) * 5) - height := int(math.Ceil(float64(screen.Height)/6) * 5) - bitrate := int((width * height * 5) / 3) + bitrate := int((screen.Width * screen.Height * 5) / 3) / 2 return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ - "! video/x-raw,framerate=25/1 "+ + "! video/x-raw,framerate=15/1 "+ "! videoconvert "+ "! queue "+ - "! videoscale "+ - "! video/x-raw,width=%d,height=%d "+ - "! queue "+ "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 "+ - "! appsink name=appsink", config.Display, width, height, bitrate, + "! appsink name=appsink", config.Display, bitrate, ) }), "mq": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() - width := int(math.Ceil(float64(screen.Width)/6) * 4) - height := int(math.Ceil(float64(screen.Height)/6) * 4) - bitrate := int((width * height * 5) / 3) + bitrate := int((screen.Width * screen.Height * 5) / 3) / 3 return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ - "! video/x-raw,framerate=125/10 "+ + "! video/x-raw,framerate=10/1 "+ "! videoconvert "+ "! queue "+ - "! videoscale "+ - "! video/x-raw,width=%d,height=%d "+ - "! queue "+ "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 "+ - "! appsink name=appsink", config.Display, width, height, bitrate, + "! appsink name=appsink", config.Display, bitrate, ) }), "lq": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() - width := int(math.Ceil(float64(screen.Width)/6) * 3) - height := int(math.Ceil(float64(screen.Height)/6) * 3) - bitrate := int((width * height * 5) / 3) - + bitrate := int((screen.Width * screen.Height * 5) / 3) / 4 + return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ - "! video/x-raw,framerate=125/10 "+ + "! video/x-raw,framerate=5/1 "+ "! videoconvert "+ "! queue "+ - "! videoscale "+ - "! video/x-raw,width=%d,height=%d "+ - "! queue "+ "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 "+ - "! appsink name=appsink", config.Display, width, height, bitrate, + "! appsink name=appsink", config.Display, bitrate, ) }), }, From 9fcc310685068adbf29f42ef6227085c603279f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 22 Mar 2021 16:45:17 +0100 Subject: [PATCH 467/876] pipelines adding buffer. --- internal/capture/manager.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index a624fb1a..df7d8d97 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -80,53 +80,57 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "hd": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() bitrate := int((screen.Width * screen.Height * 5) / 3) + buf := bitrate / 1000 return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ "! video/x-raw,framerate=25/1 "+ "! videoconvert "+ "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 "+ - "! appsink name=appsink", config.Display, bitrate, + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=1 undershoot=95 error-resilient=partitions keyframe-max-dist=25 min-quantizer=6 max-quantizer=12 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ + "! appsink name=appsink", config.Display, bitrate, buf*6, buf*4, buf*5, ) }), "hq": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() bitrate := int((screen.Width * screen.Height * 5) / 3) / 2 + buf := bitrate / 1000 return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ "! video/x-raw,framerate=15/1 "+ "! videoconvert "+ "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=6 max-quantizer=12 "+ - "! appsink name=appsink", config.Display, bitrate, + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=1 undershoot=95 error-resilient=partitions keyframe-max-dist=25 min-quantizer=6 max-quantizer=12 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ + "! appsink name=appsink", config.Display, bitrate, buf*6, buf*4, buf*5, ) }), "mq": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() bitrate := int((screen.Width * screen.Height * 5) / 3) / 3 + buf := bitrate / 1000 return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ "! video/x-raw,framerate=10/1 "+ "! videoconvert "+ "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 "+ - "! appsink name=appsink", config.Display, bitrate, + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=1 undershoot=95 error-resilient=partitions keyframe-max-dist=25 min-quantizer=12 max-quantizer=24 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ + "! appsink name=appsink", config.Display, bitrate, buf*6, buf*4, buf*5, ) }), "lq": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() bitrate := int((screen.Width * screen.Height * 5) / 3) / 4 + buf := bitrate / 1000 return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ "! video/x-raw,framerate=5/1 "+ "! videoconvert "+ "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=100000 undershoot=95 error-resilient=partitions keyframe-max-dist=15 auto-alt-ref=true min-quantizer=12 max-quantizer=24 "+ - "! appsink name=appsink", config.Display, bitrate, + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=1 undershoot=95 error-resilient=partitions keyframe-max-dist=25 min-quantizer=12 max-quantizer=24 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ + "! appsink name=appsink", config.Display, bitrate, buf*6, buf*4, buf*5, ) }), }, From 58854d38dd89b9809ae9090870f117d6d4d1e1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 23 Mar 2021 13:46:54 +0100 Subject: [PATCH 468/876] webrtc add interceptor. --- go.mod | 1 + internal/types/codec/codecs.go | 14 +++++++------- internal/webrtc/manager.go | 13 ++++++++++--- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 2001c500..dc4b022a 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/magiconair/properties v1.8.4 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/pelletier/go-toml v1.8.1 // indirect + github.com/pion/interceptor v0.0.10 // indirect github.com/pion/logging v0.2.2 github.com/pion/transport v0.12.3 // indirect github.com/pion/webrtc/v3 v3.0.15 diff --git a/internal/types/codec/codecs.go b/internal/types/codec/codecs.go index dd111d59..f8c08c88 100644 --- a/internal/types/codec/codecs.go +++ b/internal/types/codec/codecs.go @@ -27,7 +27,7 @@ func VP8() RTPCodec { ClockRate: 90000, Channels: 0, SDPFmtpLine: "", - RTCPFeedback: nil, + RTCPFeedback: []webrtc.RTCPFeedback{}, }, // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html // gstreamer1.0-plugins-good @@ -46,7 +46,7 @@ func VP9() RTPCodec { ClockRate: 90000, Channels: 0, SDPFmtpLine: "profile-id=0", - RTCPFeedback: nil, + RTCPFeedback: []webrtc.RTCPFeedback{}, }, // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html // gstreamer1.0-plugins-good @@ -65,7 +65,7 @@ func H264() RTPCodec { ClockRate: 90000, Channels: 0, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", - RTCPFeedback: nil, + RTCPFeedback: []webrtc.RTCPFeedback{}, }, // https://gstreamer.freedesktop.org/documentation/x264/index.html // gstreamer1.0-plugins-ugly @@ -86,7 +86,7 @@ func Opus() RTPCodec { ClockRate: 48000, Channels: 2, SDPFmtpLine: "", - RTCPFeedback: nil, + RTCPFeedback: []webrtc.RTCPFeedback{}, }, // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html // gstreamer1.0-plugins-base @@ -104,7 +104,7 @@ func G722() RTPCodec { ClockRate: 8000, Channels: 0, SDPFmtpLine: "", - RTCPFeedback: nil, + RTCPFeedback: []webrtc.RTCPFeedback{}, }, // https://gstreamer.freedesktop.org/documentation/libav/avenc_g722.html // gstreamer1.0-libav @@ -122,7 +122,7 @@ func PCMU() RTPCodec { ClockRate: 8000, Channels: 0, SDPFmtpLine: "", - RTCPFeedback: nil, + RTCPFeedback: []webrtc.RTCPFeedback{}, }, // https://gstreamer.freedesktop.org/documentation/mulaw/mulawenc.html // gstreamer1.0-plugins-good @@ -140,7 +140,7 @@ func PCMA() RTPCodec { ClockRate: 8000, Channels: 0, SDPFmtpLine: "", - RTCPFeedback: nil, + RTCPFeedback: []webrtc.RTCPFeedback{}, }, // https://gstreamer.freedesktop.org/documentation/alaw/alawenc.html // gstreamer1.0-plugins-good diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index cd50c671..a11f02e1 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -7,6 +7,7 @@ import ( "sync" "time" + "github.com/pion/interceptor" "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" @@ -120,8 +121,13 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin settings := manager.apiSettings(logger) configuration := manager.apiConfiguration() + registry := &interceptor.Registry{} + if err := webrtc.RegisterDefaultInterceptors(engine, registry); err != nil { + return nil, err + } + // Create NewAPI with MediaEngine and SettingEngine - api := webrtc.NewAPI(webrtc.WithMediaEngine(engine), webrtc.WithSettingEngine(*settings)) + api := webrtc.NewAPI(webrtc.WithMediaEngine(engine), webrtc.WithSettingEngine(settings), webrtc.WithInterceptorRegistry(registry)) connection, err := api.NewPeerConnection(*configuration) if err != nil { @@ -401,8 +407,8 @@ func (manager *WebRTCManagerCtx) mediaEngine(videoID string) (*webrtc.MediaEngin return engine, nil } -func (manager *WebRTCManagerCtx) apiSettings(logger zerolog.Logger) *webrtc.SettingEngine { - settings := &webrtc.SettingEngine{ +func (manager *WebRTCManagerCtx) apiSettings(logger zerolog.Logger) webrtc.SettingEngine { + settings := webrtc.SettingEngine{ LoggerFactory: loggerFactory{ logger: logger, }, @@ -412,6 +418,7 @@ func (manager *WebRTCManagerCtx) apiSettings(logger zerolog.Logger) *webrtc.Sett settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) + //settings.SetSRTPReplayProtectionWindow(512) settings.SetLite(manager.config.ICELite) return settings From fb845a1f188d4bb75631b1037a5f455d2006e3ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 23 Mar 2021 14:06:40 +0100 Subject: [PATCH 469/876] update pipelines. --- internal/capture/manager.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index df7d8d97..46a88718 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -79,58 +79,58 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt videos: map[string]*StreamManagerCtx{ "hd": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() - bitrate := int((screen.Width * screen.Height * 5) / 3) - buf := bitrate / 1000 + bitrate := int((screen.Width * screen.Height * 6) / 4) + buffer := bitrate / 1000 return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ "! video/x-raw,framerate=25/1 "+ "! videoconvert "+ "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=1 undershoot=95 error-resilient=partitions keyframe-max-dist=25 min-quantizer=6 max-quantizer=12 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ - "! appsink name=appsink", config.Display, bitrate, buf*6, buf*4, buf*5, + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=4 threads=4 deadline=1 undershoot=95 keyframe-max-dist=25 min-quantizer=3 max-quantizer=32 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ + "! appsink name=appsink", config.Display, bitrate, buffer*6, buffer*4, buffer*5, ) }), "hq": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() - bitrate := int((screen.Width * screen.Height * 5) / 3) / 2 - buf := bitrate / 1000 + bitrate := int((screen.Width * screen.Height * 6) / 4) / 2 + buffer := bitrate / 1000 return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ "! video/x-raw,framerate=15/1 "+ "! videoconvert "+ "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=1 undershoot=95 error-resilient=partitions keyframe-max-dist=25 min-quantizer=6 max-quantizer=12 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ - "! appsink name=appsink", config.Display, bitrate, buf*6, buf*4, buf*5, + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=4 threads=4 deadline=1 undershoot=95 keyframe-max-dist=25 min-quantizer=3 max-quantizer=32 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ + "! appsink name=appsink", config.Display, bitrate, buffer*6, buffer*4, buffer*5, ) }), "mq": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() - bitrate := int((screen.Width * screen.Height * 5) / 3) / 3 - buf := bitrate / 1000 + bitrate := int((screen.Width * screen.Height * 6) / 4) / 3 + buffer := bitrate / 1000 return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ "! video/x-raw,framerate=10/1 "+ "! videoconvert "+ "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=1 undershoot=95 error-resilient=partitions keyframe-max-dist=25 min-quantizer=12 max-quantizer=24 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ - "! appsink name=appsink", config.Display, bitrate, buf*6, buf*4, buf*5, + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=4 threads=4 deadline=1 undershoot=95 keyframe-max-dist=25 min-quantizer=3 max-quantizer=32 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ + "! appsink name=appsink", config.Display, bitrate, buffer*6, buffer*4, buffer*5, ) }), "lq": streamNew(codec.VP8(), func() string { screen := desktop.GetScreenSize() - bitrate := int((screen.Width * screen.Height * 5) / 3) / 4 - buf := bitrate / 1000 + bitrate := int((screen.Width * screen.Height * 6) / 4) / 4 + buffer := bitrate / 1000 return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ "! video/x-raw,framerate=5/1 "+ "! videoconvert "+ "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=16 threads=4 deadline=1 undershoot=95 error-resilient=partitions keyframe-max-dist=25 min-quantizer=12 max-quantizer=24 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ - "! appsink name=appsink", config.Display, bitrate, buf*6, buf*4, buf*5, + "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=4 threads=4 deadline=1 undershoot=95 keyframe-max-dist=25 min-quantizer=3 max-quantizer=32 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ + "! appsink name=appsink", config.Display, bitrate, buffer*6, buffer*4, buffer*5, ) }), }, From 89081d98871e33190bf3529366d87f3fa71657c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 23 Mar 2021 15:38:09 +0100 Subject: [PATCH 470/876] do not destroy WebRTC on WS disconnect. --- internal/session/session.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index c382182c..7d4b8a1a 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -77,12 +77,6 @@ func (session *SessionCtx) SetWebSocketConnected(connected bool) { session.manager.emmiter.Emit("disconnected", session) session.websocketPeer = nil - - if session.webrtcPeer != nil { - if err := session.webrtcPeer.Destroy(); err != nil { - session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") - } - } } func (session *SessionCtx) Send(v interface{}) error { From da1d073846c6c41a16a5a6fcf524b3bd86b25e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 23 Mar 2021 15:38:37 +0100 Subject: [PATCH 471/876] websocket connection change. --- internal/session/session.go | 6 +++++- internal/types/session.go | 2 +- internal/websocket/manager.go | 10 ++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 7d4b8a1a..6497543d 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -67,7 +67,11 @@ func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { session.websocketPeer = websocketPeer } -func (session *SessionCtx) SetWebSocketConnected(connected bool) { +func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPeer, connected bool) { + if websocketPeer != session.websocketPeer { + return + } + session.state.IsConnected = connected if connected { diff --git a/internal/types/session.go b/internal/types/session.go index 94a6c68a..19d22031 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -15,7 +15,7 @@ type Session interface { // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) - SetWebSocketConnected(connected bool) + SetWebSocketConnected(websocketPeer WebSocketPeer, connected bool) Send(v interface{}) error Disconnect(reason string) error diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 9bf9bbab..22489928 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -207,11 +207,13 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque return } - session.SetWebSocketPeer(&WebSocketPeerCtx{ + peer := &WebSocketPeerCtx{ session: session, manager: manager, connection: connection, - }) + } + + session.SetWebSocketPeer(peer) manager.logger. Debug(). @@ -219,7 +221,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque Str("address", connection.RemoteAddr().String()). Msg("connection started") - session.SetWebSocketConnected(true) + session.SetWebSocketConnected(peer, true) defer func() { manager.logger. @@ -228,7 +230,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque Str("address", connection.RemoteAddr().String()). Msg("connection ended") - session.SetWebSocketConnected(false) + session.SetWebSocketConnected(peer, false) }() manager.handle(connection, session) From bf6181764bcd1b70a161e83153f2a344764be174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Mar 2021 10:29:28 +0100 Subject: [PATCH 472/876] clear cookie if non-existent session. --- internal/api/router.go | 6 ++++-- internal/api/session.go | 2 +- internal/session/auth.go | 19 +++++++------------ internal/types/session.go | 2 +- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/internal/api/router.go b/internal/api/router.go index 477e94da..45b6fe2c 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -69,10 +69,12 @@ func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session, err := api.sessions.Authenticate(r) if err != nil { + api.sessions.CookieClearToken(w, r) utils.HttpUnauthorized(w, err) - } else { - next.ServeHTTP(w, auth.SetSession(r, session)) + return } + + next.ServeHTTP(w, auth.SetSession(r, session)) }) } diff --git a/internal/api/session.go b/internal/api/session.go index e45b8cc3..60c7b4ce 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -49,7 +49,7 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { return } - api.sessions.CookieClearToken(w) + api.sessions.CookieClearToken(w, r) utils.HttpSuccess(w, true) } diff --git a/internal/session/auth.go b/internal/session/auth.go index 5619a234..6e6eaaa1 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -25,20 +25,15 @@ func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token st }) } -func (manager *SessionManagerCtx) CookieClearToken(w http.ResponseWriter) { - sameSite := http.SameSiteDefaultMode - if manager.config.CookieSecure { - sameSite = http.SameSiteNoneMode +func (manager *SessionManagerCtx) CookieClearToken(w http.ResponseWriter, r *http.Request) { + cookie, err := r.Cookie(manager.config.CookieName) + if err != nil { + return } - http.SetCookie(w, &http.Cookie{ - Name: manager.config.CookieName, - Value: "", - Expires: time.Unix(0, 0), - Secure: manager.config.CookieSecure, - SameSite: sameSite, - HttpOnly: true, - }) + cookie.Value = "" + cookie.Expires = time.Unix(0, 0) + http.SetCookie(w, cookie) } func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, error) { diff --git a/internal/types/session.go b/internal/types/session.go index 19d22031..cf68df51 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -51,6 +51,6 @@ type SessionManager interface { ImplicitHosting() bool CookieSetToken(w http.ResponseWriter, token string) - CookieClearToken(w http.ResponseWriter) + CookieClearToken(w http.ResponseWriter, r *http.Request) Authenticate(r *http.Request) (Session, error) } From 5d00e0bdbd7796d078522627327d600775c7d9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Mar 2021 11:59:57 +0100 Subject: [PATCH 473/876] fix cursor index out of range error. --- internal/desktop/xorg/xorg.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index ab079de2..34146f3b 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -246,11 +246,11 @@ func GetCursorImage() *types.CursorImage { pixels := C.GoBytes(unsafe.Pointer(cur.pixels), C.int(width*height*8)) img := image.NewRGBA(image.Rect(0, 0, width, height)) - for row := 0; row < height; row++ { - for col := 0; col < width; col++ { - pos := ((row * height) + col) * 8 + for y := 0; y < height; y++ { + for x := 0; x < width; x++ { + pos := ((y * width) + x) * 8 - img.SetRGBA(col, row, color.RGBA{ + img.SetRGBA(x, y, color.RGBA{ A: pixels[pos+3], R: pixels[pos+2], G: pixels[pos+1], From a8e44160dc21366e7de721b7172471ac1b2099d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Mar 2021 12:20:30 +0100 Subject: [PATCH 474/876] cursor cache log debug. --- internal/webrtc/cursor/image.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 2d46aba8..3bacf281 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -65,6 +65,7 @@ func (manager *ImageCtx) Shutdown() { func (manager *ImageCtx) GetCached(serial uint64) (*ImageEntry, error) { // zero means no serial available if serial == 0 || serial > manager.maxSerial { + manager.logger.Debug().Uint64("serial", serial).Msg("cache bypass") return manager.fetchEntry() } @@ -85,6 +86,7 @@ func (manager *ImageCtx) GetCached(serial uint64) (*ImageEntry, error) { manager.cache[serial] = entry manager.cacheMu.Unlock() + manager.logger.Debug().Uint64("serial", serial).Msg("cache miss") return entry, nil } From 78b626449432fe29e919154b33c75b89eeb72cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Mar 2021 14:08:26 +0100 Subject: [PATCH 475/876] split webrtc & WS destroy. --- internal/session/manager.go | 13 ++++++++++--- internal/session/session.go | 34 ++++++---------------------------- internal/types/session.go | 2 +- internal/utils/errors.go | 22 ++++++++++++++++++++++ internal/websocket/peer.go | 19 ++++++++++++++++++- 5 files changed, 57 insertions(+), 33 deletions(-) create mode 100644 internal/utils/errors.go diff --git a/internal/session/manager.go b/internal/session/manager.go index 7c50268c..d53917f9 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -121,13 +121,20 @@ func (manager *SessionManagerCtx) Delete(id string) error { delete(manager.sessions, id) manager.sessionsMu.Unlock() - var err error + var errs []error if session.State().IsConnected { - err = session.Disconnect("session deleted") + err := session.GetWebSocketPeer().Destroy() + errs = append(errs, err) + } + + if session.State().IsWatching { + err := session.GetWebRTCPeer().Destroy() + errs = append(errs, err) } manager.emmiter.Emit("deleted", session) - return err + + return utils.ErrorsJoin(errs) } func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { diff --git a/internal/session/session.go b/internal/session/session.go index 6497543d..0b4dc8bf 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -4,8 +4,6 @@ import ( "github.com/rs/zerolog" "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" ) type SessionCtx struct { @@ -32,14 +30,14 @@ func (session *SessionCtx) profileChanged() { session.manager.ClearHost() } - if !session.profile.CanWatch && session.state.IsWatching { + if (!session.profile.CanConnect || !session.profile.CanLogin || !session.profile.CanWatch) && session.state.IsWatching { if err := session.webrtcPeer.Destroy(); err != nil { session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") } } if (!session.profile.CanConnect || !session.profile.CanLogin) && session.state.IsConnected { - if err := session.Disconnect("profile changed"); err != nil { + if err := session.websocketPeer.Destroy(); err != nil { session.logger.Warn().Err(err).Msgf("websocket destroy has failed") } } @@ -83,6 +81,10 @@ func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPe session.websocketPeer = nil } +func (session *SessionCtx) GetWebSocketPeer() types.WebSocketPeer { + return session.websocketPeer +} + func (session *SessionCtx) Send(v interface{}) error { if session.websocketPeer == nil { return nil @@ -91,30 +93,6 @@ func (session *SessionCtx) Send(v interface{}) error { return session.websocketPeer.Send(v) } -func (session *SessionCtx) Disconnect(reason string) error { - if err := session.Send( - message.SystemDisconnect{ - Event: event.SYSTEM_DISCONNECT, - Message: reason, - }); err != nil { - return err - } - - if session.websocketPeer != nil { - if err := session.websocketPeer.Destroy(); err != nil { - return err - } - } - - if session.webrtcPeer != nil { - if err := session.webrtcPeer.Destroy(); err != nil { - return err - } - } - - return nil -} - // --- // webrtc // --- diff --git a/internal/types/session.go b/internal/types/session.go index cf68df51..65d120a4 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -16,8 +16,8 @@ type Session interface { // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) SetWebSocketConnected(websocketPeer WebSocketPeer, connected bool) + GetWebSocketPeer() WebSocketPeer Send(v interface{}) error - Disconnect(reason string) error // webrtc SetWebRTCPeer(webrtcPeer WebRTCPeer) diff --git a/internal/utils/errors.go b/internal/utils/errors.go new file mode 100644 index 00000000..8f4aa691 --- /dev/null +++ b/internal/utils/errors.go @@ -0,0 +1,22 @@ +package utils + +import "fmt" + +func ErrorsJoin(errs []error) error { + var resErr error + + for _, err := range errs { + if err == nil { + continue + } + + if resErr == nil { + resErr = err + continue + } + + resErr = fmt.Errorf("%w; %s", resErr, err.Error()) + } + + return resErr +} diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 3b13bd99..14365564 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -6,7 +6,10 @@ import ( "github.com/gorilla/websocket" + "demodesk/neko/internal/utils" "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" + "demodesk/neko/internal/types/message" ) type WebSocketPeerCtx struct { @@ -43,5 +46,19 @@ func (peer *WebSocketPeerCtx) Destroy() error { return nil } - return peer.connection.Close() + var errs []error + + // send disconnect + err := peer.Send( + message.SystemDisconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: "connection destroyed", + }) + errs = append(errs, err) + + // close connection + err = peer.connection.Close() + errs = append(errs, err) + + return utils.ErrorsJoin(errs) } From d8c031af4dd82ce764d7cf65ebe702cdbca42bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 29 Mar 2021 00:58:51 +0200 Subject: [PATCH 476/876] add video config evaluation. --- go.mod | 1 + go.sum | 3 ++ internal/capture/manager.go | 93 ++++++++++++--------------------- internal/config/capture.go | 14 +++++ internal/types/capture.go | 100 ++++++++++++++++++++++++++++++++++++ 5 files changed, 151 insertions(+), 60 deletions(-) diff --git a/go.mod b/go.mod index dc4b022a..9316514c 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module demodesk/neko go 1.16 require ( + github.com/PaesslerAG/gval v1.1.0 // indirect github.com/go-chi/chi v1.5.4 github.com/go-chi/cors v1.1.1 github.com/google/uuid v1.2.0 // indirect diff --git a/go.sum b/go.sum index 0192d70e..f8b7e7e3 100644 --- a/go.sum +++ b/go.sum @@ -14,6 +14,9 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PaesslerAG/gval v1.1.0 h1:k3RuxeZDO3eejD4cMPSt+74tUSvTnbGvLx0df4mdwFc= +github.com/PaesslerAG/gval v1.1.0/go.mod h1:y/nm5yEyTeX6av0OfKJNp9rBNj2XrGhAf5+v24IBN1I= +github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 46a88718..6b6c8b5d 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -8,7 +8,6 @@ import ( "demodesk/neko/internal/config" "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" ) type CaptureManagerCtx struct { @@ -56,6 +55,37 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt ) } + videos := map[string]*StreamManagerCtx{} + videoIDs := []string{} + for key, pipelineConf := range config.Video { + codec, err := pipelineConf.GetCodec() + if err != nil { + logger.Panic().Err(err).Str("video_key", key).Msg("unable to get video codec") + } + + createPipeline := func() string { + screen := desktop.GetScreenSize() + + pipeline, err := pipelineConf.GetPipeline(*screen) + if err != nil { + logger.Panic().Err(err).Str("video_key", key).Msg("unable to get video pipeline") + } + + return fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=false use-damage=false "+ + "! %s "+ + "! appsink name=appsink", config.Display, pipeline, + ) + } + + // trigger function to catch evaluation errors at startup + _ = createPipeline() + + // append to videos + videos[key] = streamNew(codec, createPipeline) + videoIDs = append(videoIDs, key) + } + return &CaptureManagerCtx{ logger: logger, desktop: desktop, @@ -76,65 +106,8 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! appsink name=appsink", config.AudioDevice, config.AudioCodec.Pipeline, ) }), - videos: map[string]*StreamManagerCtx{ - "hd": streamNew(codec.VP8(), func() string { - screen := desktop.GetScreenSize() - bitrate := int((screen.Width * screen.Height * 6) / 4) - buffer := bitrate / 1000 - - return fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false "+ - "! video/x-raw,framerate=25/1 "+ - "! videoconvert "+ - "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=4 threads=4 deadline=1 undershoot=95 keyframe-max-dist=25 min-quantizer=3 max-quantizer=32 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ - "! appsink name=appsink", config.Display, bitrate, buffer*6, buffer*4, buffer*5, - ) - }), - "hq": streamNew(codec.VP8(), func() string { - screen := desktop.GetScreenSize() - bitrate := int((screen.Width * screen.Height * 6) / 4) / 2 - buffer := bitrate / 1000 - - return fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false "+ - "! video/x-raw,framerate=15/1 "+ - "! videoconvert "+ - "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=4 threads=4 deadline=1 undershoot=95 keyframe-max-dist=25 min-quantizer=3 max-quantizer=32 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ - "! appsink name=appsink", config.Display, bitrate, buffer*6, buffer*4, buffer*5, - ) - }), - "mq": streamNew(codec.VP8(), func() string { - screen := desktop.GetScreenSize() - bitrate := int((screen.Width * screen.Height * 6) / 4) / 3 - buffer := bitrate / 1000 - - return fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false "+ - "! video/x-raw,framerate=10/1 "+ - "! videoconvert "+ - "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=4 threads=4 deadline=1 undershoot=95 keyframe-max-dist=25 min-quantizer=3 max-quantizer=32 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ - "! appsink name=appsink", config.Display, bitrate, buffer*6, buffer*4, buffer*5, - ) - }), - "lq": streamNew(codec.VP8(), func() string { - screen := desktop.GetScreenSize() - bitrate := int((screen.Width * screen.Height * 6) / 4) / 4 - buffer := bitrate / 1000 - - return fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=false use-damage=false "+ - "! video/x-raw,framerate=5/1 "+ - "! videoconvert "+ - "! queue "+ - "! vp8enc end-usage=cbr target-bitrate=%d cpu-used=4 threads=4 deadline=1 undershoot=95 keyframe-max-dist=25 min-quantizer=3 max-quantizer=32 buffer-size=%d buffer-initial-size=%d buffer-optimal-size=%d "+ - "! appsink name=appsink", config.Display, bitrate, buffer*6, buffer*4, buffer*5, - ) - }), - }, - videoIDs: []string{"hd", "hq", "mq", "lq"}, + videos: videos, + videoIDs: videoIDs, } } diff --git a/internal/config/capture.go b/internal/config/capture.go index d3612263..1bb4b6f6 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -7,12 +7,16 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/codec" + "demodesk/neko/internal/utils" ) type Capture struct { Display string + Video map[string] types.VideoConfig + AudioDevice string AudioCodec codec.RTPCodec AudioPipeline string @@ -94,6 +98,14 @@ func (s *Capture) Set() { // Display is provided by env variable s.Display = os.Getenv("DISPLAY") + // video + if err := viper.UnmarshalKey("capture.video", &s.Video, viper.DecodeHook( + utils.JsonStringAutoDecode(s.Video), + )); err != nil { + log.Warn().Err(err).Msgf("unable to parse video settings") + } + + // audio s.AudioDevice = viper.GetString("capture.audio.device") s.AudioPipeline = viper.GetString("capture.audio.pipeline") @@ -112,11 +124,13 @@ func (s *Capture) Set() { s.AudioCodec = codec.Opus() } + // broadcast s.BroadcastAudioBitrate = viper.GetInt("capture.broadcast.audio_bitrate") s.BroadcastVideoBitrate = viper.GetInt("capture.broadcast.video_bitrate") s.BroadcastPreset = viper.GetString("capture.broadcast.preset") s.BroadcastPipeline = viper.GetString("capture.broadcast.pipeline") + // screencast s.ScreencastEnabled = viper.GetBool("capture.screencast.enabled") s.ScreencastRate = viper.GetString("capture.screencast.rate") s.ScreencastQuality = viper.GetString("capture.screencast.quality") diff --git a/internal/types/capture.go b/internal/types/capture.go index e8ea6877..4cf3c337 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -1,7 +1,12 @@ package types import ( + "math" + "strings" + "fmt" + "github.com/pion/webrtc/v3/pkg/media" + "github.com/PaesslerAG/gval" "demodesk/neko/internal/types/codec" ) @@ -43,3 +48,98 @@ type CaptureManager interface { Video(videoID string) (StreamManager, bool) VideoIDs() []string } + +type VideoConfig struct { + Codec string `mapstructure:"codec"` + Width string `mapstructure:"width"` // expression + Height string `mapstructure:"height"` // expression + Fps string `mapstructure:"fps"` // expression + GstEncoder string `mapstructure:"gst_encoder"` + GstParams map[string]string `mapstructure:"gst_params"` // map of expressions + GstPipeline string `mapstructure:"gst_pipeline"` +} + +func (config *VideoConfig) GetCodec() (codec.RTPCodec, error) { + switch strings.ToLower(config.Codec) { + case "vp8": + return codec.VP8(), nil + case "vp9": + return codec.VP9(), nil + case "h264": + return codec.H264(), nil + default: + return codec.RTPCodec{}, fmt.Errorf("unknown codec") + } +} + +func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { + if config.GstPipeline != "" { + return config.GstPipeline, nil + } + + values := map[string]interface{}{ + "width": screen.Width, + "height": screen.Height, + "fps": screen.Rate, + } + + language := []gval.Language{ + gval.Function("round", func(args ...interface{}) (interface{}, error) { + return (int)(math.Round(args[0].(float64))), nil + }), + } + + // get fps pipeline + fpsPipeline := "video/x-raw ! videoconvert ! queue" + if config.Fps != "" { + var err error + val, err := gval.Evaluate(config.Fps, values, language...) + if err != nil { + return "", err + } + + if val != nil { + // TODO: To fraction. + fpsPipeline = fmt.Sprintf("video/x-raw,framerate=%v ! videoconvert ! queue", val) + } + } + + // get scale pipeline + scalePipeline := "" + if config.Width != "" && config.Height != "" { + w, err := gval.Evaluate(config.Width, values, language...) + if err != nil { + return "", err + } + + h, err := gval.Evaluate(config.Height, values, language...) + if err != nil { + return "", err + } + + if w != nil && h != nil { + scalePipeline = fmt.Sprintf("! videoscale ! video/x-raw,width=%v,height=%v ! queue", w, h) + } + } + + // get encoder pipeline + encPipeline := fmt.Sprintf("! %s", config.GstEncoder) + for key, expr := range config.GstParams { + if expr == "" { + continue + } + + val, err := gval.Evaluate(expr, values, language...) + if err != nil { + return "", err + } + + if val != nil { + encPipeline += fmt.Sprintf(" %s=%v", key, val) + } else { + encPipeline += fmt.Sprintf(" %s=%s", key, expr) + } + } + + return fmt.Sprintf("%s %s %s", fpsPipeline, scalePipeline, encPipeline), nil +} From 051ab9f4268c2f02aa63948c8073eb7220e273a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 29 Mar 2021 22:59:07 +0200 Subject: [PATCH 477/876] always start pipelines with !. --- internal/capture/manager.go | 3 +-- internal/types/capture.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 6b6c8b5d..c59702e8 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -73,8 +73,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ - "! %s "+ - "! appsink name=appsink", config.Display, pipeline, + "%s ! appsink name=appsink", config.Display, pipeline, ) } diff --git a/internal/types/capture.go b/internal/types/capture.go index 4cf3c337..b80ec2fc 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -90,7 +90,7 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { } // get fps pipeline - fpsPipeline := "video/x-raw ! videoconvert ! queue" + fpsPipeline := "! video/x-raw ! videoconvert ! queue" if config.Fps != "" { var err error val, err := gval.Evaluate(config.Fps, values, language...) @@ -100,7 +100,7 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { if val != nil { // TODO: To fraction. - fpsPipeline = fmt.Sprintf("video/x-raw,framerate=%v ! videoconvert ! queue", val) + fpsPipeline = fmt.Sprintf("! video/x-raw,framerate=%v ! videoconvert ! queue", val) } } From d84297fbecba0c7203d3c86cd76069b03fb8e072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 30 Mar 2021 00:36:13 +0200 Subject: [PATCH 478/876] update pipelines config settings extractor. --- internal/capture/manager.go | 29 ++++++++++-------- internal/config/capture.go | 58 ++++++++++++++++++++++++++++++++--- internal/types/capture.go | 61 +++++++++++++++++++------------------ 3 files changed, 102 insertions(+), 46 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index c59702e8..c4d00bf5 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -2,6 +2,7 @@ package capture import ( "fmt" + "strings" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -56,19 +57,20 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt } videos := map[string]*StreamManagerCtx{} - videoIDs := []string{} - for key, pipelineConf := range config.Video { - codec, err := pipelineConf.GetCodec() - if err != nil { - logger.Panic().Err(err).Str("video_key", key).Msg("unable to get video codec") - } + for key, cnf := range config.VideoPipelines { + pipelineConf := cnf createPipeline := func() string { - screen := desktop.GetScreenSize() + if pipelineConf.GstPipeline != "" { + return strings.Replace(pipelineConf.GstPipeline, "{display}", config.Display, 1) + } + screen := desktop.GetScreenSize() pipeline, err := pipelineConf.GetPipeline(*screen) if err != nil { - logger.Panic().Err(err).Str("video_key", key).Msg("unable to get video pipeline") + logger.Panic().Err(err). + Str("video_id", key). + Msg("unable to get video pipeline") } return fmt.Sprintf( @@ -78,11 +80,14 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt } // trigger function to catch evaluation errors at startup - _ = createPipeline() + pipeline := createPipeline() + logger.Info(). + Str("video_id", key). + Str("pipeline", pipeline). + Msg("syntax check for video stream pipeline passed") // append to videos - videos[key] = streamNew(codec, createPipeline) - videoIDs = append(videoIDs, key) + videos[key] = streamNew(config.VideoCodec, createPipeline) } return &CaptureManagerCtx{ @@ -106,7 +111,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt ) }), videos: videos, - videoIDs: videoIDs, + videoIDs: config.VideoIDs, } } diff --git a/internal/config/capture.go b/internal/config/capture.go index 1bb4b6f6..e73701d9 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -15,7 +15,9 @@ import ( type Capture struct { Display string - Video map[string] types.VideoConfig + VideoCodec codec.RTPCodec + VideoIDs []string + VideoPipelines map[string]types.VideoConfig AudioDevice string AudioCodec codec.RTPCodec @@ -49,6 +51,22 @@ func (Capture) Init(cmd *cobra.Command) error { return err } + // videos + cmd.PersistentFlags().String("capture.video.codec", "vp8", "video codec to be used") + if err := viper.BindPFlag("capture.video.codec", cmd.PersistentFlags().Lookup("capture.video.codec")); err != nil { + return err + } + + cmd.PersistentFlags().StringSlice("capture.video.ids", []string{}, "ordered list of video ids") + if err := viper.BindPFlag("capture.video.ids", cmd.PersistentFlags().Lookup("capture.video.ids")); err != nil { + return err + } + + cmd.PersistentFlags().String("capture.video.pipelines", "", "pipelines config in JSON used for video streaming") + if err := viper.BindPFlag("capture.video.pipelines", cmd.PersistentFlags().Lookup("capture.video.pipelines")); err != nil { + return err + } + // broadcast cmd.PersistentFlags().Int("capture.screencast.audio_bitrate", 128, "broadcast audio bitrate in KB/s") if err := viper.BindPFlag("capture.screencast.audio_bitrate", cmd.PersistentFlags().Lookup("capture.screencast.audio_bitrate")); err != nil { @@ -99,10 +117,42 @@ func (s *Capture) Set() { s.Display = os.Getenv("DISPLAY") // video - if err := viper.UnmarshalKey("capture.video", &s.Video, viper.DecodeHook( - utils.JsonStringAutoDecode(s.Video), + videoCodec := viper.GetString("capture.video.codec") + switch videoCodec { + case "vp8": + s.VideoCodec = codec.VP8() + case "vp9": + s.VideoCodec = codec.VP9() + case "h264": + s.VideoCodec = codec.H264() + default: + log.Warn().Str("codec", videoCodec).Msgf("unknown video codec, using Vp8") + s.VideoCodec = codec.VP8() + } + + s.VideoIDs = viper.GetStringSlice("capture.video.ids") + if err := viper.UnmarshalKey("capture.video.pipelines", &s.VideoPipelines, viper.DecodeHook( + utils.JsonStringAutoDecode(s.VideoPipelines), )); err != nil { - log.Warn().Err(err).Msgf("unable to parse video settings") + log.Warn().Err(err).Msgf("unable to parse video pipelines") + } + + // default video + if len(s.VideoPipelines) == 0 { + log.Warn().Msgf("no video pipelines specified, using defaults") + + s.VideoCodec = codec.VP8() + s.VideoPipelines = map[string]types.VideoConfig{ + "main": types.VideoConfig{ + GstPipeline: "ximagesrc display-name={display} show-pointer=false use-damage=false "+ + "! video/x-raw "+ + "! videoconvert "+ + "! queue "+ + "! vp8enc end-usage=cbr cpu-used=4 threads=4 deadline=1 keyframe-max-dist=25 "+ + "! appsink name=appsink", + }, + } + s.VideoIDs = []string{"main"} } // audio diff --git a/internal/types/capture.go b/internal/types/capture.go index b80ec2fc..ce095a33 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -3,6 +3,7 @@ package types import ( "math" "strings" + "context" "fmt" "github.com/pion/webrtc/v3/pkg/media" @@ -50,33 +51,17 @@ type CaptureManager interface { } type VideoConfig struct { - Codec string `mapstructure:"codec"` Width string `mapstructure:"width"` // expression Height string `mapstructure:"height"` // expression Fps string `mapstructure:"fps"` // expression + GstPrefix string `mapstructure:"gst_prefix"` // pipeline prefix, starts with ! GstEncoder string `mapstructure:"gst_encoder"` GstParams map[string]string `mapstructure:"gst_params"` // map of expressions - GstPipeline string `mapstructure:"gst_pipeline"` -} - -func (config *VideoConfig) GetCodec() (codec.RTPCodec, error) { - switch strings.ToLower(config.Codec) { - case "vp8": - return codec.VP8(), nil - case "vp9": - return codec.VP9(), nil - case "h264": - return codec.H264(), nil - default: - return codec.RTPCodec{}, fmt.Errorf("unknown codec") - } + GstSuffix string `mapstructure:"gst_suffix"` // pipeline suffix, starts with ! + GstPipeline string `mapstructure:"gst_pipeline"` // whole pipeline as a string } func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { - if config.GstPipeline != "" { - return config.GstPipeline, nil - } - values := map[string]interface{}{ "width": screen.Width, "height": screen.Height, @@ -92,34 +77,43 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { // get fps pipeline fpsPipeline := "! video/x-raw ! videoconvert ! queue" if config.Fps != "" { - var err error - val, err := gval.Evaluate(config.Fps, values, language...) + eval, err := gval.Full(language...).NewEvaluable(config.Fps) if err != nil { return "", err } - - if val != nil { - // TODO: To fraction. - fpsPipeline = fmt.Sprintf("! video/x-raw,framerate=%v ! videoconvert ! queue", val) + + val, err := eval.EvalFloat64(context.Background(), values) + if err != nil { + return "", err } + + fpsPipeline = fmt.Sprintf("! video/x-raw,framerate=%d/100 ! videoconvert ! queue", int(val*100)) } // get scale pipeline scalePipeline := "" if config.Width != "" && config.Height != "" { - w, err := gval.Evaluate(config.Width, values, language...) + eval, err := gval.Full(language...).NewEvaluable(config.Width) if err != nil { return "", err } - h, err := gval.Evaluate(config.Height, values, language...) + w, err := eval.EvalInt(context.Background(), values) if err != nil { return "", err } - if w != nil && h != nil { - scalePipeline = fmt.Sprintf("! videoscale ! video/x-raw,width=%v,height=%v ! queue", w, h) + eval, err = gval.Full(language...).NewEvaluable(config.Height) + if err != nil { + return "", err } + + h, err := eval.EvalInt(context.Background(), values) + if err != nil { + return "", err + } + + scalePipeline = fmt.Sprintf("! videoscale ! video/x-raw,width=%d,height=%d ! queue", w, h) } // get encoder pipeline @@ -141,5 +135,12 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { } } - return fmt.Sprintf("%s %s %s", fpsPipeline, scalePipeline, encPipeline), nil + // join strings with space + return strings.Join([]string{ + fpsPipeline, + scalePipeline, + config.GstPrefix, + encPipeline, + config.GstSuffix, + }[:]," "), nil } From d37933cc37d022ff758146bd92ccc1a174fcf3b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 30 Mar 2021 00:37:06 +0200 Subject: [PATCH 479/876] fmt edit. --- internal/config/capture.go | 12 ++++++------ internal/types/capture.go | 10 +++++----- internal/types/session.go | 2 +- internal/websocket/peer.go | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/config/capture.go b/internal/config/capture.go index e73701d9..6ff91461 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -140,15 +140,15 @@ func (s *Capture) Set() { // default video if len(s.VideoPipelines) == 0 { log.Warn().Msgf("no video pipelines specified, using defaults") - + s.VideoCodec = codec.VP8() s.VideoPipelines = map[string]types.VideoConfig{ "main": types.VideoConfig{ - GstPipeline: "ximagesrc display-name={display} show-pointer=false use-damage=false "+ - "! video/x-raw "+ - "! videoconvert "+ - "! queue "+ - "! vp8enc end-usage=cbr cpu-used=4 threads=4 deadline=1 keyframe-max-dist=25 "+ + GstPipeline: "ximagesrc display-name={display} show-pointer=false use-damage=false " + + "! video/x-raw " + + "! videoconvert " + + "! queue " + + "! vp8enc end-usage=cbr cpu-used=4 threads=4 deadline=1 keyframe-max-dist=25 " + "! appsink name=appsink", }, } diff --git a/internal/types/capture.go b/internal/types/capture.go index ce095a33..f8ba68be 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -1,13 +1,13 @@ package types import ( - "math" - "strings" "context" "fmt" + "math" + "strings" - "github.com/pion/webrtc/v3/pkg/media" "github.com/PaesslerAG/gval" + "github.com/pion/webrtc/v3/pkg/media" "demodesk/neko/internal/types/codec" ) @@ -55,7 +55,7 @@ type VideoConfig struct { Height string `mapstructure:"height"` // expression Fps string `mapstructure:"fps"` // expression GstPrefix string `mapstructure:"gst_prefix"` // pipeline prefix, starts with ! - GstEncoder string `mapstructure:"gst_encoder"` + GstEncoder string `mapstructure:"gst_encoder"` // gst encoder name GstParams map[string]string `mapstructure:"gst_params"` // map of expressions GstSuffix string `mapstructure:"gst_suffix"` // pipeline suffix, starts with ! GstPipeline string `mapstructure:"gst_pipeline"` // whole pipeline as a string @@ -142,5 +142,5 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { config.GstPrefix, encPipeline, config.GstSuffix, - }[:]," "), nil + }[:], " "), nil } diff --git a/internal/types/session.go b/internal/types/session.go index 65d120a4..cb11e82b 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -16,7 +16,7 @@ type Session interface { // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) SetWebSocketConnected(websocketPeer WebSocketPeer, connected bool) - GetWebSocketPeer() WebSocketPeer + GetWebSocketPeer() WebSocketPeer Send(v interface{}) error // webrtc diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 14365564..6bf1c344 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -6,10 +6,10 @@ import ( "github.com/gorilla/websocket" - "demodesk/neko/internal/utils" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" + "demodesk/neko/internal/utils" ) type WebSocketPeerCtx struct { From 55b868709de61b331f83636eb0d8552ea8c1a3af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 5 Apr 2021 21:08:08 +0200 Subject: [PATCH 480/876] supervisord as root. --- runtime/supervisord.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf index e27d23f5..e9380241 100644 --- a/runtime/supervisord.conf +++ b/runtime/supervisord.conf @@ -1,5 +1,6 @@ [supervisord] nodaemon=true +user=root pidfile=/var/run/supervisord.pid logfile=/dev/null logfile_maxbytes=0 From ac04eaaa48062b0c4726f80c63d7d5cdc5d855a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 5 Apr 2021 21:13:09 +0200 Subject: [PATCH 481/876] add devcontainer. --- .devcontainer/Dockerfile | 104 ++++++++++++++++++++++++++++++++ .devcontainer/README.md | 5 ++ .devcontainer/devcontainer.json | 40 ++++++++++++ .vscode/launch.json | 18 ++++++ 4 files changed, 167 insertions(+) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/README.md create mode 100644 .devcontainer/devcontainer.json create mode 100644 .vscode/launch.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..dd6bd594 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,104 @@ +# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.166.0/containers/go/.devcontainer/base.Dockerfile + +# [Choice] Go version: 1, 1.16, 1.15 +ARG VARIANT="1" +FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT} + +# [Option] Install Node.js +ARG INSTALL_NODE="true" +ARG NODE_VERSION="lts/*" +RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi + +# build dependencies +RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get -y install --no-install-recommends \ + libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev + +# runtime dependencies +RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get -y install --no-install-recommends \ + wget ca-certificates supervisor \ + pulseaudio dbus-x11 xserver-xorg-video-dummy xserver-xorg-input-void \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx5 \ + # + # file chooser handler, clipboard + xdotool xclip \ + # + # gst + gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ + gstreamer1.0-pulseaudio; + +# browser dependencies +RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get -y install --no-install-recommends openbox chromium; + +# configure runtime +ARG USERNAME=neko +ARG USER_UID=1001 +ARG USER_GID=$USER_UID +RUN set -eux; \ + # + # create a non-root user + groupadd --gid $USER_GID $USERNAME; \ + useradd --uid $USER_UID --gid $USERNAME --shell /bin/bash --create-home $USERNAME; \ + adduser $USERNAME audio; \ + adduser $USERNAME video; \ + adduser $USERNAME pulse; \ + # + # add sudo support + apt-get update; \ + apt-get install -y sudo; \ + echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME; \ + chmod 0440 /etc/sudoers.d/$USERNAME; \ + # + # setup pulseaudio + mkdir -p /home/$USERNAME/.config/pulse/; \ + echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \ + # + # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 + mkdir /tmp/.X11-unix; \ + chmod 1777 /tmp/.X11-unix; \ + chown $USERNAME /tmp/.X11-unix/; \ + # + # make directories for neko + mkdir -p /etc/neko /var/www /var/log/neko; \ + chmod 1777 /var/log/neko; \ + chown $USERNAME /var/log/neko/; \ + chown -R $USERNAME:$USERNAME /home/$USERNAME + +# copy runtime files +COPY runtime/dbus /usr/bin/dbus +COPY runtime/default.pa /etc/pulse/default.pa +COPY runtime/supervisord.conf /etc/neko/supervisord.conf +COPY runtime/xorg.conf /etc/neko/xorg.conf +COPY runtime/icon-theme /home/$USERNAME/.icons/default + +# copy browser files +COPY runtime/browser/env_wrapper /usr/bin/env_wrapper +# COPY runtime/browser/openbox.xml /etc/neko/openbox.xml +COPY runtime/browser/supervisord.chromium.conf /etc/neko/supervisord/chromium.conf +COPY runtime/browser/extension /usr/share/chromium/extensions/neko +# COPY runtime/browser/policies.json /etc/chromium/policies/managed/policies.json +COPY --chown=$USERNAME runtime/browser/preferences.json /home/neko/.config/chromium/Default/Preferences + +# copy dev files +COPY dev/runtime/openbox.xml /etc/neko/openbox.xml +COPY dev/runtime/policies.json /etc/chromium/policies/managed/policies.json +COPY dev/runtime/config.yml /etc/neko/neko.yml +COPY dev/runtime/supervisord.debug.conf /etc/neko/supervisord/debug.conf + +# customized scripts +RUN chmod +x /usr/bin/dbus;\ + echo '#!/bin/sh\nsleep infinity' > /usr/bin/neko; \ + chmod +x /usr/bin/neko; \ + echo '#!/bin/sh\nsudo sh -c "export USER='$USERNAME'\nexport HOME=/home/'$USERNAME'\n/usr/bin/supervisord -c /etc/neko/supervisord.conf"' > /usr/bin/deps; \ + chmod +x /usr/bin/deps; + +# set default envs +ENV USER=$USERNAME +ENV DISPLAY=:99.0 +ENV NEKO_SERVER_BIND=:3000 +ENV NEKO_WEBRTC_EPR=3001-3004 +ENV BROWSER_KIOSK=false diff --git a/.devcontainer/README.md b/.devcontainer/README.md new file mode 100644 index 00000000..a6069f1c --- /dev/null +++ b/.devcontainer/README.md @@ -0,0 +1,5 @@ +# dev container + +You need to run all dependencies with `deps` command before you start debugging. + +Make sure your local IP is correct in `.vscode/launch.json`, diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..90b40ad0 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,40 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.166.0/containers/go +{ + "name": "Go", + "build": { + "dockerfile": "Dockerfile", + "context": "../", + "args": { + // Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.15 + "VARIANT": "1.16", + // Options + "INSTALL_NODE": "false", + "NODE_VERSION": "lts/*" + } + }, + "runArgs": [ "--cap-add=SYS_PTRACE", "--cap-add=SYS_ADMIN", "--shm-size=2G", "--security-opt", "seccomp=unconfined" ], + + // Set *default* container specific settings.json values on container create. + "settings": { + "terminal.integrated.shell.linux": "/bin/bash", + "go.toolsManagement.checkForUpdates": "local", + "go.useLanguageServer": true, + "go.gopath": "/go", + "go.goroot": "/usr/local/go" + }, + + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "golang.Go" + ], + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "appPort": ["3000:3000", "3001:3001/udp", "3002:3002/udp", "3003:3003/udp", "3004:3004/udp"], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "go version", + + // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "neko" +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..1cf4b94e --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,18 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "launch", + "type": "go", + "request": "launch", + "mode": "debug", + "program": "${workspaceFolder}/cmd/neko", + "output": "${workspaceFolder}/bin/debug/neko", + "cwd": "${workspaceFolder}/", + "args": ["serve", "-d", "--webrtc.nat1to1", "192.168.1.80"] + } + ] +} From b48998f3f9a23ae57646bfa9f1d204be24af2ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 5 Apr 2021 23:03:49 +0200 Subject: [PATCH 482/876] bulk update members. --- internal/api/members/bluk.go | 55 +++++++++++++++++++++++++++++++++ internal/api/members/handler.go | 6 ++++ internal/api/router.go | 1 + 3 files changed, 62 insertions(+) create mode 100644 internal/api/members/bluk.go diff --git a/internal/api/members/bluk.go b/internal/api/members/bluk.go new file mode 100644 index 00000000..5d5edb20 --- /dev/null +++ b/internal/api/members/bluk.go @@ -0,0 +1,55 @@ +package members + +import ( + "encoding/json" + "fmt" + "io/ioutil" + "net/http" + + "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" +) + +type MemberBulkUpdatePayload struct { + IDs []string `json:"ids"` + Profile types.MemberProfile `json:"profile"` +} + +func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Request) { + bytes, err := ioutil.ReadAll(r.Body) + if err != nil { + utils.HttpInternalServerError(w, err) + return + } + + header := &MemberBulkUpdatePayload{} + if err := json.Unmarshal(bytes, &header); err != nil { + utils.HttpInternalServerError(w, err) + return + } + + for _, memberId := range header.IDs { + // TODO: Bulk select? + profile, err := h.members.Select(memberId) + if err != nil { + utils.HttpInternalServerError(w, fmt.Sprintf("member %s: %v", memberId, err)) + return + } + + body := &MemberBulkUpdatePayload{ + Profile: profile, + } + + if err := json.Unmarshal(bytes, &body); err != nil { + utils.HttpInternalServerError(w, fmt.Sprintf("member %s: %v", memberId, err)) + return + } + + if err := h.members.UpdateProfile(memberId, body.Profile); err != nil { + utils.HttpInternalServerError(w, fmt.Sprintf("member %s: %v", memberId, err)) + return + } + } + + utils.HttpSuccess(w) +} diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 0988f9b9..29656ac7 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -45,6 +45,12 @@ func (h *MembersHandler) Route(r chi.Router) { }) } +func (h *MembersHandler) RouteBulk(r chi.Router) { + r.With(auth.AdminsOnly).Group(func(r chi.Router) { + r.Post("/update", h.membersBulkUpdate) + }) +} + type MemberData struct { ID string Profile types.MemberProfile diff --git a/internal/api/router.go b/internal/api/router.go index 45b6fe2c..df00e79e 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -50,6 +50,7 @@ func (api *ApiManagerCtx) Route(r chi.Router) { membersHandler := members.New(api.members) r.Route("/members", membersHandler.Route) + r.Route("/members_bulk", membersHandler.RouteBulk) roomHandler := room.New(api.sessions, api.desktop, api.capture) r.Route("/room", roomHandler.Route) From 3e5e8bfec7ffdb955e0196c99c20690996d76058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 6 Apr 2021 20:51:08 +0200 Subject: [PATCH 483/876] xorg add noreset and nolisten tcp. --- runtime/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf index e9380241..357280a6 100644 --- a/runtime/supervisord.conf +++ b/runtime/supervisord.conf @@ -22,7 +22,7 @@ redirect_stderr=true [program:x-server] environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" -command=/usr/bin/X -config /etc/neko/xorg.conf %(ENV_DISPLAY)s +command=/usr/bin/X %(ENV_DISPLAY)s -config /etc/neko/xorg.conf -noreset -nolisten tcp autorestart=true priority=300 user=%(ENV_USER)s From 536bab14e5d73663d99d639d3e7b872d56105721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 8 Apr 2021 00:08:21 +0200 Subject: [PATCH 484/876] =?UTF-8?q?workaround=20for=20"Keyboard=20bugs=20=20=E2=86=92=20>>".?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/desktop/xorg.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 35a43d5c..e78189d6 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -62,6 +62,12 @@ func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize { } func (manager *DesktopManagerCtx) SetKeyboardMap(kbd types.KeyboardMap) error { + // Workaround for https://github.com/m1k1o/neko/issues/45 + // When pressing `shift` + `,` instead of `<` comes `>`. + if kbd.Layout == "us" && kbd.Variant == "" { + kbd.Variant = "mac" + } + // TOOD: Use native API. cmd := exec.Command("setxkbmap", "-layout", kbd.Layout, "-variant", kbd.Variant) _, err := cmd.Output() From 5acfae72be8578285226e42ad20f2911bdc4fa31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 10 Apr 2021 01:07:19 +0200 Subject: [PATCH 485/876] =?UTF-8?q?Revert=20"workaround=20for=20"Keyboard?= =?UTF-8?q?=20bugs=20<>=20=E2=86=92=20>>"."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/desktop/xorg.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index e78189d6..35a43d5c 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -62,12 +62,6 @@ func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize { } func (manager *DesktopManagerCtx) SetKeyboardMap(kbd types.KeyboardMap) error { - // Workaround for https://github.com/m1k1o/neko/issues/45 - // When pressing `shift` + `,` instead of `<` comes `>`. - if kbd.Layout == "us" && kbd.Variant == "" { - kbd.Variant = "mac" - } - // TOOD: Use native API. cmd := exec.Command("setxkbmap", "-layout", kbd.Layout, "-variant", kbd.Variant) _, err := cmd.Output() From 7d06f33ff0276523dd441d5bfa203acc15e91605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 10 Apr 2021 01:10:14 +0200 Subject: [PATCH 486/876] kecode to keysym respecting modifiers. --- internal/desktop/xorg/xorg.c | 105 +++++++++++++++++++++++++++++++--- internal/desktop/xorg/xorg.go | 8 +-- internal/desktop/xorg/xorg.h | 12 +++- 3 files changed, 112 insertions(+), 13 deletions(-) diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index 8d446440..dfc59667 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -68,25 +68,114 @@ void XButton(unsigned int button, int down) { XSync(display, 0); } -void XKey(unsigned long key, int down) { - if (key == 0) return; +static xkeyentry_t *pKeysHead = NULL; + +void XKeyEntryAdd(KeySym keysym, KeyCode keycode) { + xkeyentry_t *entry = (xkeyentry_t *) malloc(sizeof(xkeyentry_t)); + if (entry == NULL) { + return; + } + + entry->keysym = keysym; + entry->keycode = keycode; + entry->next = pKeysHead; + pKeysHead = entry; +} + +KeyCode XKeyEntryGet(KeySym keysym) { + xkeyentry_t *prev = NULL; + xkeyentry_t *curr = pKeysHead; + + KeyCode keycode = 0; + while (curr != NULL) { + if (curr->keysym == keysym) { + keycode = curr->keycode; + + if (prev == NULL) { + pKeysHead = curr->next; + } else { + prev->next = curr->next; + } + + free(curr); + return keycode; + } + + prev = curr; + curr = curr->next; + } + + return 0; +} + +// From https://github.com/TigerVNC/tigervnc/blob/0946e298075f8f7b6d63e552297a787c5f84d27c/unix/x0vncserver/XDesktop.cxx#L343-L379 +KeyCode KbdXKeysymToKeycode(Display *dpy, KeySym keysym) { + XkbDescPtr xkb; + XkbStateRec state; + unsigned int mods; + unsigned keycode; + + xkb = XkbGetMap(dpy, XkbAllComponentsMask, XkbUseCoreKbd); + if (!xkb) + return 0; + + XkbGetState(dpy, XkbUseCoreKbd, &state); + // XkbStateFieldFromRec() doesn't work properly because + // state.lookup_mods isn't properly updated, so we do this manually + mods = XkbBuildCoreState(XkbStateMods(&state), state.group); + + for (keycode = xkb->min_key_code; + keycode <= xkb->max_key_code; + keycode++) { + KeySym cursym; + unsigned int out_mods; + XkbTranslateKeyCode(xkb, keycode, mods, &out_mods, &cursym); + if (cursym == keysym) + break; + } + + if (keycode > xkb->max_key_code) + keycode = 0; + + XkbFreeKeyboard(xkb, XkbAllComponentsMask, True); + + // Shift+Tab is usually ISO_Left_Tab, but RFB hides this fact. Do + // another attempt if we failed the initial lookup + if ((keycode == 0) && (keysym == XK_Tab) && (mods & ShiftMask)) + return KbdXKeysymToKeycode(dpy, XK_ISO_Left_Tab); + + return keycode; +} + +void XKey(KeySym keysym, int down) { + if (keysym == 0) + return; Display *display = getXDisplay(); - KeyCode code = XKeysymToKeycode(display, key); + KeyCode keycode = 0; + + if (!down) + keycode = XKeyEntryGet(keysym); + + if (keycode == 0) + keycode = KbdXKeysymToKeycode(display, keysym); // Map non-existing keysyms to new keycodes - if (code == 0) { + if (keycode == 0) { int min, max, numcodes; XDisplayKeycodes(display, &min, &max); XGetKeyboardMapping(display, min, max-min, &numcodes); - code = (max-min+1)*numcodes; + keycode = (max-min+1)*numcodes; KeySym keysym_list[numcodes]; - for(int i=0;i Date: Sun, 11 Apr 2021 16:42:57 +0200 Subject: [PATCH 487/876] fix xorg headers file. --- internal/desktop/xorg/xorg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index 2b96b377..fac230e5 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -28,7 +28,7 @@ typedef struct xkeyentry_t { static void XKeyEntryAdd(KeySym keysym, KeyCode keycode); static KeyCode XKeyEntryGet(KeySym keysym); -static KeyCode XKeysymToKeycodeRespectingModifiers(Display *display, KeySym keysym); +static KeyCode KbdXKeysymToKeycode(Display *dpy, KeySym keysym); void XKey(KeySym keysym, int down); void XGetScreenConfigurations(); From cfdcafc6119f3091285b2ffd6f4c2f38c9a58591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 11 Apr 2021 16:48:59 +0200 Subject: [PATCH 488/876] xorg fix naming & KeyCode type. --- internal/desktop/xorg/xorg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index dfc59667..c4d7dd5b 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -68,7 +68,7 @@ void XButton(unsigned int button, int down) { XSync(display, 0); } -static xkeyentry_t *pKeysHead = NULL; +static xkeyentry_t *xKeysHead = NULL; void XKeyEntryAdd(KeySym keysym, KeyCode keycode) { xkeyentry_t *entry = (xkeyentry_t *) malloc(sizeof(xkeyentry_t)); @@ -78,13 +78,13 @@ void XKeyEntryAdd(KeySym keysym, KeyCode keycode) { entry->keysym = keysym; entry->keycode = keycode; - entry->next = pKeysHead; - pKeysHead = entry; + entry->next = xKeysHead; + xKeysHead = entry; } KeyCode XKeyEntryGet(KeySym keysym) { xkeyentry_t *prev = NULL; - xkeyentry_t *curr = pKeysHead; + xkeyentry_t *curr = xKeysHead; KeyCode keycode = 0; while (curr != NULL) { @@ -92,7 +92,7 @@ KeyCode XKeyEntryGet(KeySym keysym) { keycode = curr->keycode; if (prev == NULL) { - pKeysHead = curr->next; + xKeysHead = curr->next; } else { prev->next = curr->next; } @@ -113,7 +113,7 @@ KeyCode KbdXKeysymToKeycode(Display *dpy, KeySym keysym) { XkbDescPtr xkb; XkbStateRec state; unsigned int mods; - unsigned keycode; + KeyCode keycode; xkb = XkbGetMap(dpy, XkbAllComponentsMask, XkbUseCoreKbd); if (!xkb) From cb17046aee987bed39da056b6a54327709ffc9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 11 Apr 2021 19:06:56 +0200 Subject: [PATCH 489/876] lint fix. --- internal/desktop/xorg/xorg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index c4d7dd5b..02cffd47 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -61,7 +61,8 @@ void XScroll(int x, int y) { } void XButton(unsigned int button, int down) { - if (button == 0) return; + if (button == 0) + return; Display *display = getXDisplay(); XTestFakeButtonEvent(display, button, down, CurrentTime); @@ -72,9 +73,8 @@ static xkeyentry_t *xKeysHead = NULL; void XKeyEntryAdd(KeySym keysym, KeyCode keycode) { xkeyentry_t *entry = (xkeyentry_t *) malloc(sizeof(xkeyentry_t)); - if (entry == NULL) { + if (entry == NULL) return; - } entry->keysym = keysym; entry->keycode = keycode; From 45e85c8864f9cfa4984626d4bc0050bb6c5e9d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 12 Apr 2021 13:25:10 +0000 Subject: [PATCH 490/876] use exact XkbKeysymToKeycode from tigervnc. --- internal/desktop/xorg/xorg.c | 8 ++++---- internal/desktop/xorg/xorg.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c index 02cffd47..bc545c46 100644 --- a/internal/desktop/xorg/xorg.c +++ b/internal/desktop/xorg/xorg.c @@ -109,11 +109,11 @@ KeyCode XKeyEntryGet(KeySym keysym) { } // From https://github.com/TigerVNC/tigervnc/blob/0946e298075f8f7b6d63e552297a787c5f84d27c/unix/x0vncserver/XDesktop.cxx#L343-L379 -KeyCode KbdXKeysymToKeycode(Display *dpy, KeySym keysym) { +KeyCode XkbKeysymToKeycode(Display* dpy, KeySym keysym) { XkbDescPtr xkb; XkbStateRec state; unsigned int mods; - KeyCode keycode; + unsigned keycode; xkb = XkbGetMap(dpy, XkbAllComponentsMask, XkbUseCoreKbd); if (!xkb) @@ -142,7 +142,7 @@ KeyCode KbdXKeysymToKeycode(Display *dpy, KeySym keysym) { // Shift+Tab is usually ISO_Left_Tab, but RFB hides this fact. Do // another attempt if we failed the initial lookup if ((keycode == 0) && (keysym == XK_Tab) && (mods & ShiftMask)) - return KbdXKeysymToKeycode(dpy, XK_ISO_Left_Tab); + return XkbKeysymToKeycode(dpy, XK_ISO_Left_Tab); return keycode; } @@ -158,7 +158,7 @@ void XKey(KeySym keysym, int down) { keycode = XKeyEntryGet(keysym); if (keycode == 0) - keycode = KbdXKeysymToKeycode(display, keysym); + keycode = XkbKeysymToKeycode(display, keysym); // Map non-existing keysyms to new keycodes if (keycode == 0) { diff --git a/internal/desktop/xorg/xorg.h b/internal/desktop/xorg/xorg.h index fac230e5..f5ebd399 100644 --- a/internal/desktop/xorg/xorg.h +++ b/internal/desktop/xorg/xorg.h @@ -28,7 +28,7 @@ typedef struct xkeyentry_t { static void XKeyEntryAdd(KeySym keysym, KeyCode keycode); static KeyCode XKeyEntryGet(KeySym keysym); -static KeyCode KbdXKeysymToKeycode(Display *dpy, KeySym keysym); +static KeyCode XkbKeysymToKeycode(Display *dpy, KeySym keysym); void XKey(KeySym keysym, int down); void XGetScreenConfigurations(); From 2d8574d5d6b6d0e8ee1affcba2597f539e29fc55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 19 Apr 2021 15:39:09 +0000 Subject: [PATCH 491/876] add fonts. --- Dockerfile | 17 ++++- runtime/fontconfig/75-emoji.conf | 118 +++++++++++++++++++++++++++++++ runtime/fonts/.gitkeep | 0 3 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 runtime/fontconfig/75-emoji.conf create mode 100644 runtime/fonts/.gitkeep diff --git a/Dockerfile b/Dockerfile index 96000a7a..e487aaa8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -85,6 +85,19 @@ RUN set -eux; \ chown $USERNAME /var/log/neko/; \ chown -R $USERNAME:$USERNAME /home/$USERNAME; \ # + # install fonts + apt-get install -y --no-install-recommends \ + # Emojis + fonts-noto-color-emoji \ + # Chinese fonts + fonts-arphic-ukai fonts-arphic-uming \ + # Japanese fonts + fonts-ipafont-mincho fonts-ipafont-gothic \ + # Korean fonts + fonts-unfonts-core \ + # Indian fonts + fonts-indic; \ + # # clean up apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* @@ -98,7 +111,9 @@ COPY runtime/xorg.conf /etc/neko/xorg.conf # # copy runtime folders -COPY runtime/icon-theme /home/$USERNAME/.icons/default +COPY --chown=$USERNAME runtime/icon-theme /home/$USERNAME/.icons/default +COPY runtime/fontconfig/* /etc/fonts/conf.d/ +COPY runtime/fonts /usr/local/share/fonts # # set default envs diff --git a/runtime/fontconfig/75-emoji.conf b/runtime/fontconfig/75-emoji.conf new file mode 100644 index 00000000..f47023e5 --- /dev/null +++ b/runtime/fontconfig/75-emoji.conf @@ -0,0 +1,118 @@ + + + + + + + + + emoji + Noto Color Emoji + + + + + + + sans + Noto Color Emoji + + + + serif + Noto Color Emoji + + + + sans-serif + Noto Color Emoji + + + + monospace + Noto Color Emoji + + + + + + + + + + Symbola + + + + + + + + + + Android Emoji + Noto Color Emoji + + + + Apple Color Emoji + Noto Color Emoji + + + + EmojiSymbols + Noto Color Emoji + + + + Emoji Two + Noto Color Emoji + + + + EmojiTwo + Noto Color Emoji + + + + Noto Color Emoji + Noto Color Emoji + + + + Segoe UI Emoji + Noto Color Emoji + + + + Segoe UI Symbol + Noto Color Emoji + + + + Symbola + Noto Color Emoji + + + + Twemoji + Noto Color Emoji + + + + Twemoji Mozilla + Noto Color Emoji + + + + TwemojiMozilla + Noto Color Emoji + + + + Twitter Color Emoji + Noto Color Emoji + + + + diff --git a/runtime/fonts/.gitkeep b/runtime/fonts/.gitkeep new file mode 100644 index 00000000..e69de29b From 9b1deb41346fc67ab1589f6f2e7f02eeb5b338f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 19 Apr 2021 18:03:27 +0000 Subject: [PATCH 492/876] dockerfile fix chown. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e487aaa8..54467539 100644 --- a/Dockerfile +++ b/Dockerfile @@ -111,7 +111,7 @@ COPY runtime/xorg.conf /etc/neko/xorg.conf # # copy runtime folders -COPY --chown=$USERNAME runtime/icon-theme /home/$USERNAME/.icons/default +COPY --chown=neko:neko runtime/icon-theme /home/$USERNAME/.icons/default COPY runtime/fontconfig/* /etc/fonts/conf.d/ COPY runtime/fonts /usr/local/share/fonts From 04d2fa886388d6ab54d8c716a1c39a6da8f15eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 24 Apr 2021 20:53:37 +0200 Subject: [PATCH 493/876] cookie: enabled / disabled. --- internal/api/router.go | 5 ++++- internal/api/session.go | 19 ++++++++++++++----- internal/config/session.go | 7 +++++++ internal/session/manager.go | 4 ++++ internal/types/session.go | 1 + 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/internal/api/router.go b/internal/api/router.go index df00e79e..0198e8d0 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -70,7 +70,10 @@ func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session, err := api.sessions.Authenticate(r) if err != nil { - api.sessions.CookieClearToken(w, r) + if api.sessions.CookieEnabled() { + api.sessions.CookieClearToken(w, r) + } + utils.HttpUnauthorized(w, err) return } diff --git a/internal/api/session.go b/internal/api/session.go index 60c7b4ce..aa1f0a31 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -15,6 +15,7 @@ type SessionLoginPayload struct { type SessionDataPayload struct { ID string `json:"id"` + Token string `json:"token,omitempty"` Profile types.MemberProfile `json:"profile"` State types.SessionState `json:"state"` } @@ -31,13 +32,19 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { return } - api.sessions.CookieSetToken(w, token) - - utils.HttpSuccess(w, SessionDataPayload{ + sessionData := SessionDataPayload{ ID: session.ID(), Profile: session.Profile(), State: session.State(), - }) + } + + if api.sessions.CookieEnabled() { + api.sessions.CookieSetToken(w, token) + } else { + sessionData.Token = token + } + + utils.HttpSuccess(w, sessionData) } func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { @@ -49,7 +56,9 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { return } - api.sessions.CookieClearToken(w, r) + if api.sessions.CookieEnabled() { + api.sessions.CookieClearToken(w, r) + } utils.HttpSuccess(w, true) } diff --git a/internal/config/session.go b/internal/config/session.go index 5cc946c9..a990b3cb 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -11,6 +11,7 @@ type Session struct { ImplicitHosting bool APIToken string + CookieEnabled bool CookieName string CookieExpiration time.Time CookieSecure bool @@ -28,6 +29,11 @@ func (Session) Init(cmd *cobra.Command) error { } // cookie + cmd.PersistentFlags().Bool("session.cookie.enabled", true, "whether cookies authentication should be enabled") + if err := viper.BindPFlag("session.cookie.enabled", cmd.PersistentFlags().Lookup("session.cookie.enabled")); err != nil { + return err + } + cmd.PersistentFlags().String("session.cookie.name", "NEKO_SESSION", "name of the cookie that holds token") if err := viper.BindPFlag("session.cookie.name", cmd.PersistentFlags().Lookup("session.cookie.name")); err != nil { return err @@ -50,6 +56,7 @@ func (s *Session) Set() { s.ImplicitHosting = viper.GetBool("session.implicit_hosting") s.APIToken = viper.GetString("session.api_token") + s.CookieEnabled = viper.GetBool("session.cookie.enabled") s.CookieName = viper.GetString("session.cookie.name") s.CookieExpiration = time.Now().Add(time.Duration(viper.GetInt("session.cookie.expiration")) * time.Hour) s.CookieSecure = viper.GetBool("session.cookie.secure") diff --git a/internal/session/manager.go b/internal/session/manager.go index d53917f9..c632b131 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -300,3 +300,7 @@ func (manager *SessionManagerCtx) OnHostChanged(listener func(session types.Sess func (manager *SessionManagerCtx) ImplicitHosting() bool { return manager.config.ImplicitHosting } + +func (manager *SessionManagerCtx) CookieEnabled() bool { + return manager.config.CookieEnabled +} diff --git a/internal/types/session.go b/internal/types/session.go index cb11e82b..1eb1f17e 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -49,6 +49,7 @@ type SessionManager interface { OnHostChanged(listener func(session Session)) ImplicitHosting() bool + CookieEnabled() bool CookieSetToken(w http.ResponseWriter, token string) CookieClearToken(w http.ResponseWriter, r *http.Request) From 4f1e3c879a61a1e0a506824909ec386ba059ee5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 24 Apr 2021 21:11:07 +0200 Subject: [PATCH 494/876] read cookies only if enabled. --- internal/session/auth.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/internal/session/auth.go b/internal/session/auth.go index 6e6eaaa1..b12c2637 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -55,6 +55,14 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, } func (manager *SessionManagerCtx) getToken(r *http.Request) (string, bool) { + if manager.CookieEnabled() { + // get from Cookie + cookie, err := r.Cookie(manager.config.CookieName) + if err == nil { + return cookie.Value, true + } + } + // get from Header reqToken := r.Header.Get("Authorization") splitToken := strings.Split(reqToken, "Bearer ") @@ -62,12 +70,6 @@ func (manager *SessionManagerCtx) getToken(r *http.Request) (string, bool) { return strings.TrimSpace(splitToken[1]), true } - // get from Cookie - cookie, err := r.Cookie(manager.config.CookieName) - if err == nil { - return cookie.Value, true - } - // get from URL token := r.URL.Query().Get("token") if token != "" { From ec18775e26947443bcec7bc9095cab877f79382f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 24 Apr 2021 21:37:43 +0200 Subject: [PATCH 495/876] change error messages punctuation. --- internal/api/members/controler.go | 4 ++-- internal/api/room/broadcast.go | 6 +++--- internal/api/room/clipboard.go | 6 +++--- internal/api/room/control.go | 8 ++++---- internal/api/room/handler.go | 2 +- internal/api/room/keyboard.go | 4 ++-- internal/api/room/screen.go | 4 ++-- internal/api/room/upload.go | 20 ++++++++++---------- internal/desktop/xorg/xorg.go | 2 +- internal/http/auth/auth.go | 10 +++++----- internal/member/dummy/provider.go | 4 ++-- internal/member/file/provider.go | 12 ++++++------ internal/member/object/provider.go | 14 +++++++------- internal/session/manager.go | 8 ++++---- internal/utils/http.go | 14 +++++++------- 15 files changed, 59 insertions(+), 59 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 76c01694..a6a44a94 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -71,12 +71,12 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { } if data.Username == "" { - utils.HttpBadRequest(w, "Username cannot be empty.") + utils.HttpBadRequest(w, "username cannot be empty") return } if data.Password == "" { - utils.HttpBadRequest(w, "Password cannot be empty.") + utils.HttpBadRequest(w, "password cannot be empty") return } diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index b3722f53..d7665663 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -28,13 +28,13 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { } if data.URL == "" { - utils.HttpBadRequest(w, "Missing broadcast URL.") + utils.HttpBadRequest(w, "missing broadcast URL") return } broadcast := h.capture.Broadcast() if broadcast.Started() { - utils.HttpUnprocessableEntity(w, "Server is already broadcasting.") + utils.HttpUnprocessableEntity(w, "server is already broadcasting") return } @@ -56,7 +56,7 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { broadcast := h.capture.Broadcast() if !broadcast.Started() { - utils.HttpUnprocessableEntity(w, "Server is not broadcasting.") + utils.HttpUnprocessableEntity(w, "server is not broadcasting") return } diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index a241c15f..4a70da3d 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -64,7 +64,7 @@ func (h *RoomHandler) clipboardGetImage(w http.ResponseWriter, r *http.Request) func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) { err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) if err != nil { - utils.HttpBadRequest(w, "Failed to parse multipart form.") + utils.HttpBadRequest(w, "failed to parse multipart form") return } @@ -73,7 +73,7 @@ func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) file, header, err := r.FormFile("file") if err != nil { - utils.HttpBadRequest(w, "No file received.") + utils.HttpBadRequest(w, "no file received") return } @@ -81,7 +81,7 @@ func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) mime := header.Header.Get("Content-Type") if !strings.HasPrefix(mime, "image/") { - utils.HttpBadRequest(w, "File must be image.") + utils.HttpBadRequest(w, "file must be image") return } diff --git a/internal/api/room/control.go b/internal/api/room/control.go index b58a3b70..0bd5518a 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -36,7 +36,7 @@ func (h *RoomHandler) controlStatus(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { host := h.sessions.GetHost() if host != nil { - utils.HttpUnprocessableEntity(w, "There is already a host.") + utils.HttpUnprocessableEntity(w, "there is already a host") return } @@ -49,7 +49,7 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if !session.IsHost() { - utils.HttpUnprocessableEntity(w, "Session is not the host.") + utils.HttpUnprocessableEntity(w, "session is not the host") return } @@ -71,12 +71,12 @@ func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { target, ok := h.sessions.Get(sessionId) if !ok { - utils.HttpNotFound(w, "Target session was not found.") + utils.HttpNotFound(w, "target session was not found") return } if !target.Profile().CanHost { - utils.HttpBadRequest(w, "Target session is not allowed to host.") + utils.HttpBadRequest(w, "target session is not allowed to host") return } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 4f14e751..dc1e88d9 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -90,7 +90,7 @@ func (h *RoomHandler) uploadMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if !session.IsHost() && (!session.Profile().CanHost || !h.sessions.ImplicitHosting()) { - utils.HttpForbidden(w, "Without implicit hosting, only host can upload files.") + utils.HttpForbidden(w, "without implicit hosting, only host can upload files") } else { next.ServeHTTP(w, r) } diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 88d1fb58..dd1b4c72 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -29,7 +29,7 @@ func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) { }) if err != nil { - utils.HttpInternalServerError(w, "Unable to change keyboard map.") + utils.HttpInternalServerError(w, "unable to change keyboard map") return } @@ -40,7 +40,7 @@ func (h *RoomHandler) keyboardMapGet(w http.ResponseWriter, r *http.Request) { data, err := h.desktop.GetKeyboardMap() if err != nil { - utils.HttpInternalServerError(w, "Unable to get keyboard map.") + utils.HttpInternalServerError(w, "unable to get keyboard map") return } diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index f94f66b3..ba70fa1b 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -20,7 +20,7 @@ func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request size := h.desktop.GetScreenSize() if size == nil { - utils.HttpInternalServerError(w, "Unable to get screen configuration.") + utils.HttpInternalServerError(w, "unable to get screen configuration") return } @@ -96,7 +96,7 @@ func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) screenCastGet(w http.ResponseWriter, r *http.Request) { screencast := h.capture.Screencast() if !screencast.Enabled() { - utils.HttpBadRequest(w, "Screencast pipeline is not enabled.") + utils.HttpBadRequest(w, "screencast pipeline is not enabled") return } diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 52b224ac..86dbac8f 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -19,7 +19,7 @@ const ( func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) if err != nil { - utils.HttpBadRequest(w, "Failed to parse multipart form.") + utils.HttpBadRequest(w, "failed to parse multipart form") return } @@ -28,19 +28,19 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { X, err := strconv.Atoi(r.FormValue("x")) if err != nil { - utils.HttpBadRequest(w, "No X coordinate received.") + utils.HttpBadRequest(w, "no X coordinate received") return } Y, err := strconv.Atoi(r.FormValue("y")) if err != nil { - utils.HttpBadRequest(w, "No Y coordinate received.") + utils.HttpBadRequest(w, "no Y coordinate received") return } req_files := r.MultipartForm.File["files"] if len(req_files) == 0 { - utils.HttpBadRequest(w, "No files received.") + utils.HttpBadRequest(w, "no files received") return } @@ -80,7 +80,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { } if !h.desktop.DropFiles(X, Y, files) { - utils.HttpInternalServerError(w, "Unable to drop files.") + utils.HttpInternalServerError(w, "unable to drop files") return } @@ -90,7 +90,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) if err != nil { - utils.HttpBadRequest(w, "Failed to parse multipart form.") + utils.HttpBadRequest(w, "failed to parse multipart form") return } @@ -98,13 +98,13 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { defer r.MultipartForm.RemoveAll() if !h.desktop.IsFileChooserDialogOpened() { - utils.HttpBadRequest(w, "Open file chooser dialog first.") + utils.HttpBadRequest(w, "open file chooser dialog first") return } req_files := r.MultipartForm.File["files"] if len(req_files) == 0 { - utils.HttpBadRequest(w, "No files received.") + utils.HttpBadRequest(w, "no files received") return } @@ -141,7 +141,7 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { } if err := h.desktop.HandleFileChooserDialog(dir); err != nil { - utils.HttpInternalServerError(w, "Unable to handle file chooser dialog.") + utils.HttpInternalServerError(w, "unable to handle file chooser dialog") return } @@ -150,7 +150,7 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) uploadDialogClose(w http.ResponseWriter, r *http.Request) { if !h.desktop.IsFileChooserDialogOpened() { - utils.HttpBadRequest(w, "File chooser dialog is not open.") + utils.HttpBadRequest(w, "file chooser dialog is not open") return } diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 357b7474..e605fd5b 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -192,7 +192,7 @@ func ChangeScreenSize(width int, height int, rate int16) error { } } - return fmt.Errorf("Unknown screen configuration %dx%d@%d.", width, height, rate) + return fmt.Errorf("unknown screen configuration %dx%d@%d", width, height, rate) } func GetScreenSize() *types.ScreenSize { diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index 22dbc475..eed1d303 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -27,7 +27,7 @@ func AdminsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().IsAdmin { - utils.HttpForbidden(w, "Only admin can do this.") + utils.HttpForbidden(w) } else { next.ServeHTTP(w, r) } @@ -38,7 +38,7 @@ func HostsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.IsHost() { - utils.HttpForbidden(w, "Only host can do this.") + utils.HttpForbidden(w, "only host can do this") } else { next.ServeHTTP(w, r) } @@ -49,7 +49,7 @@ func CanWatchOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().CanWatch { - utils.HttpForbidden(w, "Only sessions, that can watch.") + utils.HttpForbidden(w) } else { next.ServeHTTP(w, r) } @@ -60,7 +60,7 @@ func CanHostOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().CanHost { - utils.HttpForbidden(w, "Only sessions, that can host.") + utils.HttpForbidden(w) } else { next.ServeHTTP(w, r) } @@ -71,7 +71,7 @@ func CanAccessClipboardOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().CanAccessClipboard { - utils.HttpForbidden(w, "Only sessions, that can access clipboard.") + utils.HttpForbidden(w) } else { next.ServeHTTP(w, r) } diff --git a/internal/member/dummy/provider.go b/internal/member/dummy/provider.go index abd7b4f5..8072e79b 100644 --- a/internal/member/dummy/provider.go +++ b/internal/member/dummy/provider.go @@ -37,7 +37,7 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string } func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { - return "", fmt.Errorf("Not implemented.") + return "", fmt.Errorf("not implemented") } func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { @@ -54,7 +54,7 @@ func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.Member } func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { - return fmt.Errorf("Not implemented.") + return fmt.Errorf("not implemented") } func (provider *MemberProviderCtx) Delete(id string) error { diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index 4a9db72d..e3ec3476 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -38,7 +38,7 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string // TODO: Use hash function. if entry.Password != password { - return "", types.MemberProfile{}, fmt.Errorf("Invalid password.") + return "", types.MemberProfile{}, fmt.Errorf("invalid password") } return id, entry.Profile, nil @@ -55,7 +55,7 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof _, ok := entries[id] if ok { - return "", fmt.Errorf("Member ID already exists.") + return "", fmt.Errorf("member ID already exists") } entries[id] = MemberEntry{ @@ -75,7 +75,7 @@ func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.Member entry, ok := entries[id] if !ok { - return fmt.Errorf("Member ID does not exist.") + return fmt.Errorf("member ID does not exist") } entry.Profile = profile @@ -92,7 +92,7 @@ func (provider *MemberProviderCtx) UpdatePassword(id string, password string) er entry, ok := entries[id] if !ok { - return fmt.Errorf("Member ID does not exist.") + return fmt.Errorf("member ID does not exist") } // TODO: Use hash function. @@ -139,7 +139,7 @@ func (provider *MemberProviderCtx) Delete(id string) error { _, ok := entries[id] if !ok { - return fmt.Errorf("Member ID does not exist.") + return fmt.Errorf("member ID does not exist") } delete(entries, id) @@ -178,7 +178,7 @@ func (provider *MemberProviderCtx) getEntry(id string) (MemberEntry, error) { entry, ok := entries[id] if !ok { - return MemberEntry{}, fmt.Errorf("Member ID does not exist.") + return MemberEntry{}, fmt.Errorf("member ID does not exist") } return entry, nil diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index 8a194b2c..68855d65 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -60,12 +60,12 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string entry, ok := provider.entries[id] if !ok { - return "", types.MemberProfile{}, fmt.Errorf("Member ID does not exist.") + return "", types.MemberProfile{}, fmt.Errorf("member ID does not exist") } // TODO: Use hash function. if entry.Password != password { - return "", types.MemberProfile{}, fmt.Errorf("Invalid password.") + return "", types.MemberProfile{}, fmt.Errorf("invalid password") } return id, entry.Profile, nil @@ -77,7 +77,7 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof _, ok := provider.entries[id] if ok { - return "", fmt.Errorf("Member ID already exists.") + return "", fmt.Errorf("member ID already exists") } provider.entries[id] = &MemberEntry{ @@ -92,7 +92,7 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { entry, ok := provider.entries[id] if !ok { - return fmt.Errorf("Member ID does not exist.") + return fmt.Errorf("member ID does not exist") } entry.Profile = profile @@ -103,7 +103,7 @@ func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.Member func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { entry, ok := provider.entries[id] if !ok { - return fmt.Errorf("Member ID does not exist.") + return fmt.Errorf("member ID does not exist") } // TODO: Use hash function. @@ -115,7 +115,7 @@ func (provider *MemberProviderCtx) UpdatePassword(id string, password string) er func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { entry, ok := provider.entries[id] if !ok { - return types.MemberProfile{}, fmt.Errorf("Member ID does not exist.") + return types.MemberProfile{}, fmt.Errorf("member ID does not exist") } return entry.Profile, nil @@ -139,7 +139,7 @@ func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string] func (provider *MemberProviderCtx) Delete(id string) error { _, ok := provider.entries[id] if !ok { - return fmt.Errorf("Member ID does not exist.") + return fmt.Errorf("member ID does not exist") } delete(provider.entries, id) diff --git a/internal/session/manager.go b/internal/session/manager.go index c632b131..50173467 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -68,12 +68,12 @@ func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) manager.sessionsMu.Lock() if _, ok := manager.sessions[id]; ok { manager.sessionsMu.Unlock() - return nil, "", fmt.Errorf("Session id already exists.") + return nil, "", fmt.Errorf("session id already exists") } if _, ok := manager.tokens[token]; ok { manager.sessionsMu.Unlock() - return nil, "", fmt.Errorf("Session token already exists.") + return nil, "", fmt.Errorf("session token already exists") } session := &SessionCtx{ @@ -98,7 +98,7 @@ func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) session, ok := manager.sessions[id] if !ok { manager.sessionsMu.Unlock() - return fmt.Errorf("Session id not found.") + return fmt.Errorf("session id not found") } session.profile = profile @@ -114,7 +114,7 @@ func (manager *SessionManagerCtx) Delete(id string) error { session, ok := manager.sessions[id] if !ok { manager.sessionsMu.Unlock() - return fmt.Errorf("Session id not found.") + return fmt.Errorf("session id not found") } delete(manager.tokens, session.token) diff --git a/internal/utils/http.go b/internal/utils/http.go index f85008f4..124c15fe 100644 --- a/internal/utils/http.go +++ b/internal/utils/http.go @@ -16,7 +16,7 @@ type ErrResponse struct { func HttpJsonRequest(w http.ResponseWriter, r *http.Request, res interface{}) bool { if err := json.NewDecoder(r.Body).Decode(res); err != nil { if err == io.EOF { - HttpBadRequest(w, "No data provided.") + HttpBadRequest(w, "no data provided") } else { HttpBadRequest(w, err) } @@ -53,27 +53,27 @@ func HttpSuccess(w http.ResponseWriter, res ...interface{}) { } func HttpBadRequest(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusBadRequest, "Bad Request.", res...) + defHttpError(w, http.StatusBadRequest, "bad request", res...) } func HttpUnauthorized(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusUnauthorized, "Invalid or missing access token.", res...) + defHttpError(w, http.StatusUnauthorized, "invalid or missing access token", res...) } func HttpForbidden(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusForbidden, "Access token does not have the required scope.", res...) + defHttpError(w, http.StatusForbidden, "access token does not have the required scope", res...) } func HttpNotFound(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusNotFound, "Resource not found.", res...) + defHttpError(w, http.StatusNotFound, "resource not found", res...) } func HttpUnprocessableEntity(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusUnprocessableEntity, "Unprocessable Entity.", res...) + defHttpError(w, http.StatusUnprocessableEntity, "unprocessable entity", res...) } func HttpInternalServerError(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusInternalServerError, "Internal server error.", res...) + defHttpError(w, http.StatusInternalServerError, "internal server error", res...) } func defHttpError(w http.ResponseWriter, status int, text string, res ...interface{}) { From 24af5a7c12898c48f370d5d99ca05cf924aadf6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Apr 2021 10:58:23 +0200 Subject: [PATCH 496/876] add more resolutions. --- runtime/xorg.conf | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/runtime/xorg.conf b/runtime/xorg.conf index 3b883454..77d1d944 100644 --- a/runtime/xorg.conf +++ b/runtime/xorg.conf @@ -27,7 +27,8 @@ Section "Device" Identifier "dummy_videocard" Driver "dummy" Option "ConstantDPI" "true" - VideoRam 512000 + VideoRam 1024000 + #VideoRam 512000 #VideoRam 256000 #VideoRam 192000 EndSection @@ -55,10 +56,14 @@ Section "Monitor" # 800x600 @ 60.00 Hz (GTF) hsync: 37.32 kHz; pclk: 38.22 MHz Modeline "800x600_60.00" 38.22 800 832 912 1024 600 601 604 622 -HSync +Vsync - # 1280x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 33.78 MHz - Modeline "1280x720_30.00" 33.78 1280 1288 1408 1536 720 721 724 733 -HSync +Vsync + # 2560x1440 @ 30.00 Hz (GTF) hsync: 43.95 kHz; pclk: 146.27 MHz + Modeline "2560x1440_30.00" 146.27 2560 2680 2944 3328 1440 1441 1444 1465 -HSync +Vsync # 1920x1080 @ 30.00 Hz (GTF) hsync: 32.97 kHz; pclk: 80.18 MHz Modeline "1920x1080_30.00" 80.18 1920 1984 2176 2432 1080 1081 1084 1099 -HSync +Vsync + # 1368x768 @ 30.00 Hz (GTF) hsync: 23.46 kHz; pclk: 38.85 MHz + Modeline "1368x768_30.00" 38.85 1368 1376 1512 1656 768 769 772 782 -HSync +Vsync + # 1280x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 33.78 MHz + Modeline "1280x720_30.00" 33.78 1280 1288 1408 1536 720 721 724 733 -HSync +Vsync # 1152x648 @ 30.00 Hz (GTF) hsync: 19.80 kHz; pclk: 26.93 MHz Modeline "1152x648_30.00" 26.93 1152 1144 1256 1360 648 649 652 660 -HSync +Vsync # 1024x576 @ 30.00 Hz (GTF) hsync: 17.61 kHz; pclk: 20.85 MHz @@ -68,6 +73,11 @@ Section "Monitor" # 800x600 @ 30.00 Hz (GTF) hsync: 18.33 kHz; pclk: 17.01 MHz Modeline "800x600_30.00" 17.01 800 792 864 928 600 601 604 611 -HSync +Vsync + # 800x1600 @ 30.00 Hz (GTF) hsync: 48.84 kHz; pclk: 51.58 MHz + Modeline "800x1600_30.00" 51.58 800 840 928 1056 1600 1601 1604 1628 -HSync +Vsync + + # 3840x2160 @ 25.00 Hz (GTF) hsync: 54.77 kHz; pclk: 278.70 MHz + Modeline "3840x2160_25.00" 278.70 3840 4056 4464 5088 2160 2161 2164 2191 -HSync +Vsync # 1920x1080 @ 25.00 Hz (GTF) hsync: 27.40 kHz; pclk: 64.88 MHz Modeline "1920x1080_25.00" 64.88 1920 1952 2144 2368 1080 1081 1084 1096 -HSync +Vsync EndSection @@ -80,7 +90,7 @@ Section "Screen" SubSection "Display" Viewport 0 0 Depth 24 - Modes "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "1280x720_30.00" "1920x1080_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00" "1920x1080_25.00" + Modes "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "2560x1440_30.00" "1920x1080_30.00" "1368x768_30.00" "1280x720_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00" "3840x2160_25.00" "1920x1080_25.00" "800x1600_30.00" EndSubSection EndSection From 57deea25d4e19e7a38b465c66909e1a12c31ad96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Apr 2021 13:24:49 +0000 Subject: [PATCH 497/876] golang upgrade deps. --- go.mod | 25 ++++++-------- go.sum | 106 ++++++++++++++++++++++++++++++--------------------------- 2 files changed, 67 insertions(+), 64 deletions(-) diff --git a/go.mod b/go.mod index 9316514c..17288766 100644 --- a/go.mod +++ b/go.mod @@ -3,28 +3,25 @@ module demodesk/neko go 1.16 require ( - github.com/PaesslerAG/gval v1.1.0 // indirect + github.com/PaesslerAG/gval v1.1.0 github.com/go-chi/chi v1.5.4 - github.com/go-chi/cors v1.1.1 - github.com/google/uuid v1.2.0 // indirect + github.com/go-chi/cors v1.2.0 github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 - github.com/magiconair/properties v1.8.4 // indirect + github.com/magiconair/properties v1.8.5 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect - github.com/pelletier/go-toml v1.8.1 // indirect - github.com/pion/interceptor v0.0.10 // indirect + github.com/pelletier/go-toml v1.9.0 // indirect + github.com/pion/interceptor v0.0.12 github.com/pion/logging v0.2.2 - github.com/pion/transport v0.12.3 // indirect - github.com/pion/webrtc/v3 v3.0.15 - github.com/rs/zerolog v1.20.0 - github.com/spf13/afero v1.5.1 // indirect + github.com/pion/webrtc/v3 v3.0.27 + github.com/rs/zerolog v1.21.0 + github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/spf13/cobra v1.1.3 github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.7.1 - golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 // indirect - golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 // indirect - golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e // indirect - golang.org/x/text v0.3.5 // indirect + golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect + golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect + golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 // indirect gopkg.in/ini.v1 v1.62.0 // indirect ) diff --git a/go.sum b/go.sum index f8b7e7e3..39b47d86 100644 --- a/go.sum +++ b/go.sum @@ -16,6 +16,7 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PaesslerAG/gval v1.1.0 h1:k3RuxeZDO3eejD4cMPSt+74tUSvTnbGvLx0df4mdwFc= github.com/PaesslerAG/gval v1.1.0/go.mod h1:y/nm5yEyTeX6av0OfKJNp9rBNj2XrGhAf5+v24IBN1I= +github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -46,13 +47,14 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= -github.com/go-chi/cors v1.1.1 h1:eHuqxsIw89iXcWnWUN8R72JMibABJTN/4IOYI5WERvw= -github.com/go-chi/cors v1.1.1/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= +github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE= +github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -69,6 +71,7 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -79,7 +82,6 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -134,8 +136,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= -github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -154,30 +156,30 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= +github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= -github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= +github.com/pelletier/go-toml v1.9.0 h1:NOd0BRdOKpPf0SxkL3HxSQOG7rNh+4kl6PHcBPFs7Q0= +github.com/pelletier/go-toml v1.9.0/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0= github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= -github.com/pion/dtls/v2 v2.0.4/go.mod h1:qAkFscX0ZHoI1E07RfYPoRw3manThveu+mlTDdOxoGI= -github.com/pion/dtls/v2 v2.0.8 h1:reGe8rNIMfO/UAeFLqO61tl64t154Qfkr4U3Gzu1tsg= -github.com/pion/dtls/v2 v2.0.8/go.mod h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10= -github.com/pion/ice/v2 v2.0.15 h1:KZrwa2ciL9od8+TUVJiYTNsCW9J5lktBjGwW1MacEnQ= -github.com/pion/ice/v2 v2.0.15/go.mod h1:ZIiVGevpgAxF/cXiIVmuIUtCb3Xs4gCzCbXB6+nFkSI= -github.com/pion/interceptor v0.0.10 h1:dXFyFWRJFwmzQqyn0U8dUAbOJu+JJnMVAqxmvTu30B4= -github.com/pion/interceptor v0.0.10/go.mod h1:qzeuWuD/ZXvPqOnxNcnhWfkCZ2e1kwwslicyyPnhoK4= +github.com/pion/dtls/v2 v2.0.9 h1:7Ow+V++YSZQMYzggI0P9vLJz/hUFcffsfGMfT/Qy+u8= +github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho= +github.com/pion/ice/v2 v2.1.7 h1:FjgDfUNrVYTxQabJrkBX6ld12tvYbgzHenqPh3PJF6E= +github.com/pion/ice/v2 v2.1.7/go.mod h1:kV4EODVD5ux2z8XncbLHIOtcXKtYXVgLVCeVqnpoeP0= +github.com/pion/interceptor v0.0.12 h1:eC1iVneBIAQJEfaNAfDqAncJWhMDAnaXPRCJsltdokE= +github.com/pion/interceptor v0.0.12/go.mod h1:qzeuWuD/ZXvPqOnxNcnhWfkCZ2e1kwwslicyyPnhoK4= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= -github.com/pion/mdns v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY= -github.com/pion/mdns v0.0.4/go.mod h1:R1sL0p50l42S5lJs91oNdUL58nm0QHrhxnSegr++qC0= +github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= +github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo= @@ -185,27 +187,24 @@ github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE github.com/pion/rtp v1.6.2 h1:iGBerLX6JiDjB9NXuaPzHyxHFG9JsIEdgwTC0lp5n/U= github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= -github.com/pion/sctp v1.7.11 h1:UCnj7MsobLKLuP/Hh+JMiI/6W5Bs/VF45lWKgHFjSIE= -github.com/pion/sctp v1.7.11/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= +github.com/pion/sctp v1.7.12 h1:GsatLufywVruXbZZT1CKg+Jr8ZTkwiPnmUC/oO9+uuY= +github.com/pion/sctp v1.7.12/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8= github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= github.com/pion/srtp/v2 v2.0.2 h1:664iGzVmaY7KYS5M0gleY0DscRo9ReDfTxQrq4UgGoU= github.com/pion/srtp/v2 v2.0.2/go.mod h1:VEyLv4CuxrwGY8cxM+Ng3bmVy8ckz/1t6A0q/msKOw0= github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= -github.com/pion/transport v0.8.10/go.mod h1:tBmha/UCjpum5hqTWhfAEs3CO4/tHSg0MYRhSzR+CZ8= -github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE= github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A= -github.com/pion/transport v0.12.1/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/transport v0.12.3 h1:vdBfvfU/0Wq8kd2yhUMSDB/x+O4Z9MYVl2fJ5BT4JZw= github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= -github.com/pion/udp v0.1.0 h1:uGxQsNyrqG3GLINv36Ff60covYmfrLoxzwnCsIYspXI= -github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths= -github.com/pion/webrtc/v3 v3.0.15 h1:g8MMJohjQoj0+pTrU329tWM6dvCieNTgnjtqv1kmEdY= -github.com/pion/webrtc/v3 v3.0.15/go.mod h1:uUt2nRSsCnK/nfzTAfOmaeLan26ZJ0aP9iwjc/gcC2Y= +github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= +github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= +github.com/pion/webrtc/v3 v3.0.27 h1:cPQEFNFrRSMT11j9c9aTmXzL3ikKAFPE2kR0ZrQcviw= +github.com/pion/webrtc/v3 v3.0.27/go.mod h1:QpLDmsU5a/a05n230gRtxZRvfHhFzn9ukGUL2x4G5ic= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -226,8 +225,8 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= -github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= +github.com/rs/zerolog v1.21.0 h1:Q3vdXlfLNT+OftyBHsU0Y445MD+8m8axjKgf2si0QcM= +github.com/rs/zerolog v1.21.0/go.mod h1:ZPhntP/xmq1nnND05hhpAh2QMhSsA4UN3MGZ6O2J3hM= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= @@ -241,8 +240,8 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.5.1 h1:VHu76Lk0LSP1x254maIu2bplkWpfBWI+B+6fdoZprcg= -github.com/spf13/afero v1.5.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -270,6 +269,7 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -282,11 +282,11 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 h1:gzMM0EjIYiRmJI3+jBdFuoynZlpxa2JQZsolKu09BXo= -golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -305,6 +305,7 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -320,17 +321,17 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 h1:b0LrWgu8+q7z4J+0Y3Umo5q1dL7NXBkKBWkaVkAq17E= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210420210106-798c2154c571/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -339,6 +340,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -355,23 +357,24 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e h1:XNp2Flc/1eWQGk5BLzqTAN7fQIwIbfyVTuVxXxZh73M= -golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 h1:dXfMednGJh/SUUFjTLsWJz3P+TQt9qnR11GgeI3vWKs= +golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -388,11 +391,14 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 014b757734695be4af408f9eacb68974fbe79c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 30 Apr 2021 14:05:07 +0000 Subject: [PATCH 498/876] webrtc connect with selected video. --- internal/types/message/messages.go | 7 ++++++- internal/webrtc/manager.go | 2 +- internal/websocket/handler/handler.go | 5 ++++- internal/websocket/handler/signal.go | 14 ++++++++------ internal/websocket/handler/system.go | 3 +++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 21bb9aaa..d1a6356e 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -15,6 +15,11 @@ type Message struct { // System ///////////////////////////// +type SystemWebRTC struct { + Event string `json:"event,omitempty"` + Videos []string `json:"videos"` +} + type SystemInit struct { Event string `json:"event,omitempty"` SessionId string `json:"session_id"` @@ -22,6 +27,7 @@ type SystemInit struct { ScreenSize ScreenSize `json:"screen_size"` Sessions map[string]SessionData `json:"sessions"` ImplicitHosting bool `json:"implicit_hosting"` + WebRTC SystemWebRTC `json:"webrtc"` } type SystemAdmin struct { @@ -43,7 +49,6 @@ type SignalProvide struct { Event string `json:"event,omitempty"` SDP string `json:"sdp"` ICEServers []types.ICEServer `json:"iceservers"` - Videos []string `json:"videos"` Video string `json:"video"` } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index a11f02e1..7f589303 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -391,7 +391,7 @@ func (manager *WebRTCManagerCtx) mediaEngine(videoID string) (*webrtc.MediaEngin // all videos must have the same codec video, ok := manager.capture.Video(videoID) if !ok { - return nil, fmt.Errorf("default video track not found") + return nil, fmt.Errorf("selected video track not found") } videoCodec := video.Codec() diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index ae915480..0c9a0982 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -48,7 +48,10 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { switch header.Event { // Signal Events case event.SIGNAL_REQUEST: - err = h.signalRequest(session) + payload := &message.SignalVideo{} + err = utils.Unmarshal(payload, raw, func() error { + return h.signalRequest(session, payload) + }) case event.SIGNAL_ANSWER: payload := &message.SignalAnswer{} err = utils.Unmarshal(payload, raw, func() error { diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index ecfb1b59..57c67add 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -6,16 +6,19 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandlerCtx) signalRequest(session types.Session) error { +func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error { if !session.Profile().CanWatch { h.logger.Debug().Str("session_id", session.ID()).Msg("not allowed to watch") return nil } - videos := h.capture.VideoIDs() - defaultVideo := videos[0] + // use default first video, if not provided + if payload.Video == "" { + videos := h.capture.VideoIDs() + payload.Video = videos[0] + } - offer, err := h.webrtc.CreatePeer(session, defaultVideo) + offer, err := h.webrtc.CreatePeer(session, payload.Video) if err != nil { return err } @@ -25,8 +28,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { Event: event.SIGNAL_PROVIDE, SDP: offer.SDP, ICEServers: h.webrtc.ICEServers(), - Videos: videos, - Video: defaultVideo, + Video: payload.Video, }) } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index b2279ca7..553a0776 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -45,6 +45,9 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { }, Sessions: sessions, ImplicitHosting: h.sessions.ImplicitHosting(), + WebRTC: message.SystemWebRTC{ + Videos: h.capture.VideoIDs(), + }, }) } From d575d88dafb7260970c577e9a80c55911e1d46d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 15 Jun 2021 23:30:04 +0200 Subject: [PATCH 499/876] upgrade deps. --- go.mod | 14 +++++++------- go.sum | 33 ++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index 17288766..1dfd71d6 100644 --- a/go.mod +++ b/go.mod @@ -3,25 +3,25 @@ module demodesk/neko go 1.16 require ( - github.com/PaesslerAG/gval v1.1.0 + github.com/PaesslerAG/gval v1.1.1 github.com/go-chi/chi v1.5.4 github.com/go-chi/cors v1.2.0 github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 github.com/magiconair/properties v1.8.5 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect - github.com/pelletier/go-toml v1.9.0 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect github.com/pion/interceptor v0.0.12 github.com/pion/logging v0.2.2 - github.com/pion/webrtc/v3 v3.0.27 - github.com/rs/zerolog v1.21.0 + github.com/pion/webrtc/v3 v3.0.29 + github.com/rs/zerolog v1.23.0 github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/spf13/cobra v1.1.3 github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.7.1 - golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect - golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect - golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 // indirect + golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect + golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect + golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect gopkg.in/ini.v1 v1.62.0 // indirect ) diff --git a/go.sum b/go.sum index 39b47d86..ade23111 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/PaesslerAG/gval v1.1.0 h1:k3RuxeZDO3eejD4cMPSt+74tUSvTnbGvLx0df4mdwFc= -github.com/PaesslerAG/gval v1.1.0/go.mod h1:y/nm5yEyTeX6av0OfKJNp9rBNj2XrGhAf5+v24IBN1I= +github.com/PaesslerAG/gval v1.1.1 h1:4d7pprU9876+m3rc08X33UjGip8oV1kkm8Gh5GBuTss= +github.com/PaesslerAG/gval v1.1.1/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -33,6 +33,7 @@ github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkE github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -55,6 +56,7 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -166,8 +168,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.9.0 h1:NOd0BRdOKpPf0SxkL3HxSQOG7rNh+4kl6PHcBPFs7Q0= -github.com/pelletier/go-toml v1.9.0/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0= github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= github.com/pion/dtls/v2 v2.0.9 h1:7Ow+V++YSZQMYzggI0P9vLJz/hUFcffsfGMfT/Qy+u8= @@ -184,8 +186,9 @@ github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo= github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= -github.com/pion/rtp v1.6.2 h1:iGBerLX6JiDjB9NXuaPzHyxHFG9JsIEdgwTC0lp5n/U= github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.6.5 h1:o2cZf8OascA5HF/b0PAbTxRKvOWxTQxWYt7SlToxFGI= +github.com/pion/rtp v1.6.5/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= github.com/pion/sctp v1.7.12 h1:GsatLufywVruXbZZT1CKg+Jr8ZTkwiPnmUC/oO9+uuY= github.com/pion/sctp v1.7.12/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= @@ -203,8 +206,8 @@ github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/webrtc/v3 v3.0.27 h1:cPQEFNFrRSMT11j9c9aTmXzL3ikKAFPE2kR0ZrQcviw= -github.com/pion/webrtc/v3 v3.0.27/go.mod h1:QpLDmsU5a/a05n230gRtxZRvfHhFzn9ukGUL2x4G5ic= +github.com/pion/webrtc/v3 v3.0.29 h1:pVs6mYjbbYvC8pMsztayEz35DnUEFLPswsicGXaQjxo= +github.com/pion/webrtc/v3 v3.0.29/go.mod h1:XFQeLYBf++bWWA0sJqh6zF1ouWluosxwTOMOoTZGaD0= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -225,8 +228,8 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.21.0 h1:Q3vdXlfLNT+OftyBHsU0Y445MD+8m8axjKgf2si0QcM= -github.com/rs/zerolog v1.21.0/go.mod h1:ZPhntP/xmq1nnND05hhpAh2QMhSsA4UN3MGZ6O2J3hM= +github.com/rs/zerolog v1.23.0 h1:UskrK+saS9P9Y789yNNulYKdARjPZuS35B8gJF2x60g= +github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= @@ -285,8 +288,8 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc= +golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -330,8 +333,8 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210420210106-798c2154c571/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -366,8 +369,8 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 h1:dXfMednGJh/SUUFjTLsWJz3P+TQt9qnR11GgeI3vWKs= -golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 09fdea1b11d136f6d41f5de10ce09e3d05c08fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 27 Jun 2021 22:02:05 +0200 Subject: [PATCH 500/876] add ice restarts. --- internal/types/event/events.go | 1 + internal/types/webrtc.go | 1 + internal/webrtc/manager.go | 41 +-------------------- internal/webrtc/peer.go | 52 ++++++++++++++++++++++++++- internal/websocket/handler/handler.go | 2 ++ internal/websocket/handler/signal.go | 19 ++++++++++ 6 files changed, 75 insertions(+), 41 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index d6a74812..fd41b804 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -8,6 +8,7 @@ const ( const ( SIGNAL_REQUEST = "signal/request" + SIGNAL_RESTART = "signal/restart" SIGNAL_ANSWER = "signal/answer" SIGNAL_PROVIDE = "signal/provide" SIGNAL_CANDIDATE = "signal/candidate" diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index c31b11a8..f53aea6a 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -9,6 +9,7 @@ type ICEServer struct { } type WebRTCPeer interface { + CreateOffer(ICETrickle bool, ICERestart bool) (*webrtc.SessionDescription, error) SignalAnswer(sdp string) error SignalCandidate(candidate webrtc.ICECandidateInit) error diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 7f589303..d6a65b62 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -20,9 +20,6 @@ import ( "demodesk/neko/internal/webrtc/cursor" ) -// how long is can take between sending offer and connecting -const offerTimeout = 4 * time.Second - // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds const disconnectedTimeout = 4 * time.Second @@ -237,26 +234,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return nil, err } - offer, err := connection.CreateOffer(nil) - if err != nil { - return nil, err - } - - if !manager.config.ICETrickle { - // Create channel that is blocked until ICE Gathering is complete - gatherComplete := webrtc.GatheringCompletePromise(connection) - - if err := connection.SetLocalDescription(offer); err != nil { - return nil, err - } - - <-gatherComplete - } else { - if err := connection.SetLocalDescription(offer); err != nil { - return nil, err - } - } - peer := &WebRTCPeerCtx{ api: api, connection: connection, @@ -347,22 +324,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } }) - // offer timeout - go func() { - time.Sleep(offerTimeout) - - // already disconnected - if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { - return - } - - // not connected - if connection.ConnectionState() != webrtc.PeerConnectionStateConnected { - logger.Warn().Msg("connection timeouted, closing") - connection.Close() - } - }() - go func() { rtcpBuf := make([]byte, 1500) for { @@ -382,7 +343,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }() session.SetWebRTCPeer(peer) - return connection.LocalDescription(), nil + return peer.CreateOffer(manager.config.ICETrickle, false) } func (manager *WebRTCManagerCtx) mediaEngine(videoID string) (*webrtc.MediaEngine, error) { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index a9bdba34..e5bb933f 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -1,6 +1,14 @@ package webrtc -import "github.com/pion/webrtc/v3" +import ( + "time" + + "github.com/pion/webrtc/v3" + "github.com/rs/zerolog/log" +) + +// how long is can take between sending offer and connecting +const offerTimeout = 10 * time.Second type WebRTCPeerCtx struct { api *webrtc.API @@ -9,6 +17,48 @@ type WebRTCPeerCtx struct { changeVideo func(videoID string) error } +func (peer *WebRTCPeerCtx) CreateOffer(ICETrickle bool, ICERestart bool) (*webrtc.SessionDescription, error) { + // offer timeout + go func() { + time.Sleep(offerTimeout) + + // already disconnected + if peer.connection.ConnectionState() == webrtc.PeerConnectionStateClosed { + return + } + + // not connected + if peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { + log.Warn().Msg("connection timeouted, closing") + peer.connection.Close() + } + }() + + offer, err := peer.connection.CreateOffer(&webrtc.OfferOptions{ + ICERestart: ICERestart, + }) + if err != nil { + return nil, err + } + + if !ICETrickle { + // Create channel that is blocked until ICE Gathering is complete + gatherComplete := webrtc.GatheringCompletePromise(peer.connection) + + if err := peer.connection.SetLocalDescription(offer); err != nil { + return nil, err + } + + <-gatherComplete + } else { + if err := peer.connection.SetLocalDescription(offer); err != nil { + return nil, err + } + } + + return peer.connection.LocalDescription(), nil +} + func (peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ SDP: sdp, diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 0c9a0982..5b1531d9 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -52,6 +52,8 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { err = utils.Unmarshal(payload, raw, func() error { return h.signalRequest(session, payload) }) + case event.SIGNAL_RESTART: + err = h.signalRestart(session) case event.SIGNAL_ANSWER: payload := &message.SignalAnswer{} err = utils.Unmarshal(payload, raw, func() error { diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 57c67add..635db77d 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -32,6 +32,25 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag }) } +func (h *MessageHandlerCtx) signalRestart(session types.Session) error { + peer := session.GetWebRTCPeer() + if peer == nil { + h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") + return nil + } + + offer, err := peer.CreateOffer(true, true) + if err != nil { + return err + } + + return session.Send( + message.SignalAnswer{ + Event: event.SIGNAL_RESTART, + SDP: offer.SDP, + }) +} + func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { peer := session.GetWebRTCPeer() if peer == nil { From 7df642a34645010de2d7d5d98face2e232b58388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 27 Jun 2021 22:05:37 +0200 Subject: [PATCH 501/876] add iceTrickle for restart from config. --- internal/types/webrtc.go | 2 +- internal/webrtc/manager.go | 3 ++- internal/webrtc/peer.go | 5 +++-- internal/websocket/handler/signal.go | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index f53aea6a..1639a635 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -9,7 +9,7 @@ type ICEServer struct { } type WebRTCPeer interface { - CreateOffer(ICETrickle bool, ICERestart bool) (*webrtc.SessionDescription, error) + CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) SignalAnswer(sdp string) error SignalCandidate(candidate webrtc.ICECandidateInit) error diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index d6a65b62..46930ac6 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -239,6 +239,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin connection: connection, changeVideo: changeVideo, dataChannel: dataChannel, + iceTrickle: manager.config.ICETrickle, } cursorImage := func(entry *cursor.ImageEntry) { @@ -343,7 +344,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }() session.SetWebRTCPeer(peer) - return peer.CreateOffer(manager.config.ICETrickle, false) + return peer.CreateOffer(false) } func (manager *WebRTCManagerCtx) mediaEngine(videoID string) (*webrtc.MediaEngine, error) { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index e5bb933f..95a0b9f6 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -15,9 +15,10 @@ type WebRTCPeerCtx struct { connection *webrtc.PeerConnection dataChannel *webrtc.DataChannel changeVideo func(videoID string) error + iceTrickle bool } -func (peer *WebRTCPeerCtx) CreateOffer(ICETrickle bool, ICERestart bool) (*webrtc.SessionDescription, error) { +func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) { // offer timeout go func() { time.Sleep(offerTimeout) @@ -41,7 +42,7 @@ func (peer *WebRTCPeerCtx) CreateOffer(ICETrickle bool, ICERestart bool) (*webrt return nil, err } - if !ICETrickle { + if !peer.iceTrickle { // Create channel that is blocked until ICE Gathering is complete gatherComplete := webrtc.GatheringCompletePromise(peer.connection) diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 635db77d..647a9bdc 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -39,7 +39,7 @@ func (h *MessageHandlerCtx) signalRestart(session types.Session) error { return nil } - offer, err := peer.CreateOffer(true, true) + offer, err := peer.CreateOffer(true) if err != nil { return err } From 9176fe3782accd3cd0bece7326c472973ae961f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 28 Jun 2021 18:10:48 +0200 Subject: [PATCH 502/876] cgo import not only for linux. --- internal/desktop/xevent/xevent.go | 2 +- internal/desktop/xorg/xorg.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/desktop/xevent/xevent.go b/internal/desktop/xevent/xevent.go index 461e79c5..fc91e919 100644 --- a/internal/desktop/xevent/xevent.go +++ b/internal/desktop/xevent/xevent.go @@ -1,7 +1,7 @@ package xevent /* -#cgo linux LDFLAGS: -lX11 -lXfixes +#cgo LDFLAGS: -lX11 -lXfixes #include "xevent.h" */ diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index e605fd5b..4598f6cf 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -1,7 +1,7 @@ package xorg /* -#cgo linux LDFLAGS: -lX11 -lXrandr -lXtst -lXfixes +#cgo LDFLAGS: -lX11 -lXrandr -lXtst -lXfixes #include "xorg.h" */ From d3fb84e5822e952c664430a67c941c895ff2be18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 28 Jun 2021 18:12:36 +0200 Subject: [PATCH 503/876] upgrade deps. --- go.mod | 18 +--- go.sum | 323 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 316 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 1dfd71d6..8bc42433 100644 --- a/go.mod +++ b/go.mod @@ -8,20 +8,12 @@ require ( github.com/go-chi/cors v1.2.0 github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 - github.com/magiconair/properties v1.8.5 // indirect - github.com/mitchellh/mapstructure v1.4.1 // indirect - github.com/pelletier/go-toml v1.9.3 // indirect - github.com/pion/interceptor v0.0.12 + github.com/pion/interceptor v0.0.13 github.com/pion/logging v0.2.2 - github.com/pion/webrtc/v3 v3.0.29 + github.com/pion/webrtc/v3 v3.0.30 github.com/rs/zerolog v1.23.0 - github.com/spf13/afero v1.6.0 // indirect - github.com/spf13/cast v1.3.1 // indirect github.com/spf13/cobra v1.1.3 - github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/viper v1.7.1 - golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect - golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect - golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect - gopkg.in/ini.v1 v1.62.0 // indirect + github.com/spf13/viper v1.8.1 + golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect + golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect ) diff --git a/go.sum b/go.sum index ade23111..606740c2 100644 --- a/go.sum +++ b/go.sum @@ -5,11 +5,37 @@ cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6A cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -20,6 +46,7 @@ github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -27,8 +54,16 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -41,6 +76,13 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= @@ -51,6 +93,8 @@ github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIu github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE= github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -59,31 +103,67 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -95,6 +175,7 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -117,17 +198,22 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -154,7 +240,9 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= @@ -176,8 +264,8 @@ github.com/pion/dtls/v2 v2.0.9 h1:7Ow+V++YSZQMYzggI0P9vLJz/hUFcffsfGMfT/Qy+u8= github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho= github.com/pion/ice/v2 v2.1.7 h1:FjgDfUNrVYTxQabJrkBX6ld12tvYbgzHenqPh3PJF6E= github.com/pion/ice/v2 v2.1.7/go.mod h1:kV4EODVD5ux2z8XncbLHIOtcXKtYXVgLVCeVqnpoeP0= -github.com/pion/interceptor v0.0.12 h1:eC1iVneBIAQJEfaNAfDqAncJWhMDAnaXPRCJsltdokE= -github.com/pion/interceptor v0.0.12/go.mod h1:qzeuWuD/ZXvPqOnxNcnhWfkCZ2e1kwwslicyyPnhoK4= +github.com/pion/interceptor v0.0.13 h1:fnV+b0p/KEzwwr/9z2nsSqA9IQRMsM4nF5HjrNSWwBo= +github.com/pion/interceptor v0.0.13/go.mod h1:svsW2QoLHLoGLUr4pDoSopGBEWk8FZwlfxId/OKRKzo= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= @@ -206,8 +294,8 @@ github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/webrtc/v3 v3.0.29 h1:pVs6mYjbbYvC8pMsztayEz35DnUEFLPswsicGXaQjxo= -github.com/pion/webrtc/v3 v3.0.29/go.mod h1:XFQeLYBf++bWWA0sJqh6zF1ouWluosxwTOMOoTZGaD0= +github.com/pion/webrtc/v3 v3.0.30 h1:Q+U0mdIMwaeVZ846nkgHV5VRmDsrMtRvogVwBsXTFq4= +github.com/pion/webrtc/v3 v3.0.30/go.mod h1:IN0o0uQMUbPvcPZ8t1nQfg6tkUeJvsII8PsQIDW61jk= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -220,12 +308,14 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.23.0 h1:UskrK+saS9P9Y789yNNulYKdARjPZuS35B8gJF2x60g= @@ -257,8 +347,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= -github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -272,13 +362,28 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -288,13 +393,18 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc= -golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -304,11 +414,22 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -324,26 +445,59 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210420210106-798c2154c571/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -358,28 +512,57 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -390,6 +573,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -397,9 +581,41 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -410,10 +626,30 @@ google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -423,15 +659,70 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -447,14 +738,22 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= From c2277c4917c53cd6150fa9b8c5d16c9c4d644fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 29 Jun 2021 22:41:30 +0200 Subject: [PATCH 504/876] webrtc: remove offer timeout as this is handled by lib. --- internal/webrtc/peer.go | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 95a0b9f6..ea51ec40 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -1,14 +1,6 @@ package webrtc -import ( - "time" - - "github.com/pion/webrtc/v3" - "github.com/rs/zerolog/log" -) - -// how long is can take between sending offer and connecting -const offerTimeout = 10 * time.Second +import "github.com/pion/webrtc/v3" type WebRTCPeerCtx struct { api *webrtc.API @@ -19,22 +11,6 @@ type WebRTCPeerCtx struct { } func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) { - // offer timeout - go func() { - time.Sleep(offerTimeout) - - // already disconnected - if peer.connection.ConnectionState() == webrtc.PeerConnectionStateClosed { - return - } - - // not connected - if peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { - log.Warn().Msg("connection timeouted, closing") - peer.connection.Close() - } - }() - offer, err := peer.connection.CreateOffer(&webrtc.OfferOptions{ ICERestart: ICERestart, }) From a852eddfb7203fe100ed4cbb27018f9560509b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 30 Jun 2021 00:04:41 +0200 Subject: [PATCH 505/876] add mutex to webrtc peer. --- internal/webrtc/peer.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index ea51ec40..dc212819 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -1,8 +1,13 @@ package webrtc -import "github.com/pion/webrtc/v3" +import ( + "sync" + + "github.com/pion/webrtc/v3" +) type WebRTCPeerCtx struct { + mu sync.Mutex api *webrtc.API connection *webrtc.PeerConnection dataChannel *webrtc.DataChannel @@ -11,6 +16,9 @@ type WebRTCPeerCtx struct { } func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) { + peer.mu.Lock() + defer peer.mu.Unlock() + offer, err := peer.connection.CreateOffer(&webrtc.OfferOptions{ ICERestart: ICERestart, }) @@ -48,10 +56,16 @@ func (peer *WebRTCPeerCtx) SignalCandidate(candidate webrtc.ICECandidateInit) er } func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { + peer.mu.Lock() + defer peer.mu.Unlock() + return peer.changeVideo(videoID) } func (peer *WebRTCPeerCtx) Destroy() error { + peer.mu.Lock() + defer peer.mu.Unlock() + if peer.connection == nil || peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { return nil } From d3206bfd246da957f741edfaed70fbf04368c7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 4 Jul 2021 01:36:09 +0200 Subject: [PATCH 506/876] add ZIP to utils. --- internal/utils/zip.go | 124 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 internal/utils/zip.go diff --git a/internal/utils/zip.go b/internal/utils/zip.go new file mode 100644 index 00000000..d0929cd5 --- /dev/null +++ b/internal/utils/zip.go @@ -0,0 +1,124 @@ +package utils + +import ( + "archive/zip" + "io" + "os" + "path/filepath" + "strings" +) + +func Zip(source, zipPath string) error { + archiveFile, err := os.Create(zipPath) + if err != nil { + return err + } + defer archiveFile.Close() + + archive := zip.NewWriter(archiveFile) + defer archive.Close() + + info, err := os.Stat(source) + if err != nil { + return nil + } + + var baseDir string + if info.IsDir() { + baseDir = filepath.Base(source) + } + + return filepath.Walk(source, func(path string, info os.FileInfo, err error) error { + if err != nil { + return err + } + + if !info.IsDir() || !info.Mode().IsRegular() { + return nil + } + + header, err := zip.FileInfoHeader(info) + if err != nil { + return err + } + + if baseDir != "" { + header.Name = filepath.Join(baseDir, strings.TrimPrefix(path, source)) + } + + if info.IsDir() { + header.Name += "/" + } else { + header.Method = zip.Deflate + } + + writer, err := archive.CreateHeader(header) + if err != nil { + return err + } + + if info.IsDir() { + return nil + } + + file, err := os.Open(path) + if err != nil { + return err + } + defer file.Close() + + _, err = io.Copy(writer, file) + return err + }) +} + +func Unzip(zipPath, target string) error { + reader, err := zip.OpenReader(zipPath) + if err != nil { + return err + } + + if err := os.MkdirAll(target, 0755); err != nil { + return err + } + + for _, file := range reader.File { + path := filepath.Join(target, file.Name) + if file.FileInfo().IsDir() { + os.MkdirAll(path, file.Mode()) + continue + } + + fileReader, err := file.Open() + if err != nil { + if fileReader != nil { + fileReader.Close() + } + + return err + } + + targetFile, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, file.Mode()) + if err != nil { + fileReader.Close() + + if targetFile != nil { + targetFile.Close() + } + + return err + } + + if _, err := io.Copy(targetFile, fileReader); err != nil { + fileReader.Close() + targetFile.Close() + + return err + } + + fileReader.Close() + targetFile.Close() + } + + return nil +} From 18e2ba639088b6615a60e5a7e69f7dacf694aed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 4 Jul 2021 21:36:42 +0200 Subject: [PATCH 507/876] zip fix file check. --- internal/utils/zip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/utils/zip.go b/internal/utils/zip.go index d0929cd5..37c6d4a4 100644 --- a/internal/utils/zip.go +++ b/internal/utils/zip.go @@ -33,7 +33,7 @@ func Zip(source, zipPath string) error { return err } - if !info.IsDir() || !info.Mode().IsRegular() { + if !info.IsDir() && !info.Mode().IsRegular() { return nil } From 486f9e13df07b5b111daa966c34f77a122fcc457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 4 Jul 2021 22:32:01 +0200 Subject: [PATCH 508/876] allow supervisord to be controlled by neko user. --- runtime/supervisord.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf index 357280a6..fbfac9c9 100644 --- a/runtime/supervisord.conf +++ b/runtime/supervisord.conf @@ -54,3 +54,14 @@ stdout_logfile=/var/log/neko/neko.log stdout_logfile_maxbytes=100MB stdout_logfile_backups=10 redirect_stderr=true + +[unix_http_server] +file=/var/run/supervisor.sock +chmod=0770 +chown=root:neko + +[supervisorctl] +serverurl=unix:///var/run/supervisor.sock + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface From 7377e24abe36c32659b53c20c900fbea0914ecca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 4 Jul 2021 23:10:31 +0200 Subject: [PATCH 509/876] zip: omit base dir. --- internal/utils/zip.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/internal/utils/zip.go b/internal/utils/zip.go index 37c6d4a4..8bbd644c 100644 --- a/internal/utils/zip.go +++ b/internal/utils/zip.go @@ -18,16 +18,6 @@ func Zip(source, zipPath string) error { archive := zip.NewWriter(archiveFile) defer archive.Close() - info, err := os.Stat(source) - if err != nil { - return nil - } - - var baseDir string - if info.IsDir() { - baseDir = filepath.Base(source) - } - return filepath.Walk(source, func(path string, info os.FileInfo, err error) error { if err != nil { return err @@ -42,9 +32,7 @@ func Zip(source, zipPath string) error { return err } - if baseDir != "" { - header.Name = filepath.Join(baseDir, strings.TrimPrefix(path, source)) - } + header.Name = strings.TrimPrefix(path, source) if info.IsDir() { header.Name += "/" From 257b642b946f1bd480ac5f868e6e81b98b087e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 7 Jul 2021 16:18:47 +0200 Subject: [PATCH 510/876] browser_profile to custom module. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 54467539..6176a418 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ ARG GIT_BRANCH=dev # build server COPY . . RUN go get -v -t -d . && go build \ - -tags browser \ + -tags "browser browser_profile" \ -o bin/neko \ -ldflags " \ -s -w \ From 3227978725ed5e79eec99b25df39f176ca0aa770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 14 Jul 2021 14:23:51 +0200 Subject: [PATCH 511/876] add screencast enabled bool to system init. --- internal/types/message/messages.go | 15 ++++++++------- internal/websocket/handler/system.go | 5 +++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index d1a6356e..d40f9af4 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -21,13 +21,14 @@ type SystemWebRTC struct { } type SystemInit struct { - Event string `json:"event,omitempty"` - SessionId string `json:"session_id"` - ControlHost ControlHost `json:"control_host"` - ScreenSize ScreenSize `json:"screen_size"` - Sessions map[string]SessionData `json:"sessions"` - ImplicitHosting bool `json:"implicit_hosting"` - WebRTC SystemWebRTC `json:"webrtc"` + Event string `json:"event,omitempty"` + SessionId string `json:"session_id"` + ControlHost ControlHost `json:"control_host"` + ScreenSize ScreenSize `json:"screen_size"` + Sessions map[string]SessionData `json:"sessions"` + ImplicitHosting bool `json:"implicit_hosting"` + ScreencastEnabled bool `json:"screencast_enabled"` + WebRTC SystemWebRTC `json:"webrtc"` } type SystemAdmin struct { diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 553a0776..59c2a63a 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -43,8 +43,9 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { Height: size.Height, Rate: size.Rate, }, - Sessions: sessions, - ImplicitHosting: h.sessions.ImplicitHosting(), + Sessions: sessions, + ImplicitHosting: h.sessions.ImplicitHosting(), + ScreencastEnabled: h.capture.Screencast().Enabled(), WebRTC: message.SystemWebRTC{ Videos: h.capture.VideoIDs(), }, From 40d820a3e093aa92386f8e2451b91827a7c70664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 2 Aug 2021 18:37:54 +0200 Subject: [PATCH 512/876] fix logging. --- internal/webrtc/handler.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 911e0a6e..2eef5a52 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -3,7 +3,6 @@ package webrtc import ( "bytes" "encoding/binary" - "strconv" "github.com/pion/webrtc/v3" ) @@ -71,8 +70,8 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { manager.logger. Debug(). - Str("x", strconv.Itoa(int(payload.X))). - Str("y", strconv.Itoa(int(payload.Y))). + Int16("x", payload.X). + Int16("y", payload.Y). Msg("scroll") manager.desktop.Scroll(int(payload.X), int(payload.Y)) From 45ee1eef3eb7f1f75c06705d54f58cf3aa9ae584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 3 Aug 2021 10:47:05 +0200 Subject: [PATCH 513/876] handle closed peerConnection. --- internal/webrtc/manager.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 46930ac6..3fbd82ce 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -1,6 +1,7 @@ package webrtc import ( + "errors" "fmt" "io" "strings" @@ -66,6 +67,10 @@ func (manager *WebRTCManagerCtx) Start() { audioListener := func(sample types.Sample) { if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { + if errors.Is(err, io.ErrClosedPipe) { + // The peerConnection has been closed. + return + } manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") } } @@ -167,6 +172,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin videoListener := func(sample types.Sample) { if err := videoTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { + if errors.Is(err, io.ErrClosedPipe) { + // The peerConnection has been closed. + return + } manager.logger.Warn().Err(err).Msg("video pipeline failed to write") } } From 2329a940c88fb782fe4f40490914ef2eaec783ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 3 Aug 2021 11:06:34 +0200 Subject: [PATCH 514/876] fix logging. --- internal/webrtc/manager.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 3fbd82ce..1d1a8b19 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -80,18 +80,13 @@ func (manager *WebRTCManagerCtx) Start() { audio.RemoveListener(&audioListener) } - var servers []string - for _, server := range manager.config.ICEServers { - servers = append(servers, server.URLs...) - } - manager.logger.Info(). - Str("icelite", fmt.Sprintf("%t", manager.config.ICELite)). - Str("icetrickle", fmt.Sprintf("%t", manager.config.ICETrickle)). - Str("iceservers", strings.Join(servers, ",")). + Bool("icelite", manager.config.ICELite). + Bool("icetrickle", manager.config.ICETrickle). + Interface("iceservers", manager.config.ICEServers). Str("nat1to1", strings.Join(manager.config.NAT1To1IPs, ",")). Str("epr", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)). - Msgf("webrtc starting") + Msg("webrtc starting") manager.curImage.Start() } From 22964f6af7dcd19d4e2a78949edf0173d5644966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 15 Aug 2021 16:54:50 +0200 Subject: [PATCH 515/876] upgrade deps. --- go.mod | 16 +++++--- go.sum | 118 +++++++++++++-------------------------------------------- 2 files changed, 38 insertions(+), 96 deletions(-) diff --git a/go.mod b/go.mod index 8bc42433..10763b58 100644 --- a/go.mod +++ b/go.mod @@ -8,12 +8,18 @@ require ( github.com/go-chi/cors v1.2.0 github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 - github.com/pion/interceptor v0.0.13 + github.com/pion/ice/v2 v2.1.12 // indirect + github.com/pion/interceptor v0.0.15 github.com/pion/logging v0.2.2 - github.com/pion/webrtc/v3 v3.0.30 + github.com/pion/rtp v1.7.1 // indirect + github.com/pion/srtp/v2 v2.0.5 // indirect + github.com/pion/webrtc/v3 v3.0.32 github.com/rs/zerolog v1.23.0 - github.com/spf13/cobra v1.1.3 + github.com/spf13/cast v1.4.0 // indirect + github.com/spf13/cobra v1.2.1 github.com/spf13/viper v1.8.1 - golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect - golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect + golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e // indirect + golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect + golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect + golang.org/x/text v0.3.7 // indirect ) diff --git a/go.sum b/go.sum index 606740c2..2be8fa7b 100644 --- a/go.sum +++ b/go.sum @@ -39,24 +39,17 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PaesslerAG/gval v1.1.1 h1:4d7pprU9876+m3rc08X33UjGip8oV1kkm8Gh5GBuTss= github.com/PaesslerAG/gval v1.1.1/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -64,18 +57,12 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -95,17 +82,10 @@ github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vz github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -164,17 +144,15 @@ github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= @@ -202,37 +180,28 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= @@ -241,13 +210,10 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= @@ -255,17 +221,18 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0= github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= github.com/pion/dtls/v2 v2.0.9 h1:7Ow+V++YSZQMYzggI0P9vLJz/hUFcffsfGMfT/Qy+u8= github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho= -github.com/pion/ice/v2 v2.1.7 h1:FjgDfUNrVYTxQabJrkBX6ld12tvYbgzHenqPh3PJF6E= -github.com/pion/ice/v2 v2.1.7/go.mod h1:kV4EODVD5ux2z8XncbLHIOtcXKtYXVgLVCeVqnpoeP0= -github.com/pion/interceptor v0.0.13 h1:fnV+b0p/KEzwwr/9z2nsSqA9IQRMsM4nF5HjrNSWwBo= +github.com/pion/ice/v2 v2.1.10/go.mod h1:kV4EODVD5ux2z8XncbLHIOtcXKtYXVgLVCeVqnpoeP0= +github.com/pion/ice/v2 v2.1.12 h1:ZDBuZz+fEI7iDifZCYFVzI4p0Foy0YhdSSZ87ZtRcRE= +github.com/pion/ice/v2 v2.1.12/go.mod h1:ovgYHUmwYLlRvcCLI67PnQ5YGe+upXZbGgllBDG/ktU= github.com/pion/interceptor v0.0.13/go.mod h1:svsW2QoLHLoGLUr4pDoSopGBEWk8FZwlfxId/OKRKzo= +github.com/pion/interceptor v0.0.15 h1:pQFkBUL8akUHiGoFr+pM94Q/15x7sLFh0K3Nj+DCC6s= +github.com/pion/interceptor v0.0.15/go.mod h1:pg3J253eGi5bqyKzA74+ej5Y19ez2jkWANVnF+Z9Dfk= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= @@ -275,15 +242,18 @@ github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TB github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo= github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.6.5 h1:o2cZf8OascA5HF/b0PAbTxRKvOWxTQxWYt7SlToxFGI= github.com/pion/rtp v1.6.5/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.7.1 h1:hCaxfVgPGt13eF/Tu9RhVn04c+dAcRZmhdDWqUE13oY= +github.com/pion/rtp v1.7.1/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= github.com/pion/sctp v1.7.12 h1:GsatLufywVruXbZZT1CKg+Jr8ZTkwiPnmUC/oO9+uuY= github.com/pion/sctp v1.7.12/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8= github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= -github.com/pion/srtp/v2 v2.0.2 h1:664iGzVmaY7KYS5M0gleY0DscRo9ReDfTxQrq4UgGoU= github.com/pion/srtp/v2 v2.0.2/go.mod h1:VEyLv4CuxrwGY8cxM+Ng3bmVy8ckz/1t6A0q/msKOw0= +github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ= +github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A= github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A= @@ -294,9 +264,8 @@ github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/webrtc/v3 v3.0.30 h1:Q+U0mdIMwaeVZ846nkgHV5VRmDsrMtRvogVwBsXTFq4= -github.com/pion/webrtc/v3 v3.0.30/go.mod h1:IN0o0uQMUbPvcPZ8t1nQfg6tkUeJvsII8PsQIDW61jk= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pion/webrtc/v3 v3.0.32 h1:5J+zNep9am8Swh6kEMp+LaGXNvn6qQWpGkLBnVW44L4= +github.com/pion/webrtc/v3 v3.0.32/go.mod h1:wX3V5dQQUGCifhT1mYftC2kCrDQX6ZJ3B7Yad0R9JK0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -304,17 +273,7 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= @@ -325,32 +284,24 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/cast v1.4.0 h1:WhlbjwB9EGCc8W5Rxdkus+wmH2ASRwwTJk6tgHKwdqQ= +github.com/spf13/cast v1.4.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= +github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -360,14 +311,11 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= @@ -378,13 +326,9 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -393,8 +337,8 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e h1:VvfwVmMH40bpMeizC9/K7ipM5Qjucuu16RWfneFPyhQ= +golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -434,9 +378,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -473,8 +415,10 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -500,11 +444,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -548,8 +489,8 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -558,12 +499,12 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -723,20 +664,15 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From f088ff1d0850dc46bb1dca560eb8ffa23a8b29cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Aug 2021 22:37:19 +0200 Subject: [PATCH 516/876] browser: use single supervisord.conf. --- .devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index dd6bd594..af1141d9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -78,8 +78,8 @@ COPY runtime/icon-theme /home/$USERNAME/.icons/default # copy browser files COPY runtime/browser/env_wrapper /usr/bin/env_wrapper # COPY runtime/browser/openbox.xml /etc/neko/openbox.xml -COPY runtime/browser/supervisord.chromium.conf /etc/neko/supervisord/chromium.conf -COPY runtime/browser/extension /usr/share/chromium/extensions/neko +COPY runtime/browser/supervisord.conf /etc/neko/supervisord/chromium.conf +COPY runtime/browser/extension /usr/share/browser/extensions/neko # COPY runtime/browser/policies.json /etc/chromium/policies/managed/policies.json COPY --chown=$USERNAME runtime/browser/preferences.json /home/neko/.config/chromium/Default/Preferences From bdff2ddabe1cb6d8a470760103e0d6809ede17df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 18 Aug 2021 22:37:19 +0200 Subject: [PATCH 517/876] lint fix errors. --- internal/utils/zip.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/utils/zip.go b/internal/utils/zip.go index 8bbd644c..0818398f 100644 --- a/internal/utils/zip.go +++ b/internal/utils/zip.go @@ -73,7 +73,9 @@ func Unzip(zipPath, target string) error { for _, file := range reader.File { path := filepath.Join(target, file.Name) if file.FileInfo().IsDir() { - os.MkdirAll(path, file.Mode()) + if err := os.MkdirAll(path, file.Mode()); err != nil { + return err + } continue } From 01c0f269ee8101ca22936bbbe1497f7b656a42b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 19 Aug 2021 21:19:02 +0200 Subject: [PATCH 518/876] use defer for ticker. --- internal/capture/screencast.go | 5 +++-- internal/desktop/manager.go | 12 ++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index df788899..28bb1e74 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -40,14 +40,15 @@ func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { } go func() { - ticker := time.NewTicker(screencastTimeout) manager.logger.Debug().Msg("started emitting samples") + ticker := time.NewTicker(screencastTimeout) + defer ticker.Stop() + for { select { case <-manager.emitStop: manager.logger.Debug().Msg("stopped emitting samples") - ticker.Stop() return case <-manager.emitUpdate: manager.logger.Debug().Msg("update emitting samples") diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index cef9b6ab..788e3d65 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -18,7 +18,6 @@ var mu = sync.Mutex{} type DesktopManagerCtx struct { logger zerolog.Logger - cleanup *time.Ticker shutdown chan bool emmiter events.EventEmmiter config *config.Desktop @@ -27,7 +26,6 @@ type DesktopManagerCtx struct { func New(config *config.Desktop) *DesktopManagerCtx { return &DesktopManagerCtx{ logger: log.With().Str("module", "desktop").Logger(), - cleanup: time.NewTicker(1 * time.Second), shutdown: make(chan bool), emmiter: events.New(), config: config, @@ -64,16 +62,15 @@ func (manager *DesktopManagerCtx) Start() { }) go func() { - defer func() { - xorg.DisplayClose() - manager.logger.Info().Msg("shutdown") - }() + ticker := time.NewTicker(1 * time.Second) + defer ticker.Stop() for { select { case <-manager.shutdown: + xorg.DisplayClose() return - case <-manager.cleanup.C: + case <-ticker.C: xorg.CheckKeys(time.Second * 10) } } @@ -95,7 +92,6 @@ func (manager *DesktopManagerCtx) OnAfterScreenSizeChange(listener func()) { func (manager *DesktopManagerCtx) Shutdown() error { manager.logger.Info().Msgf("desktop shutting down") - manager.cleanup.Stop() manager.shutdown <- true return nil } From b2ae8082337e1b45e03bd6ee1cbad31a7470e924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 23 Aug 2021 18:41:19 +0200 Subject: [PATCH 519/876] add merciful reconnect option. --- internal/config/session.go | 11 +++++++++-- internal/session/manager.go | 4 ++++ internal/types/session.go | 1 + internal/websocket/manager.go | 33 +++++++++++++++++++++------------ 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/internal/config/session.go b/internal/config/session.go index a990b3cb..1cff4b32 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -8,8 +8,9 @@ import ( ) type Session struct { - ImplicitHosting bool - APIToken string + ImplicitHosting bool + MercifulReconnect bool + APIToken string CookieEnabled bool CookieName string @@ -23,6 +24,11 @@ func (Session) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("session.merciful_reconnect", true, "allow reconnecting to websocket even if previous connection was not closed") + if err := viper.BindPFlag("session.merciful_reconnect", cmd.PersistentFlags().Lookup("session.merciful_reconnect")); err != nil { + return err + } + cmd.PersistentFlags().String("session.api_token", "", "API token for interacting with external services") if err := viper.BindPFlag("session.api_token", cmd.PersistentFlags().Lookup("session.api_token")); err != nil { return err @@ -54,6 +60,7 @@ func (Session) Init(cmd *cobra.Command) error { func (s *Session) Set() { s.ImplicitHosting = viper.GetBool("session.implicit_hosting") + s.MercifulReconnect = viper.GetBool("session.merciful_reconnect") s.APIToken = viper.GetString("session.api_token") s.CookieEnabled = viper.GetBool("session.cookie.enabled") diff --git a/internal/session/manager.go b/internal/session/manager.go index 50173467..1ec7f9f3 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -304,3 +304,7 @@ func (manager *SessionManagerCtx) ImplicitHosting() bool { func (manager *SessionManagerCtx) CookieEnabled() bool { return manager.config.CookieEnabled } + +func (manager *SessionManagerCtx) MercifulReconnect() bool { + return manager.config.MercifulReconnect +} diff --git a/internal/types/session.go b/internal/types/session.go index 1eb1f17e..6df70d87 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -50,6 +50,7 @@ type SessionManager interface { ImplicitHosting() bool CookieEnabled() bool + MercifulReconnect() bool CookieSetToken(w http.ResponseWriter, token string) CookieClearToken(w http.ResponseWriter, r *http.Request) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 22489928..cbb90fbb 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -189,22 +189,31 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque } if session.State().IsConnected { - manager.logger.Debug().Str("session_id", session.ID()).Msg("already connected") + manager.logger.Warn().Str("session_id", session.ID()).Msg("already connected") - // TODO: Refactor, return error code. - if err = connection.WriteJSON( - message.SystemDisconnect{ - Event: event.SYSTEM_DISCONNECT, - Message: "already connected", - }); err != nil { - manager.logger.Error().Err(err).Msg("failed to send disconnect event") + if !manager.sessions.MercifulReconnect() { + // TODO: Refactor, return error code. + if err = connection.WriteJSON( + message.SystemDisconnect{ + Event: event.SYSTEM_DISCONNECT, + Message: "already connected", + }); err != nil { + manager.logger.Error().Err(err).Msg("failed to send disconnect event") + } + + if err := connection.Close(); err != nil { + manager.logger.Warn().Err(err).Msg("connection closed with an error") + } + + return } - if err := connection.Close(); err != nil { - manager.logger.Warn().Err(err).Msg("connection closed with an error") - } + manager.logger.Debug().Str("session_id", session.ID()).Msg("replacing peer connection") - return + // replace peer connection + if err := session.GetWebSocketPeer().Destroy(); err != nil { + manager.logger.Warn().Err(err).Msg("previous connection closed with an error") + } } peer := &WebSocketPeerCtx{ From 8bb77166e80398ccba6f1a7f85e7a380a4ad273f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 28 Aug 2021 20:15:54 +0200 Subject: [PATCH 520/876] stream use video_id in logs. --- internal/capture/broadcast.go | 2 +- internal/capture/manager.go | 10 +++++----- internal/capture/stream.go | 13 +++++++++++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 802ace89..3322f28c 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -76,7 +76,7 @@ func (manager *BroacastManagerCtx) createPipeline() error { pipelineStr := strings.Replace(manager.pipelineStr, "{url}", manager.url, 1) manager.logger.Info(). - Str("str", pipelineStr). + Str("src", pipelineStr). Msgf("starting pipeline") manager.pipeline, err = gst.CreatePipeline(pipelineStr) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index c4d00bf5..b3e6a48a 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -57,7 +57,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt } videos := map[string]*StreamManagerCtx{} - for key, cnf := range config.VideoPipelines { + for video_id, cnf := range config.VideoPipelines { pipelineConf := cnf createPipeline := func() string { @@ -69,7 +69,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt pipeline, err := pipelineConf.GetPipeline(*screen) if err != nil { logger.Panic().Err(err). - Str("video_id", key). + Str("video_id", video_id). Msg("unable to get video pipeline") } @@ -82,12 +82,12 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt // trigger function to catch evaluation errors at startup pipeline := createPipeline() logger.Info(). - Str("video_id", key). + Str("video_id", video_id). Str("pipeline", pipeline). Msg("syntax check for video stream pipeline passed") // append to videos - videos[key] = streamNew(config.VideoCodec, createPipeline) + videos[video_id] = streamNew(config.VideoCodec, createPipeline, video_id) } return &CaptureManagerCtx{ @@ -109,7 +109,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! %s "+ "! appsink name=appsink", config.AudioDevice, config.AudioCodec.Pipeline, ) - }), + }, "audio"), videos: videos, videoIDs: config.VideoIDs, } diff --git a/internal/capture/stream.go b/internal/capture/stream.go index ef19b0c2..7c3ec6ad 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -27,9 +27,14 @@ type StreamManagerCtx struct { started bool } -func streamNew(codec codec.RTPCodec, pipelineStr func() string) *StreamManagerCtx { +func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) *StreamManagerCtx { + logger := log.With(). + Str("module", "capture"). + Str("submodule", "stream"). + Str("video_id", video_id).Logger() + manager := &StreamManagerCtx{ - logger: log.With().Str("module", "capture").Str("submodule", "stream").Logger(), + logger: logger, codec: codec, pipelineStr: pipelineStr, listeners: map[uintptr]*func(sample types.Sample){}, @@ -85,6 +90,7 @@ func (manager *StreamManagerCtx) AddListener(listener *func(sample types.Sample) if listener != nil { ptr := reflect.ValueOf(listener).Pointer() manager.listeners[ptr] = listener + manager.logger.Debug().Interface("ptr", ptr).Msgf("adding listener") } } @@ -95,6 +101,7 @@ func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Samp if listener != nil { ptr := reflect.ValueOf(listener).Pointer() delete(manager.listeners, ptr) + manager.logger.Debug().Interface("ptr", ptr).Msgf("removing listener") } } @@ -114,6 +121,7 @@ func (manager *StreamManagerCtx) Start() error { return err } + manager.logger.Info().Msgf("start") manager.started = true return nil } @@ -122,6 +130,7 @@ func (manager *StreamManagerCtx) Stop() { manager.mu.Lock() defer manager.mu.Unlock() + manager.logger.Info().Msgf("stop") manager.started = false manager.destroyPipeline() } From 530cc04805d7b863bcc20fd016c24885efb488fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 15:40:58 +0200 Subject: [PATCH 521/876] http use config. --- internal/http/manager.go | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/internal/http/manager.go b/internal/http/manager.go index d66879e3..1a321213 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -18,19 +18,19 @@ import ( type HttpManagerCtx struct { logger zerolog.Logger + config *config.Server router *chi.Mux http *http.Server - conf *config.Server } -func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, conf *config.Server) *HttpManagerCtx { +func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, config *config.Server) *HttpManagerCtx { logger := log.With().Str("module", "http").Logger() router := chi.NewRouter() router.Use(middleware.Recoverer) // Recover from panics without crashing server router.Use(cors.Handler(cors.Options{ AllowOriginFunc: func(r *http.Request, origin string) bool { - return conf.AllowOrigin(origin) + return config.AllowOrigin(origin) }, AllowedMethods: []string{"GET", "POST", "DELETE", "OPTIONS"}, AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"}, @@ -45,14 +45,14 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c router.Get("/api/ws", func(w http.ResponseWriter, r *http.Request) { WebSocketManager.Upgrade(w, r, func(r *http.Request) bool { - return conf.AllowOrigin(r.Header.Get("Origin")) + return config.AllowOrigin(r.Header.Get("Origin")) }) }) - if conf.Static != "" { - fs := http.FileServer(http.Dir(conf.Static)) + if config.Static != "" { + fs := http.FileServer(http.Dir(config.Static)) router.Get("/*", func(w http.ResponseWriter, r *http.Request) { - if _, err := os.Stat(conf.Static + r.URL.Path); !os.IsNotExist(err) { + if _, err := os.Stat(config.Static + r.URL.Path); !os.IsNotExist(err) { fs.ServeHTTP(w, r) } else { utils.HttpNotFound(w) @@ -64,23 +64,21 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c utils.HttpNotFound(w) })) - http := &http.Server{ - Addr: conf.Bind, - Handler: router, - } - return &HttpManagerCtx{ logger: logger, + config: config, router: router, - http: http, - conf: conf, + http: &http.Server{ + Addr: config.Bind, + Handler: router, + }, } } func (manager *HttpManagerCtx) Start() { - if manager.conf.Cert != "" && manager.conf.Key != "" { + if manager.config.Cert != "" && manager.config.Key != "" { go func() { - if err := manager.http.ListenAndServeTLS(manager.conf.Cert, manager.conf.Key); err != http.ErrServerClosed { + if err := manager.http.ListenAndServeTLS(manager.config.Cert, manager.config.Key); err != http.ErrServerClosed { manager.logger.Panic().Err(err).Msg("unable to start https server") } }() From 343b0c562aa6f4f9761fb564da1cac3243babcb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 17:09:13 +0200 Subject: [PATCH 522/876] common errors as variable. --- internal/api/members/handler.go | 20 ++++++++++----- internal/capture/broadcast.go | 4 +-- internal/capture/screencast.go | 10 ++++---- internal/capture/stream.go | 3 +-- internal/desktop/filechooserdialog.go | 4 +-- internal/member/dummy/provider.go | 6 ++--- internal/member/file/provider.go | 13 +++++----- internal/member/manager.go | 36 ++++++++++----------------- internal/member/object/provider.go | 16 ++++++------ internal/session/auth.go | 8 +++--- internal/session/manager.go | 10 ++++---- internal/types/capture.go | 5 ++++ internal/types/member.go | 8 ++++++ internal/types/session.go | 12 ++++++++- internal/types/webrtc.go | 11 +++++++- internal/webrtc/manager.go | 8 +++--- internal/webrtc/send.go | 11 +++++--- 17 files changed, 108 insertions(+), 77 deletions(-) diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 29656ac7..558991d0 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -2,6 +2,7 @@ package members import ( "context" + "errors" "net/http" "github.com/go-chi/chi" @@ -68,14 +69,21 @@ func GetMember(r *http.Request) MemberData { func (h *MembersHandler) ExtractMember(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { memberId := chi.URLParam(r, "memberId") + profile, err := h.members.Select(memberId) if err != nil { - utils.HttpNotFound(w, err) - } else { - next.ServeHTTP(w, SetMember(r, MemberData{ - ID: memberId, - Profile: profile, - })) + if errors.Is(err, types.ErrMemberDoesNotExist) { + utils.HttpNotFound(w, err) + } else { + utils.HttpInternalServerError(w, err) + } + + return } + + next.ServeHTTP(w, SetMember(r, MemberData{ + ID: memberId, + Profile: profile, + })) }) } diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 3322f28c..ab9d9dfa 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -1,7 +1,6 @@ package capture import ( - "fmt" "strings" "sync" @@ -9,6 +8,7 @@ import ( "github.com/rs/zerolog/log" "demodesk/neko/internal/capture/gst" + "demodesk/neko/internal/types" ) type BroacastManagerCtx struct { @@ -67,7 +67,7 @@ func (manager *BroacastManagerCtx) Url() string { func (manager *BroacastManagerCtx) createPipeline() error { if manager.pipeline != nil { - return fmt.Errorf("pipeline already exists") + return types.ErrCapturePipelineAlreadyExists } var err error diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 28bb1e74..bec88894 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -1,7 +1,7 @@ package capture import ( - "fmt" + "errors" "sync" "sync/atomic" "time" @@ -93,12 +93,12 @@ func (manager *ScreencastManagerCtx) Image() ([]byte, error) { case sample := <-manager.sample: return sample.Data, nil case <-time.After(1 * time.Second): - return nil, fmt.Errorf("timeouted") + return nil, errors.New("timeouted") } } if manager.image.Data == nil { - return nil, fmt.Errorf("image sample not found") + return nil, errors.New("image sample not found") } return manager.image.Data, nil @@ -109,7 +109,7 @@ func (manager *ScreencastManagerCtx) start() error { defer manager.mu.Unlock() if !manager.enabled { - return fmt.Errorf("screenshot pipeline not enabled") + return errors.New("screenshot pipeline not enabled") } err := manager.createPipeline() @@ -131,7 +131,7 @@ func (manager *ScreencastManagerCtx) stop() { func (manager *ScreencastManagerCtx) createPipeline() error { if manager.pipeline != nil { - return fmt.Errorf("pipeline already exists") + return types.ErrCapturePipelineAlreadyExists } var err error diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 7c3ec6ad..34f6a91f 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -1,7 +1,6 @@ package capture import ( - "fmt" "reflect" "sync" @@ -141,7 +140,7 @@ func (manager *StreamManagerCtx) Started() bool { func (manager *StreamManagerCtx) createPipeline() error { if manager.pipeline != nil { - return fmt.Errorf("pipeline already exists") + return types.ErrCapturePipelineAlreadyExists } var err error diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index 85fb22e1..5091e001 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -1,7 +1,7 @@ package desktop import ( - "fmt" + "errors" "os/exec" "time" ) @@ -46,7 +46,7 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { // if last command didn't return error, consider dialog as still open if err2 == nil { - return fmt.Errorf("unable to select files in dialog") + return errors.New("unable to select files in dialog") } return nil diff --git a/internal/member/dummy/provider.go b/internal/member/dummy/provider.go index 8072e79b..5dafd59d 100644 --- a/internal/member/dummy/provider.go +++ b/internal/member/dummy/provider.go @@ -1,7 +1,7 @@ package dummy import ( - "fmt" + "errors" "demodesk/neko/internal/types" ) @@ -37,7 +37,7 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string } func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { - return "", fmt.Errorf("not implemented") + return "", errors.New("not implemented") } func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { @@ -54,7 +54,7 @@ func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.Member } func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { - return fmt.Errorf("not implemented") + return errors.New("not implemented") } func (provider *MemberProviderCtx) Delete(id string) error { diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index e3ec3476..39fbd74e 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -2,7 +2,6 @@ package file import ( "encoding/json" - "fmt" "io/ioutil" "os" @@ -38,7 +37,7 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string // TODO: Use hash function. if entry.Password != password { - return "", types.MemberProfile{}, fmt.Errorf("invalid password") + return "", types.MemberProfile{}, types.ErrMemberInvalidPassword } return id, entry.Profile, nil @@ -55,7 +54,7 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof _, ok := entries[id] if ok { - return "", fmt.Errorf("member ID already exists") + return "", types.ErrMemberAlreadyExists } entries[id] = MemberEntry{ @@ -75,7 +74,7 @@ func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.Member entry, ok := entries[id] if !ok { - return fmt.Errorf("member ID does not exist") + return types.ErrMemberDoesNotExist } entry.Profile = profile @@ -92,7 +91,7 @@ func (provider *MemberProviderCtx) UpdatePassword(id string, password string) er entry, ok := entries[id] if !ok { - return fmt.Errorf("member ID does not exist") + return types.ErrMemberDoesNotExist } // TODO: Use hash function. @@ -139,7 +138,7 @@ func (provider *MemberProviderCtx) Delete(id string) error { _, ok := entries[id] if !ok { - return fmt.Errorf("member ID does not exist") + return types.ErrMemberDoesNotExist } delete(entries, id) @@ -178,7 +177,7 @@ func (provider *MemberProviderCtx) getEntry(id string) (MemberEntry, error) { entry, ok := entries[id] if !ok { - return MemberEntry{}, fmt.Errorf("member ID does not exist") + return MemberEntry{}, types.ErrMemberDoesNotExist } return entry, nil diff --git a/internal/member/manager.go b/internal/member/manager.go index f52a417f..8696cf40 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -1,7 +1,7 @@ package member import ( - "fmt" + "errors" "sync" "github.com/rs/zerolog" @@ -41,7 +41,7 @@ type MemberManagerCtx struct { config *config.Member providerMu sync.Mutex provider types.MemberProvider - sessionMu sync.Mutex + loginMu sync.Mutex } func (manager *MemberManagerCtx) Connect() error { @@ -91,13 +91,10 @@ func (manager *MemberManagerCtx) UpdateProfile(id string, profile types.MemberPr defer manager.providerMu.Unlock() // update corresponding session, if exists - manager.sessionMu.Lock() - if _, ok := manager.sessions.Get(id); ok { - if err := manager.sessions.Update(id, profile); err != nil { - manager.logger.Err(err).Msg("error while updating session") - } + err := manager.sessions.Update(id, profile) + if err != nil && !errors.Is(err, types.ErrSessionNotFound) { + manager.logger.Err(err).Msg("error while updating session") } - manager.sessionMu.Unlock() return manager.provider.UpdateProfile(id, profile) } @@ -114,13 +111,10 @@ func (manager *MemberManagerCtx) Delete(id string) error { defer manager.providerMu.Unlock() // destroy corresponding session, if exists - manager.sessionMu.Lock() - if _, ok := manager.sessions.Get(id); ok { - if err := manager.sessions.Delete(id); err != nil { - manager.logger.Err(err).Msg("error while deleting session") - } + err := manager.sessions.Delete(id) + if err != nil && !errors.Is(err, types.ErrSessionNotFound) { + manager.logger.Err(err).Msg("error while deleting session") } - manager.sessionMu.Unlock() return manager.provider.Delete(id) } @@ -130,8 +124,8 @@ func (manager *MemberManagerCtx) Delete(id string) error { // func (manager *MemberManagerCtx) Login(username string, password string) (types.Session, string, error) { - manager.sessionMu.Lock() - defer manager.sessionMu.Unlock() + manager.loginMu.Lock() + defer manager.loginMu.Unlock() id, profile, err := manager.provider.Authenticate(username, password) if err != nil { @@ -141,7 +135,7 @@ func (manager *MemberManagerCtx) Login(username string, password string) (types. session, ok := manager.sessions.Get(id) if ok { if session.State().IsConnected { - return nil, "", fmt.Errorf("session is already connected") + return nil, "", types.ErrSessionAlreadyConnected } // TODO: Replace session. @@ -154,12 +148,8 @@ func (manager *MemberManagerCtx) Login(username string, password string) (types. } func (manager *MemberManagerCtx) Logout(id string) error { - manager.sessionMu.Lock() - defer manager.sessionMu.Unlock() - - if _, ok := manager.sessions.Get(id); !ok { - return fmt.Errorf("session not found") - } + manager.loginMu.Lock() + defer manager.loginMu.Unlock() return manager.sessions.Delete(id) } diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index 68855d65..4dbdb77e 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -1,8 +1,6 @@ package object import ( - "fmt" - "demodesk/neko/internal/types" ) @@ -60,12 +58,12 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string entry, ok := provider.entries[id] if !ok { - return "", types.MemberProfile{}, fmt.Errorf("member ID does not exist") + return "", types.MemberProfile{}, types.ErrMemberDoesNotExist } // TODO: Use hash function. if entry.Password != password { - return "", types.MemberProfile{}, fmt.Errorf("invalid password") + return "", types.MemberProfile{}, types.ErrMemberInvalidPassword } return id, entry.Profile, nil @@ -77,7 +75,7 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof _, ok := provider.entries[id] if ok { - return "", fmt.Errorf("member ID already exists") + return "", types.ErrMemberAlreadyExists } provider.entries[id] = &MemberEntry{ @@ -92,7 +90,7 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { entry, ok := provider.entries[id] if !ok { - return fmt.Errorf("member ID does not exist") + return types.ErrMemberDoesNotExist } entry.Profile = profile @@ -103,7 +101,7 @@ func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.Member func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { entry, ok := provider.entries[id] if !ok { - return fmt.Errorf("member ID does not exist") + return types.ErrMemberDoesNotExist } // TODO: Use hash function. @@ -115,7 +113,7 @@ func (provider *MemberProviderCtx) UpdatePassword(id string, password string) er func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { entry, ok := provider.entries[id] if !ok { - return types.MemberProfile{}, fmt.Errorf("member ID does not exist") + return types.MemberProfile{}, types.ErrMemberDoesNotExist } return entry.Profile, nil @@ -139,7 +137,7 @@ func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string] func (provider *MemberProviderCtx) Delete(id string) error { _, ok := provider.entries[id] if !ok { - return fmt.Errorf("member ID does not exist") + return types.ErrMemberDoesNotExist } delete(provider.entries, id) diff --git a/internal/session/auth.go b/internal/session/auth.go index b12c2637..06c40d6d 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -1,7 +1,7 @@ package session import ( - "fmt" + "errors" "net/http" "strings" "time" @@ -39,16 +39,16 @@ func (manager *SessionManagerCtx) CookieClearToken(w http.ResponseWriter, r *htt func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session, error) { token, ok := manager.getToken(r) if !ok { - return nil, fmt.Errorf("no authentication provided") + return nil, errors.New("no authentication provided") } session, ok := manager.GetByToken(token) if !ok { - return nil, fmt.Errorf("session not found") + return nil, types.ErrSessionNotFound } if !session.Profile().CanLogin { - return nil, fmt.Errorf("login disabled") + return nil, types.ErrSessionLoginDisabled } return session, nil diff --git a/internal/session/manager.go b/internal/session/manager.go index 1ec7f9f3..2e357e7e 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -1,7 +1,7 @@ package session import ( - "fmt" + "errors" "sync" "github.com/kataras/go-events" @@ -68,12 +68,12 @@ func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) manager.sessionsMu.Lock() if _, ok := manager.sessions[id]; ok { manager.sessionsMu.Unlock() - return nil, "", fmt.Errorf("session id already exists") + return nil, "", types.ErrSessionAlreadyExists } if _, ok := manager.tokens[token]; ok { manager.sessionsMu.Unlock() - return nil, "", fmt.Errorf("session token already exists") + return nil, "", errors.New("session token already exists") } session := &SessionCtx{ @@ -98,7 +98,7 @@ func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) session, ok := manager.sessions[id] if !ok { manager.sessionsMu.Unlock() - return fmt.Errorf("session id not found") + return types.ErrSessionNotFound } session.profile = profile @@ -114,7 +114,7 @@ func (manager *SessionManagerCtx) Delete(id string) error { session, ok := manager.sessions[id] if !ok { manager.sessionsMu.Unlock() - return fmt.Errorf("session id not found") + return types.ErrSessionNotFound } delete(manager.tokens, session.token) diff --git a/internal/types/capture.go b/internal/types/capture.go index f8ba68be..8901bdf6 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -2,6 +2,7 @@ package types import ( "context" + "errors" "fmt" "math" "strings" @@ -12,6 +13,10 @@ import ( "demodesk/neko/internal/types/codec" ) +var ( + ErrCapturePipelineAlreadyExists = errors.New("capture pipeline already exists") +) + type Sample media.Sample type BroadcastManager interface { diff --git a/internal/types/member.go b/internal/types/member.go index be7d1e38..17173754 100644 --- a/internal/types/member.go +++ b/internal/types/member.go @@ -1,5 +1,13 @@ package types +import "errors" + +var ( + ErrMemberAlreadyExists = errors.New("member already exists") + ErrMemberDoesNotExist = errors.New("member does not exist") + ErrMemberInvalidPassword = errors.New("invalid password") +) + type MemberProfile struct { Name string `json:"name"` IsAdmin bool `json:"is_admin"` diff --git a/internal/types/session.go b/internal/types/session.go index 6df70d87..d243ec51 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -1,6 +1,16 @@ package types -import "net/http" +import ( + "errors" + "net/http" +) + +var ( + ErrSessionNotFound = errors.New("session not found") + ErrSessionAlreadyExists = errors.New("session already exists") + ErrSessionAlreadyConnected = errors.New("session is already connected") + ErrSessionLoginDisabled = errors.New("session login disabled") +) type SessionState struct { IsConnected bool `json:"is_connected"` diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 1639a635..4bf34915 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -1,6 +1,15 @@ package types -import "github.com/pion/webrtc/v3" +import ( + "errors" + + "github.com/pion/webrtc/v3" +) + +var ( + ErrWebRTCVideoNotFound = errors.New("webrtc video not found") + ErrWebRTCDataChannelNotFound = errors.New("webrtc data channel not found") +) type ICEServer struct { URLs []string `mapstructure:"urls" json:"urls"` diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 1d1a8b19..0da67ed5 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -66,7 +66,7 @@ func (manager *WebRTCManagerCtx) Start() { } audioListener := func(sample types.Sample) { - if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { + if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil { if errors.Is(err, io.ErrClosedPipe) { // The peerConnection has been closed. return @@ -166,7 +166,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } videoListener := func(sample types.Sample) { - if err := videoTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { + if err := videoTrack.WriteSample(media.Sample(sample)); err != nil { if errors.Is(err, io.ErrClosedPipe) { // The peerConnection has been closed. return @@ -200,7 +200,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin changeVideo := func(videoID string) error { newVideoStream, ok := manager.capture.Video(videoID) if !ok { - return fmt.Errorf("video stream not found") + return types.ErrWebRTCVideoNotFound } // should be new stream started @@ -357,7 +357,7 @@ func (manager *WebRTCManagerCtx) mediaEngine(videoID string) (*webrtc.MediaEngin // all videos must have the same codec video, ok := manager.capture.Video(videoID) if !ok { - return nil, fmt.Errorf("selected video track not found") + return nil, types.ErrWebRTCVideoNotFound } videoCodec := video.Codec() diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index 31d07c1a..55733f42 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -3,7 +3,6 @@ package webrtc import ( "bytes" "encoding/binary" - "fmt" "demodesk/neko/internal/types" ) @@ -28,8 +27,11 @@ type PayloadCursorImage struct { } func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { + peer.mu.Lock() + defer peer.mu.Unlock() + if peer.dataChannel == nil { - return fmt.Errorf("no data channel") + return types.ErrWebRTCDataChannelNotFound } data := PayloadCursorPosition{ @@ -50,8 +52,11 @@ func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { } func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage, img []byte) error { + peer.mu.Lock() + defer peer.mu.Unlock() + if peer.dataChannel == nil { - return fmt.Errorf("no data channel") + return types.ErrWebRTCDataChannelNotFound } data := PayloadCursorImage{ From 0501091c96373e56d55c47b9ee4e532b0e485219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 17:12:37 +0200 Subject: [PATCH 523/876] remove io/ioutil. --- internal/api/members/bluk.go | 4 ++-- internal/api/room/upload.go | 5 ++--- internal/member/file/provider.go | 6 +++--- internal/utils/request.go | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/internal/api/members/bluk.go b/internal/api/members/bluk.go index 5d5edb20..cb1695c4 100644 --- a/internal/api/members/bluk.go +++ b/internal/api/members/bluk.go @@ -3,7 +3,7 @@ package members import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "demodesk/neko/internal/types" @@ -16,7 +16,7 @@ type MemberBulkUpdatePayload struct { } func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Request) { - bytes, err := ioutil.ReadAll(r.Body) + bytes, err := io.ReadAll(r.Body) if err != nil { utils.HttpInternalServerError(w, err) return diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 86dbac8f..58161271 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -2,7 +2,6 @@ package room import ( "io" - "io/ioutil" "net/http" "os" "path" @@ -44,7 +43,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { return } - dir, err := ioutil.TempDir("", "neko-drop-*") + dir, err := os.MkdirTemp("", "neko-drop-*") if err != nil { utils.HttpInternalServerError(w, err) return @@ -108,7 +107,7 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { return } - dir, err := ioutil.TempDir("", "neko-dialog-*") + dir, err := os.MkdirTemp("", "neko-dialog-*") if err != nil { utils.HttpInternalServerError(w, err) return diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index 39fbd74e..92a8c687 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -2,7 +2,7 @@ package file import ( "encoding/json" - "io/ioutil" + "io" "os" "demodesk/neko/internal/types" @@ -152,7 +152,7 @@ func (provider *MemberProviderCtx) deserialize() (map[string]MemberEntry, error) return nil, err } - raw, err := ioutil.ReadAll(file) + raw, err := io.ReadAll(file) if err != nil { return nil, err } @@ -189,5 +189,5 @@ func (provider *MemberProviderCtx) serialize(data map[string]MemberEntry) error return err } - return ioutil.WriteFile(provider.config.Path, raw, os.ModePerm) + return os.WriteFile(provider.config.Path, raw, os.ModePerm) } diff --git a/internal/utils/request.go b/internal/utils/request.go index 9ba77b01..7f860452 100644 --- a/internal/utils/request.go +++ b/internal/utils/request.go @@ -2,7 +2,7 @@ package utils import ( "bytes" - "io/ioutil" + "io" "net/http" ) @@ -13,7 +13,7 @@ func HttpRequestGET(url string) (string, error) { } defer rsp.Body.Close() - buf, err := ioutil.ReadAll(rsp.Body) + buf, err := io.ReadAll(rsp.Body) if err != nil { return "", err } From d00d66e0ec6628024aa4bc2b21f17d6a5edb1d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 17:23:49 +0200 Subject: [PATCH 524/876] api forbidden if login disabled. --- internal/api/router.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/api/router.go b/internal/api/router.go index 0198e8d0..d37dd00b 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -1,6 +1,7 @@ package api import ( + "errors" "net/http" "github.com/go-chi/chi" @@ -74,7 +75,12 @@ func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { api.sessions.CookieClearToken(w, r) } - utils.HttpUnauthorized(w, err) + if errors.Is(err, types.ErrSessionLoginDisabled) { + utils.HttpForbidden(w, err) + } else { + utils.HttpUnauthorized(w, err) + } + return } From 8f8cd47e8510e4fb3cc59bcbc06cb6de4d94f68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 18:23:58 +0200 Subject: [PATCH 525/876] websockets logging. --- internal/websocket/filechooserdialog.go | 17 +++-- internal/websocket/handler/clipboard.go | 6 +- internal/websocket/handler/control.go | 12 ++-- internal/websocket/handler/handler.go | 12 ++-- internal/websocket/handler/keyboard.go | 8 ++- internal/websocket/handler/screen.go | 4 +- internal/websocket/handler/send.go | 4 +- internal/websocket/handler/signal.go | 20 ++++-- internal/websocket/manager.go | 90 ++++++++++++++++--------- internal/websocket/peer.go | 6 +- 10 files changed, 115 insertions(+), 64 deletions(-) diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index ea732a12..9791ea4f 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -11,11 +11,11 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { // when dialog opens, everyone should be notified. manager.desktop.OnFileChooserDialogOpened(func() { - manager.logger.Info().Msg("FileChooserDialog opened") + manager.logger.Info().Msg("file chooser dialog opened") host := manager.sessions.GetHost() if host == nil { - manager.logger.Warn().Msg("no host for FileChooserDialog found, closing") + manager.logger.Warn().Msg("no host for file chooser dialog found, closing") go manager.desktop.CloseFileChooserDialog() return } @@ -30,7 +30,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { // when dialog closes, everyone should be notified. manager.desktop.OnFileChooserDialogClosed(func() { - manager.logger.Info().Msg("FileChooserDialog closed") + manager.logger.Info().Msg("file chooser dialog closed") activeSession = nil @@ -45,14 +45,16 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { return } + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + logger.Debug().Msg("sending file chooser dialog status to a new session") + if err := session.Send(message.SessionID{ Event: event.FILE_CHOOSER_DIALOG_OPENED, ID: activeSession.ID(), }); err != nil { - manager.logger.Warn(). - Err(err). - Str("session_id", session.ID()). - Msgf("could not send event `%s` to session", event.FILE_CHOOSER_DIALOG_OPENED) + logger.Warn().Err(err). + Str("event", event.FILE_CHOOSER_DIALOG_OPENED). + Msg("could not send event") } }) @@ -62,6 +64,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { return } + manager.logger.Info().Msg("file chooser dialog owner left, closing") manager.desktop.CloseFileChooserDialog() }) } diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 62a1d79c..6c4618c6 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -6,13 +6,15 @@ import ( ) func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + if !session.Profile().CanAccessClipboard { - h.logger.Debug().Str("session_id", session.ID()).Msg("cannot access clipboard") + logger.Debug().Msg("cannot access clipboard") return nil } if !session.IsHost() { - h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host") + logger.Debug().Msg("is not the host") return nil } diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index ac348464..14cc03b2 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -7,13 +7,15 @@ import ( ) func (h *MessageHandlerCtx) controlRelease(session types.Session) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + if !session.Profile().CanHost { - h.logger.Debug().Str("session_id", session.ID()).Msg("is not allowed to host") + logger.Debug().Msg("is not allowed to host") return nil } if !session.IsHost() { - h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host") + logger.Debug().Msg("is not the host") return nil } @@ -24,13 +26,15 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { } func (h *MessageHandlerCtx) controlRequest(session types.Session) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + if !session.Profile().CanHost { - h.logger.Debug().Str("session_id", session.ID()).Msg("is not allowed to host") + logger.Debug().Msg("is not allowed to host") return nil } if session.IsHost() { - h.logger.Debug().Str("session_id", session.ID()).Msg("is already the host") + logger.Debug().Msg("is already the host") return nil } diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 5b1531d9..2b849c22 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -18,10 +18,8 @@ func New( capture types.CaptureManager, webrtc types.WebRTCManager, ) *MessageHandlerCtx { - logger := log.With().Str("module", "handler").Logger() - return &MessageHandlerCtx{ - logger: logger, + logger: log.With().Str("module", "websocket").Str("submodule", "handler").Logger(), sessions: sessions, desktop: desktop, capture: capture, @@ -38,9 +36,11 @@ type MessageHandlerCtx struct { } func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + header := message.Message{} if err := json.Unmarshal(raw, &header); err != nil { - h.logger.Error().Err(err).Msg("message parsing has failed") + logger.Error().Err(err).Msg("message parsing has failed") return false } @@ -114,12 +114,12 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { return h.sendBroadcast(session, payload) }) default: - h.logger.Warn().Str("event", header.Event).Msg("unknown message event") + logger.Warn().Str("event", header.Event).Msg("unknown message event") return false } if err != nil { - h.logger.Error().Err(err).Str("event", header.Event).Msg("message handler has failed") + logger.Error().Err(err).Str("event", header.Event).Msg("message handler has failed") } return true diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 112552ee..72d21a26 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -6,8 +6,10 @@ import ( ) func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + if !session.IsHost() { - h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host") + logger.Debug().Msg("is not the host") return nil } @@ -18,8 +20,10 @@ func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message. } func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *message.KeyboardModifiers) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + if !session.IsHost() { - h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host") + logger.Debug().Msg("is not the host") return nil } diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index a88b6c06..07a6fc2c 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -7,8 +7,10 @@ import ( ) func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + if !session.Profile().IsAdmin { - h.logger.Debug().Str("session_id", session.ID()).Msg("is not the admin") + logger.Debug().Msg("is not the admin") return nil } diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index 70e2763e..73eac541 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -7,9 +7,11 @@ import ( ) func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + receiver, ok := h.sessions.Get(payload.Receiver) if !ok { - h.logger.Debug().Str("session_id", session.ID()).Msg("receiver session ID not found") + logger.Debug().Msg("receiver session ID not found") return nil } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 647a9bdc..e32becd0 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -7,8 +7,10 @@ import ( ) func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + if !session.Profile().CanWatch { - h.logger.Debug().Str("session_id", session.ID()).Msg("not allowed to watch") + logger.Debug().Msg("not allowed to watch") return nil } @@ -33,9 +35,11 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag } func (h *MessageHandlerCtx) signalRestart(session types.Session) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + peer := session.GetWebRTCPeer() if peer == nil { - h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") + logger.Debug().Msg("webRTC peer does not exist") return nil } @@ -52,9 +56,11 @@ func (h *MessageHandlerCtx) signalRestart(session types.Session) error { } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + peer := session.GetWebRTCPeer() if peer == nil { - h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") + logger.Debug().Msg("webRTC peer does not exist") return nil } @@ -62,9 +68,11 @@ func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message } func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *message.SignalCandidate) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + peer := session.GetWebRTCPeer() if peer == nil { - h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") + logger.Debug().Msg("webRTC peer does not exist") return nil } @@ -72,9 +80,11 @@ func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *mess } func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message.SignalVideo) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + peer := session.GetWebRTCPeer() if peer == nil { - h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") + logger.Debug().Msg("webRTC peer does not exist") return nil } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index cbb90fbb..0fa1d168 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -44,50 +44,62 @@ type WebSocketManagerCtx struct { func (manager *WebSocketManagerCtx) Start() { manager.sessions.OnCreated(func(session types.Session) { + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + if err := manager.handler.SessionCreated(session); err != nil { - manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session created with an error") + logger.Warn().Err(err).Msg("session created with an error") } else { - manager.logger.Debug().Str("session_id", session.ID()).Msg("session created") + logger.Debug().Msg("session created") } }) manager.sessions.OnDeleted(func(session types.Session) { + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + if err := manager.handler.SessionDeleted(session); err != nil { - manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session deleted with an error") + logger.Warn().Err(err).Msg("session deleted with an error") } else { - manager.logger.Debug().Str("session_id", session.ID()).Msg("session deleted") + logger.Debug().Msg("session deleted") } }) manager.sessions.OnConnected(func(session types.Session) { + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + if err := manager.handler.SessionConnected(session); err != nil { - manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session connected with an error") + logger.Warn().Err(err).Msg("session connected with an error") } else { - manager.logger.Debug().Str("session_id", session.ID()).Msg("session connected") + logger.Debug().Msg("session connected") } }) manager.sessions.OnDisconnected(func(session types.Session) { + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + if err := manager.handler.SessionDisconnected(session); err != nil { - manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session disconnected with an error") + logger.Warn().Err(err).Msg("session disconnected with an error") } else { - manager.logger.Debug().Str("session_id", session.ID()).Msg("session disconnected") + logger.Debug().Msg("session disconnected") } }) manager.sessions.OnProfileChanged(func(session types.Session) { + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + if err := manager.handler.SessionProfileChanged(session); err != nil { - manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session profile changed with an error") + logger.Warn().Err(err).Msg("session profile changed with an error") } else { - manager.logger.Debug().Str("session_id", session.ID()).Msg("session profile changed") + logger.Debug().Msg("session profile changed") } }) manager.sessions.OnStateChanged(func(session types.Session) { + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + if err := manager.handler.SessionStateChanged(session); err != nil { - manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session state changed with an error") + logger.Warn().Err(err).Msg("session state changed with an error") } else { - manager.logger.Debug().Str("session_id", session.ID()).Msg("session state changed") + logger.Debug().Msg("session state changed") } }) @@ -102,6 +114,11 @@ func (manager *WebSocketManagerCtx) Start() { } manager.sessions.Broadcast(msg, nil) + + manager.logger.Debug(). + Bool("has_host", msg.HasHost). + Str("host_id", msg.HostID). + Msg("session host changed") }) manager.desktop.OnClipboardUpdated(func() { @@ -122,13 +139,19 @@ func (manager *WebSocketManagerCtx) Start() { // TODO: Send HTML? }); err != nil { manager.logger.Warn().Err(err).Msg("could not sync clipboard") + return } + + manager.logger.Debug().Msg("session sync clipboard") }) manager.fileChooserDialogEvents() + + manager.logger.Info().Msg("websocket starting") } func (manager *WebSocketManagerCtx) Shutdown() error { + manager.logger.Info().Msg("websocket shutdown") return nil } @@ -169,8 +192,11 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque return } + // add session id to logger context + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + if !session.Profile().CanConnect { - manager.logger.Debug().Str("session_id", session.ID()).Msg("connection disabled") + logger.Debug().Msg("connection disabled") // TODO: Refactor, return error code. if err = connection.WriteJSON( @@ -178,18 +204,18 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque Event: event.SYSTEM_DISCONNECT, Message: "connection disabled", }); err != nil { - manager.logger.Error().Err(err).Msg("failed to send disconnect event") + logger.Error().Err(err).Msg("failed to send disconnect event") } if err := connection.Close(); err != nil { - manager.logger.Warn().Err(err).Msg("connection closed with an error") + logger.Warn().Err(err).Msg("connection closed with an error") } return } if session.State().IsConnected { - manager.logger.Warn().Str("session_id", session.ID()).Msg("already connected") + logger.Warn().Msg("already connected") if !manager.sessions.MercifulReconnect() { // TODO: Refactor, return error code. @@ -198,44 +224,40 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque Event: event.SYSTEM_DISCONNECT, Message: "already connected", }); err != nil { - manager.logger.Error().Err(err).Msg("failed to send disconnect event") + logger.Error().Err(err).Msg("failed to send disconnect event") } if err := connection.Close(); err != nil { - manager.logger.Warn().Err(err).Msg("connection closed with an error") + logger.Warn().Err(err).Msg("connection closed with an error") } return } - manager.logger.Debug().Str("session_id", session.ID()).Msg("replacing peer connection") + logger.Info().Msg("replacing peer connection") // replace peer connection if err := session.GetWebSocketPeer().Destroy(); err != nil { - manager.logger.Warn().Err(err).Msg("previous connection closed with an error") + logger.Warn().Err(err).Msg("previous connection closed with an error") } } peer := &WebSocketPeerCtx{ + logger: logger, session: session, - manager: manager, connection: connection, } session.SetWebSocketPeer(peer) - manager.logger. - Debug(). - Str("session_id", session.ID()). + logger.Info(). Str("address", connection.RemoteAddr().String()). Msg("connection started") session.SetWebSocketConnected(peer, true) defer func() { - manager.logger. - Debug(). - Str("session_id", session.ID()). + logger.Info(). Str("address", connection.RemoteAddr().String()). Msg("connection ended") @@ -246,6 +268,9 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque } func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session types.Session) { + // add session id to logger context + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + bytes := make(chan []byte) cancel := make(chan struct{}) @@ -257,9 +282,9 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t _, raw, err := connection.ReadMessage() if err != nil { if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { - manager.logger.Warn().Err(err).Msg("read message error") + logger.Warn().Err(err).Msg("read message error") } else { - manager.logger.Debug().Err(err).Msg("read message error") + logger.Debug().Err(err).Msg("read message error") } close(cancel) @@ -273,8 +298,7 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t for { select { case raw := <-bytes: - manager.logger.Debug(). - Str("session_id", session.ID()). + logger.Debug(). Str("address", connection.RemoteAddr().String()). Str("raw", string(raw)). Msg("received message from client") @@ -289,13 +313,13 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t } if !handled { - manager.logger.Warn().Msg("unhandled message") + logger.Warn().Msg("unhandled message") } case <-cancel: return case <-ticker.C: if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { - manager.logger.Error().Err(err).Msg("ping message has failed") + logger.Error().Err(err).Msg("ping message has failed") return } } diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 6bf1c344..fc464b8a 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -5,6 +5,7 @@ import ( "sync" "github.com/gorilla/websocket" + "github.com/rs/zerolog" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" @@ -14,8 +15,8 @@ import ( type WebSocketPeerCtx struct { mu sync.Mutex + logger zerolog.Logger session types.Session - manager *WebSocketManagerCtx connection *websocket.Conn } @@ -32,8 +33,7 @@ func (peer *WebSocketPeerCtx) Send(v interface{}) error { return err } - peer.manager.logger.Debug(). - Str("session_id", peer.session.ID()). + peer.logger.Debug(). Str("address", peer.connection.RemoteAddr().String()). Str("raw", string(raw)). Msg("sending message to client") From a03507227d5898658cc7b4b00ad084dfe61a6652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 18:59:46 +0200 Subject: [PATCH 526/876] webrtc logging. --- internal/webrtc/cursor/image.go | 6 +++-- internal/webrtc/cursor/position.go | 4 +-- internal/webrtc/handler.go | 41 +++++++++++++++--------------- internal/webrtc/logger.go | 2 +- internal/webrtc/manager.go | 25 ++++++++++-------- internal/webrtc/peer.go | 3 +++ 6 files changed, 44 insertions(+), 37 deletions(-) diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 3bacf281..469109b6 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -13,7 +13,7 @@ import ( func NewImage(desktop types.DesktopManager) *ImageCtx { return &ImageCtx{ - logger: log.With().Str("module", "cursor-image").Logger(), + logger: log.With().Str("module", "webrtc").Str("submodule", "cursor-image").Logger(), desktop: desktop, listeners: map[uintptr]*func(entry *ImageEntry){}, cache: map[uint64]*ImageEntry{}, @@ -50,10 +50,12 @@ func (manager *ImageCtx) Start() { (*emit)(entry) } }) + + manager.logger.Info().Msg("starting") } func (manager *ImageCtx) Shutdown() { - manager.logger.Info().Msgf("shutting down") + manager.logger.Info().Msg("shutdown") manager.emitMu.Lock() for key := range manager.listeners { diff --git a/internal/webrtc/cursor/position.go b/internal/webrtc/cursor/position.go index 958e7d3d..de5994fd 100644 --- a/internal/webrtc/cursor/position.go +++ b/internal/webrtc/cursor/position.go @@ -12,7 +12,7 @@ import ( func NewPosition(desktop types.DesktopManager) *PositionCtx { return &PositionCtx{ - logger: log.With().Str("module", "cursor-position").Logger(), + logger: log.With().Str("module", "webrtc").Str("submodule", "cursor-position").Logger(), desktop: desktop, listeners: map[uintptr]*func(x, y int){}, } @@ -26,7 +26,7 @@ type PositionCtx struct { } func (manager *PositionCtx) Shutdown() { - manager.logger.Info().Msgf("shutting down") + manager.logger.Info().Msg("shutdown") manager.emitMu.Lock() for key := range manager.listeners { diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 2eef5a52..5267703e 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -5,6 +5,8 @@ import ( "encoding/binary" "github.com/pion/webrtc/v3" + + "demodesk/neko/internal/types" ) const ( @@ -38,7 +40,10 @@ type PayloadKey struct { Key uint32 } -func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { +func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage, session types.Session) error { + // add session id to logger context + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + buffer := bytes.NewBuffer(msg.Data) header := &PayloadHeader{} hbytes := make([]byte, 3) @@ -68,13 +73,11 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { return err } - manager.logger. - Debug(). + manager.desktop.Scroll(int(payload.X), int(payload.Y)) + logger.Trace(). Int16("x", payload.X). Int16("y", payload.Y). Msg("scroll") - - manager.desktop.Scroll(int(payload.X), int(payload.Y)) case OP_KEY_DOWN: payload := &PayloadKey{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { @@ -82,11 +85,10 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { } if err := manager.desktop.KeyDown(payload.Key); err != nil { - manager.logger.Warn().Err(err).Msg("key down failed") - break + logger.Warn().Err(err).Uint32("key", payload.Key).Msg("key down failed") + } else { + logger.Trace().Uint32("key", payload.Key).Msg("key down") } - - manager.logger.Debug().Msgf("key down %d", payload.Key) case OP_KEY_UP: payload := &PayloadKey{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { @@ -94,11 +96,10 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { } if err := manager.desktop.KeyUp(payload.Key); err != nil { - manager.logger.Warn().Err(err).Msg("key up failed") - break + logger.Warn().Err(err).Uint32("key", payload.Key).Msg("key up failed") + } else { + logger.Trace().Uint32("key", payload.Key).Msg("key up") } - - manager.logger.Debug().Msgf("key up %d", payload.Key) case OP_BTN_DOWN: payload := &PayloadKey{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { @@ -106,11 +107,10 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { } if err := manager.desktop.ButtonDown(payload.Key); err != nil { - manager.logger.Warn().Err(err).Msg("button down failed") - break + logger.Warn().Err(err).Uint32("key", payload.Key).Msg("button down failed") + } else { + logger.Trace().Uint32("key", payload.Key).Msg("button down") } - - manager.logger.Debug().Msgf("button down %d", payload.Key) case OP_BTN_UP: payload := &PayloadKey{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { @@ -118,11 +118,10 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage) error { } if err := manager.desktop.ButtonUp(payload.Key); err != nil { - manager.logger.Warn().Err(err).Msg("button up failed") - break + logger.Warn().Err(err).Uint32("key", payload.Key).Msg("button up failed") + } else { + logger.Trace().Uint32("key", payload.Key).Msg("button up") } - - manager.logger.Debug().Msgf("button up %d", payload.Key) } return nil diff --git a/internal/webrtc/logger.go b/internal/webrtc/logger.go index 90c0d7e2..92f57a82 100644 --- a/internal/webrtc/logger.go +++ b/internal/webrtc/logger.go @@ -81,6 +81,6 @@ func (l loggerFactory) NewLogger(subsystem string) logging.LeveledLogger { return logger{ subsystem: subsystem, - logger: l.logger.With().Str("subsystem", subsystem).Logger(), + logger: l.logger.With().Str("submodule", "pion").Str("subsystem", subsystem).Logger(), } } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 0da67ed5..cbad880b 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -80,6 +80,8 @@ func (manager *WebRTCManagerCtx) Start() { audio.RemoveListener(&audioListener) } + manager.curImage.Start() + manager.logger.Info(). Bool("icelite", manager.config.ICELite). Bool("icetrickle", manager.config.ICETrickle). @@ -87,12 +89,10 @@ func (manager *WebRTCManagerCtx) Start() { Str("nat1to1", strings.Join(manager.config.NAT1To1IPs, ",")). Str("epr", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)). Msg("webrtc starting") - - manager.curImage.Start() } func (manager *WebRTCManagerCtx) Shutdown() error { - manager.logger.Info().Msgf("webrtc shutting down") + manager.logger.Info().Msg("webrtc shutdown") manager.curImage.Shutdown() manager.curPosition.Shutdown() @@ -106,7 +106,9 @@ func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { } func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) { + // add session id to logger context logger := manager.logger.With().Str("session_id", session.ID()).Logger() + logger.Info().Msg("creating webrtc peer") // Create MediaEngine engine, err := manager.mediaEngine(videoID) @@ -155,13 +157,13 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // create video track videoStream, ok := manager.capture.Video(videoID) if !ok { - manager.logger.Warn().Str("videoID", videoID).Msg("video stream not found") + logger.Warn().Str("video_id", videoID).Msg("video stream not found") return nil, err } videoTrack, err := webrtc.NewTrackLocalStaticSample(videoStream.Codec().Capability, "video", "stream") if err != nil { - manager.logger.Warn().Err(err).Msg("unable to create video track") + logger.Warn().Err(err).Msg("unable to create video track") return nil, err } @@ -171,7 +173,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // The peerConnection has been closed. return } - manager.logger.Warn().Err(err).Msg("video pipeline failed to write") + logger.Warn().Err(err).Msg("video pipeline failed to write") } } @@ -180,7 +182,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // should be stream started if videoStream.ListenersCount() == 0 { if err := videoStream.Start(); err != nil { - manager.logger.Warn().Err(err).Msg("unable to start video pipeline") + logger.Warn().Err(err).Msg("unable to start video pipeline") return nil, err } } @@ -239,6 +241,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } peer := &WebRTCPeerCtx{ + logger: logger, api: api, connection: connection, changeVideo: changeVideo, @@ -248,7 +251,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin cursorImage := func(entry *cursor.ImageEntry) { if err := peer.SendCursorImage(entry.Cursor, entry.Image); err != nil { - manager.logger.Warn().Err(err).Msg("could not send cursor image") + logger.Warn().Err(err).Msg("could not send cursor image") } } @@ -258,7 +261,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } if err := peer.SendCursorPosition(x, y); err != nil { - manager.logger.Warn().Err(err).Msg("could not send cursor position") + logger.Warn().Err(err).Msg("could not send cursor position") } } @@ -306,7 +309,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin if err == nil { cursorImage(entry) } else { - manager.logger.Warn().Err(err).Msg("failed to get cursor image") + logger.Warn().Err(err).Msg("failed to get cursor image") } // send initial cursor position @@ -324,7 +327,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return } - if err = manager.handle(message); err != nil { + if err = manager.handle(message, session); err != nil { logger.Warn().Err(err).Msg("data handle failed") } }) diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index dc212819..13047408 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -4,10 +4,12 @@ import ( "sync" "github.com/pion/webrtc/v3" + "github.com/rs/zerolog" ) type WebRTCPeerCtx struct { mu sync.Mutex + logger zerolog.Logger api *webrtc.API connection *webrtc.PeerConnection dataChannel *webrtc.DataChannel @@ -59,6 +61,7 @@ func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { peer.mu.Lock() defer peer.mu.Unlock() + peer.logger.Info().Str("video_id", videoID).Msg("change video id") return peer.changeVideo(videoID) } From a95a987fb6380f638904f8a76c227bde3cbdef1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 19:17:10 +0200 Subject: [PATCH 527/876] Destroy() does not return error. --- internal/session/manager.go | 10 +++------- internal/session/session.go | 16 ++++------------ internal/types/webrtc.go | 2 +- internal/types/websocket.go | 2 +- internal/utils/errors.go | 22 ---------------------- internal/webrtc/peer.go | 14 +++++++++++--- internal/websocket/manager.go | 6 ++---- internal/websocket/peer.go | 28 +++++++++++++++------------- 8 files changed, 37 insertions(+), 63 deletions(-) delete mode 100644 internal/utils/errors.go diff --git a/internal/session/manager.go b/internal/session/manager.go index 2e357e7e..a7fbe346 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -121,20 +121,16 @@ func (manager *SessionManagerCtx) Delete(id string) error { delete(manager.sessions, id) manager.sessionsMu.Unlock() - var errs []error if session.State().IsConnected { - err := session.GetWebSocketPeer().Destroy() - errs = append(errs, err) + session.GetWebSocketPeer().Destroy() } if session.State().IsWatching { - err := session.GetWebRTCPeer().Destroy() - errs = append(errs, err) + session.GetWebRTCPeer().Destroy() } manager.emmiter.Emit("deleted", session) - - return utils.ErrorsJoin(errs) + return nil } func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) { diff --git a/internal/session/session.go b/internal/session/session.go index 0b4dc8bf..b501fb63 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -31,15 +31,11 @@ func (session *SessionCtx) profileChanged() { } if (!session.profile.CanConnect || !session.profile.CanLogin || !session.profile.CanWatch) && session.state.IsWatching { - if err := session.webrtcPeer.Destroy(); err != nil { - session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") - } + session.webrtcPeer.Destroy() } if (!session.profile.CanConnect || !session.profile.CanLogin) && session.state.IsConnected { - if err := session.websocketPeer.Destroy(); err != nil { - session.logger.Warn().Err(err).Msgf("websocket destroy has failed") - } + session.websocketPeer.Destroy() } } @@ -57,9 +53,7 @@ func (session *SessionCtx) IsHost() bool { func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { if session.websocketPeer != nil { - if err := session.websocketPeer.Destroy(); err != nil { - session.logger.Warn().Err(err).Msgf("websocket destroy has failed") - } + session.websocketPeer.Destroy() } session.websocketPeer = websocketPeer @@ -99,9 +93,7 @@ func (session *SessionCtx) Send(v interface{}) error { func (session *SessionCtx) SetWebRTCPeer(webrtcPeer types.WebRTCPeer) { if session.webrtcPeer != nil { - if err := session.webrtcPeer.Destroy(); err != nil { - session.logger.Warn().Err(err).Msgf("webrtc destroy has failed") - } + session.webrtcPeer.Destroy() } session.webrtcPeer = webrtcPeer diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 4bf34915..45f84f13 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -26,7 +26,7 @@ type WebRTCPeer interface { SendCursorPosition(x, y int) error SendCursorImage(cur *CursorImage, img []byte) error - Destroy() error + Destroy() } type WebRTCManager interface { diff --git a/internal/types/websocket.go b/internal/types/websocket.go index 9953b598..c2789503 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -8,7 +8,7 @@ type CheckOrigin func(r *http.Request) bool type WebSocketPeer interface { Send(v interface{}) error - Destroy() error + Destroy() } type WebSocketManager interface { diff --git a/internal/utils/errors.go b/internal/utils/errors.go deleted file mode 100644 index 8f4aa691..00000000 --- a/internal/utils/errors.go +++ /dev/null @@ -1,22 +0,0 @@ -package utils - -import "fmt" - -func ErrorsJoin(errs []error) error { - var resErr error - - for _, err := range errs { - if err == nil { - continue - } - - if resErr == nil { - resErr = err - continue - } - - resErr = fmt.Errorf("%w; %s", resErr, err.Error()) - } - - return resErr -} diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 13047408..49c787fa 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -65,13 +65,21 @@ func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { return peer.changeVideo(videoID) } -func (peer *WebRTCPeerCtx) Destroy() error { +func (peer *WebRTCPeerCtx) Destroy() { peer.mu.Lock() defer peer.mu.Unlock() if peer.connection == nil || peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { - return nil + return } - return peer.connection.Close() + // TODO: Send webrtc disconnect event via websocket. + + if err := peer.connection.Close(); err != nil { + peer.logger.Warn().Err(err).Msg("peer connection destroyed with an error") + } else { + peer.logger.Info().Msg("peer connection destroyed") + } + + peer.connection = nil } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 0fa1d168..399c0c2a 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -236,10 +236,8 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque logger.Info().Msg("replacing peer connection") - // replace peer connection - if err := session.GetWebSocketPeer().Destroy(); err != nil { - logger.Warn().Err(err).Msg("previous connection closed with an error") - } + // destroy previous peer connection + session.GetWebSocketPeer().Destroy() } peer := &WebSocketPeerCtx{ diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index fc464b8a..7c6f5517 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -10,7 +10,6 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" ) type WebSocketPeerCtx struct { @@ -41,24 +40,27 @@ func (peer *WebSocketPeerCtx) Send(v interface{}) error { return peer.connection.WriteMessage(websocket.TextMessage, raw) } -func (peer *WebSocketPeerCtx) Destroy() error { +func (peer *WebSocketPeerCtx) Destroy() { + peer.mu.Lock() + defer peer.mu.Unlock() + if peer.connection == nil { - return nil + return } - var errs []error - - // send disconnect - err := peer.Send( + if err := peer.Send( message.SystemDisconnect{ Event: event.SYSTEM_DISCONNECT, Message: "connection destroyed", - }) - errs = append(errs, err) + }); err != nil { + peer.logger.Warn().Err(err).Msg("failed to send disconnect event") + } - // close connection - err = peer.connection.Close() - errs = append(errs, err) + if err := peer.connection.Close(); err != nil { + peer.logger.Warn().Err(err).Msg("peer connection destroyed with an error") + } else { + peer.logger.Info().Msg("peer connection destroyed") + } - return utils.ErrorsJoin(errs) + peer.connection = nil } From 47d0359106f59d18710906f2b286c99b5d0ac11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 19:28:01 +0200 Subject: [PATCH 528/876] remove unknown message from handler. --- internal/websocket/handler/handler.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 2b849c22..b691411a 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -114,7 +114,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { return h.sendBroadcast(session, payload) }) default: - logger.Warn().Str("event", header.Event).Msg("unknown message event") return false } From c82a083fb6bea6698e514be6a21bfbe35bb73652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 23:00:51 +0200 Subject: [PATCH 529/876] use websocket message. --- internal/types/message/messages.go | 5 ---- internal/types/websocket.go | 12 +++++++-- internal/websocket/handler/handler.go | 39 ++++++++++++--------------- internal/websocket/manager.go | 19 ++++++++++--- 4 files changed, 42 insertions(+), 33 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index d40f9af4..9cfaec79 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -6,11 +6,6 @@ import ( "demodesk/neko/internal/types" ) -type Message struct { - Event string `json:"event"` - Payload interface{} `json:"payload"` // TODO: New. -} - ///////////////////////////// // System ///////////////////////////// diff --git a/internal/types/websocket.go b/internal/types/websocket.go index c2789503..a6b9cf5a 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -1,8 +1,16 @@ package types -import "net/http" +import ( + "encoding/json" + "net/http" +) -type HandlerFunction func(Session, []byte) bool +type WebSocketMessage struct { + Event string `json:"event"` + Payload json.RawMessage `json:"payload"` +} + +type HandlerFunction func(Session, WebSocketMessage) bool type CheckOrigin func(r *http.Request) bool diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index b691411a..cc6f2e8d 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -1,8 +1,6 @@ package handler import ( - "encoding/json" - "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -35,38 +33,35 @@ type MessageHandlerCtx struct { capture types.CaptureManager } -func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - - header := message.Message{} - if err := json.Unmarshal(raw, &header); err != nil { - logger.Error().Err(err).Msg("message parsing has failed") - return false - } +func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketMessage) bool { + logger := h.logger.With(). + Str("event", data.Event). + Str("session_id", session.ID()). + Logger() var err error - switch header.Event { + switch data.Event { // Signal Events case event.SIGNAL_REQUEST: payload := &message.SignalVideo{} - err = utils.Unmarshal(payload, raw, func() error { + err = utils.Unmarshal(payload, data.Payload, func() error { return h.signalRequest(session, payload) }) case event.SIGNAL_RESTART: err = h.signalRestart(session) case event.SIGNAL_ANSWER: payload := &message.SignalAnswer{} - err = utils.Unmarshal(payload, raw, func() error { + err = utils.Unmarshal(payload, data.Payload, func() error { return h.signalAnswer(session, payload) }) case event.SIGNAL_CANDIDATE: payload := &message.SignalCandidate{} - err = utils.Unmarshal(payload, raw, func() error { + err = utils.Unmarshal(payload, data.Payload, func() error { return h.signalCandidate(session, payload) }) case event.SIGNAL_VIDEO: payload := &message.SignalVideo{} - err = utils.Unmarshal(payload, raw, func() error { + err = utils.Unmarshal(payload, data.Payload, func() error { return h.signalVideo(session, payload) }) @@ -79,38 +74,38 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { // Screen Events case event.SCREEN_SET: payload := &message.ScreenSize{} - err = utils.Unmarshal(payload, raw, func() error { + err = utils.Unmarshal(payload, data.Payload, func() error { return h.screenSet(session, payload) }) // Clipboard Events case event.CLIPBOARD_SET: payload := &message.ClipboardData{} - err = utils.Unmarshal(payload, raw, func() error { + err = utils.Unmarshal(payload, data.Payload, func() error { return h.clipboardSet(session, payload) }) // Keyboard Events case event.KEYBOARD_MAP: payload := &message.KeyboardMap{} - err = utils.Unmarshal(payload, raw, func() error { + err = utils.Unmarshal(payload, data.Payload, func() error { return h.keyboardMap(session, payload) }) case event.KEYBOARD_MODIFIERS: payload := &message.KeyboardModifiers{} - err = utils.Unmarshal(payload, raw, func() error { + err = utils.Unmarshal(payload, data.Payload, func() error { return h.keyboardModifiers(session, payload) }) // Send Events case event.SEND_UNICAST: payload := &message.SendUnicast{} - err = utils.Unmarshal(payload, raw, func() error { + err = utils.Unmarshal(payload, data.Payload, func() error { return h.sendUnicast(session, payload) }) case event.SEND_BROADCAST: payload := &message.SendBroadcast{} - err = utils.Unmarshal(payload, raw, func() error { + err = utils.Unmarshal(payload, data.Payload, func() error { return h.sendBroadcast(session, payload) }) default: @@ -118,7 +113,7 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool { } if err != nil { - logger.Error().Err(err).Str("event", header.Event).Msg("message handler has failed") + logger.Error().Err(err).Msg("message handler has failed") } return true diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 399c0c2a..9983d1b4 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -1,6 +1,7 @@ package websocket import ( + "encoding/json" "net/http" "time" @@ -296,22 +297,32 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t for { select { case raw := <-bytes: + data := types.WebSocketMessage{} + if err := json.Unmarshal(raw, &data); err != nil { + logger.Error().Err(err).Msg("message parsing has failed") + break + } + + // TODO: Switch to payload based messages. + data.Payload = raw + logger.Debug(). Str("address", connection.RemoteAddr().String()). - Str("raw", string(raw)). + Str("event", data.Event). + Str("payload", string(data.Payload)). Msg("received message from client") - handled := manager.handler.Message(session, raw) + handled := manager.handler.Message(session, data) for _, handler := range manager.handlers { if handled { break } - handled = handler(session, raw) + handled = handler(session, data) } if !handled { - logger.Warn().Msg("unhandled message") + logger.Warn().Str("event", data.Event).Msg("unhandled message") } case <-cancel: return From 402b8f1a0877abcc073bedd69e472a19902a42a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 23:01:51 +0200 Subject: [PATCH 530/876] rename WebSocket handler. --- internal/types/websocket.go | 4 ++-- internal/websocket/manager.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/types/websocket.go b/internal/types/websocket.go index a6b9cf5a..2eea24aa 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -10,7 +10,7 @@ type WebSocketMessage struct { Payload json.RawMessage `json:"payload"` } -type HandlerFunction func(Session, WebSocketMessage) bool +type WebSocketHandler func(Session, WebSocketMessage) bool type CheckOrigin func(r *http.Request) bool @@ -22,6 +22,6 @@ type WebSocketPeer interface { type WebSocketManager interface { Start() Shutdown() error - AddHandler(handler HandlerFunction) + AddHandler(handler WebSocketHandler) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin CheckOrigin) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 9983d1b4..93e30719 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -28,7 +28,7 @@ func New( sessions: sessions, desktop: desktop, handler: handler.New(sessions, desktop, capture, webrtc), - handlers: []types.HandlerFunction{}, + handlers: []types.WebSocketHandler{}, } } @@ -40,7 +40,7 @@ type WebSocketManagerCtx struct { sessions types.SessionManager desktop types.DesktopManager handler *handler.MessageHandlerCtx - handlers []types.HandlerFunction + handlers []types.WebSocketHandler } func (manager *WebSocketManagerCtx) Start() { @@ -156,7 +156,7 @@ func (manager *WebSocketManagerCtx) Shutdown() error { return nil } -func (manager *WebSocketManagerCtx) AddHandler(handler types.HandlerFunction) { +func (manager *WebSocketManagerCtx) AddHandler(handler types.WebSocketHandler) { manager.handlers = append(manager.handlers, handler) } From 6a32dbadf43a9e2ac6f324b89a414dfbfaed1986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 29 Aug 2021 23:03:04 +0200 Subject: [PATCH 531/876] updated websocket logging. --- internal/websocket/manager.go | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 93e30719..6fddf0cf 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -90,7 +90,7 @@ func (manager *WebSocketManagerCtx) Start() { if err := manager.handler.SessionProfileChanged(session); err != nil { logger.Warn().Err(err).Msg("session profile changed with an error") } else { - logger.Debug().Msg("session profile changed") + logger.Debug().Interface("profile", session.Profile()).Msg("session profile changed") } }) @@ -100,7 +100,7 @@ func (manager *WebSocketManagerCtx) Start() { if err := manager.handler.SessionStateChanged(session); err != nil { logger.Warn().Err(err).Msg("session state changed with an error") } else { - logger.Debug().Msg("session state changed") + logger.Debug().Interface("state", session.State()).Msg("session state changed") } }) @@ -161,7 +161,13 @@ func (manager *WebSocketManagerCtx) AddHandler(handler types.WebSocketHandler) { } func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin types.CheckOrigin) { - manager.logger.Debug().Msg("attempting to upgrade connection") + // add request data to logger context + logger := manager.logger.With(). + Str("address", r.RemoteAddr). + Str("agent", r.UserAgent()). + Logger() + + logger.Debug().Msg("attempting to upgrade connection") upgrader := websocket.Upgrader{ CheckOrigin: checkOrigin, @@ -169,13 +175,13 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque connection, err := upgrader.Upgrade(w, r, nil) if err != nil { - manager.logger.Error().Err(err).Msg("failed to upgrade connection") + logger.Error().Err(err).Msg("failed to upgrade connection") return } session, err := manager.sessions.Authenticate(r) if err != nil { - manager.logger.Debug().Err(err).Msg("authentication failed") + logger.Debug().Err(err).Msg("authentication failed") // TODO: Refactor, return error code. if err = connection.WriteJSON( @@ -183,18 +189,18 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque Event: event.SYSTEM_DISCONNECT, Message: err.Error(), }); err != nil { - manager.logger.Error().Err(err).Msg("failed to send disconnect event") + logger.Error().Err(err).Msg("failed to send disconnect event") } if err := connection.Close(); err != nil { - manager.logger.Warn().Err(err).Msg("connection closed with an error") + logger.Warn().Err(err).Msg("connection closed with an error") } return } - // add session id to logger context - logger := manager.logger.With().Str("session_id", session.ID()).Logger() + // use session id with defeault logger context + logger = manager.logger.With().Str("session_id", session.ID()).Logger() if !session.Profile().CanConnect { logger.Debug().Msg("connection disabled") @@ -251,6 +257,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque logger.Info(). Str("address", connection.RemoteAddr().String()). + Str("agent", r.UserAgent()). Msg("connection started") session.SetWebSocketConnected(peer, true) @@ -258,6 +265,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque defer func() { logger.Info(). Str("address", connection.RemoteAddr().String()). + Str("agent", r.UserAgent()). Msg("connection ended") session.SetWebSocketConnected(peer, false) From f763c810cc8226d799a87d01568193c8bb648876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 31 Aug 2021 18:42:06 +0200 Subject: [PATCH 532/876] bump golang version to 1.16. --- .devcontainer/devcontainer.json | 2 +- Dockerfile | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 90b40ad0..118a1889 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,7 +7,7 @@ "context": "../", "args": { // Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.15 - "VARIANT": "1.16", + "VARIANT": "1.17", // Options "INSTALL_NODE": "false", "NODE_VERSION": "lts/*" diff --git a/Dockerfile b/Dockerfile index 6176a418..b9d29ede 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Stage 1: Build. # -FROM golang:1.16-buster as build +FROM golang:1.17-buster as build WORKDIR /src # diff --git a/go.mod b/go.mod index 10763b58..a3c2eb17 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module demodesk/neko -go 1.16 +go 1.17 require ( github.com/PaesslerAG/gval v1.1.1 From 2be75421ea08dc04e0eb0effffb2ab20e7e39a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Sep 2021 19:45:21 +0200 Subject: [PATCH 533/876] go mod tidy. --- go.mod | 47 ++++++++++++++++++++++++++++++++++++++--------- go.sum | 39 +++++++++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index a3c2eb17..738feb00 100644 --- a/go.mod +++ b/go.mod @@ -8,18 +8,47 @@ require ( github.com/go-chi/cors v1.2.0 github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 - github.com/pion/ice/v2 v2.1.12 // indirect github.com/pion/interceptor v0.0.15 github.com/pion/logging v0.2.2 - github.com/pion/rtp v1.7.1 // indirect - github.com/pion/srtp/v2 v2.0.5 // indirect github.com/pion/webrtc/v3 v3.0.32 - github.com/rs/zerolog v1.23.0 - github.com/spf13/cast v1.4.0 // indirect + github.com/rs/zerolog v1.24.0 github.com/spf13/cobra v1.2.1 github.com/spf13/viper v1.8.1 - golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e // indirect - golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect - golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect - golang.org/x/text v0.3.7 // indirect +) + +require ( + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect + github.com/pion/datachannel v1.4.21 // indirect + github.com/pion/dtls/v2 v2.0.9 // indirect + github.com/pion/ice/v2 v2.1.12 // indirect + github.com/pion/mdns v0.0.5 // indirect + github.com/pion/randutil v0.1.0 // indirect + github.com/pion/rtcp v1.2.6 // indirect + github.com/pion/rtp v1.7.2 // indirect + github.com/pion/sctp v1.7.12 // indirect + github.com/pion/sdp/v3 v3.0.4 // indirect + github.com/pion/srtp/v2 v2.0.5 // indirect + github.com/pion/stun v0.3.5 // indirect + github.com/pion/transport v0.12.3 // indirect + github.com/pion/turn/v2 v2.0.5 // indirect + github.com/pion/udp v0.1.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/cast v1.4.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect + golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gopkg.in/ini.v1 v1.62.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 2be8fa7b..ae7f167c 100644 --- a/go.sum +++ b/go.sum @@ -74,6 +74,8 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= @@ -227,6 +229,7 @@ github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXm github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= github.com/pion/dtls/v2 v2.0.9 h1:7Ow+V++YSZQMYzggI0P9vLJz/hUFcffsfGMfT/Qy+u8= github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho= +github.com/pion/ice/v2 v2.1.10 h1:Jt/BfUsaP+Dr6E5rbsy+w7w1JtHyFN0w2DkgfWq7Fko= github.com/pion/ice/v2 v2.1.10/go.mod h1:kV4EODVD5ux2z8XncbLHIOtcXKtYXVgLVCeVqnpoeP0= github.com/pion/ice/v2 v2.1.12 h1:ZDBuZz+fEI7iDifZCYFVzI4p0Foy0YhdSSZ87ZtRcRE= github.com/pion/ice/v2 v2.1.12/go.mod h1:ovgYHUmwYLlRvcCLI67PnQ5YGe+upXZbGgllBDG/ktU= @@ -243,14 +246,16 @@ github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo= github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/rtp v1.6.5/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.7.0 h1:UTiTgxegU97lq6oDCyBOMjR8+iZr68KN0+rBzWYEWg0= github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.7.1 h1:hCaxfVgPGt13eF/Tu9RhVn04c+dAcRZmhdDWqUE13oY= -github.com/pion/rtp v1.7.1/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.7.2 h1:HCDKDCixh7PVjkQTsqHAbk1lg+bx059EHxcnyl42dYs= +github.com/pion/rtp v1.7.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= github.com/pion/sctp v1.7.12 h1:GsatLufywVruXbZZT1CKg+Jr8ZTkwiPnmUC/oO9+uuY= github.com/pion/sctp v1.7.12/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8= github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= +github.com/pion/srtp/v2 v2.0.2 h1:664iGzVmaY7KYS5M0gleY0DscRo9ReDfTxQrq4UgGoU= github.com/pion/srtp/v2 v2.0.2/go.mod h1:VEyLv4CuxrwGY8cxM+Ng3bmVy8ckz/1t6A0q/msKOw0= github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ= github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A= @@ -276,9 +281,9 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.23.0 h1:UskrK+saS9P9Y789yNNulYKdARjPZuS35B8gJF2x60g= -github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo= +github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.24.0 h1:76ivFxmVSRs1u2wUwJVg5VZDYQgeH1JpoS6ndgr9Wy8= +github.com/rs/zerolog v1.24.0/go.mod h1:7KHcEGe0QZPOm2IE4Kpb5rTh6n1h2hIgS5OOnu1rUaI= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= @@ -290,9 +295,10 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.0 h1:WhlbjwB9EGCc8W5Rxdkus+wmH2ASRwwTJk6tgHKwdqQ= -github.com/spf13/cast v1.4.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= @@ -336,9 +342,10 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e h1:VvfwVmMH40bpMeizC9/K7ipM5Qjucuu16RWfneFPyhQ= -golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -415,10 +422,11 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw= +golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -487,10 +495,11 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -499,6 +508,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -557,6 +567,7 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 4341257f14cb9045521d0b484bfa93c3bfd7a2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Sep 2021 19:45:58 +0200 Subject: [PATCH 534/876] bump to debian 11. --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b9d29ede..26390e79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Stage 1: Build. # -FROM golang:1.17-buster as build +FROM golang:1.17-bullseye as build WORKDIR /src # @@ -37,7 +37,7 @@ RUN go get -v -t -d . && go build \ # # Stage 2: Runtime. # -FROM debian:buster-slim as runtime +FROM debian:bullseye-slim as runtime # # set custom user @@ -52,8 +52,8 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ wget ca-certificates supervisor \ - pulseaudio dbus-x11 xserver-xorg-video-dummy xserver-xorg-input-void \ - libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx5 \ + pulseaudio dbus-x11 xserver-xorg-video-dummy \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ # # file chooser handler, clipboard xdotool xclip \ From 5b5e541cc00bd28a829286e611c36052ee440e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Sep 2021 21:11:07 +0200 Subject: [PATCH 535/876] websocket peer add event. --- internal/types/websocket.go | 2 +- internal/websocket/manager.go | 5 +---- internal/websocket/peer.go | 32 ++++++++++++++++++++------------ 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/internal/types/websocket.go b/internal/types/websocket.go index 2eea24aa..6bdf0a3c 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -15,7 +15,7 @@ type WebSocketHandler func(Session, WebSocketMessage) bool type CheckOrigin func(r *http.Request) bool type WebSocketPeer interface { - Send(v interface{}) error + Send(event string, payload interface{}) Destroy() } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 6fddf0cf..5686e2de 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -307,13 +307,10 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t case raw := <-bytes: data := types.WebSocketMessage{} if err := json.Unmarshal(raw, &data); err != nil { - logger.Error().Err(err).Msg("message parsing has failed") + logger.Error().Err(err).Msg("message unmarshalling has failed") break } - // TODO: Switch to payload based messages. - data.Payload = raw - logger.Debug(). Str("address", connection.RemoteAddr().String()). Str("event", data.Event). diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 7c6f5517..c182b5d8 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -19,25 +19,35 @@ type WebSocketPeerCtx struct { connection *websocket.Conn } -func (peer *WebSocketPeerCtx) Send(v interface{}) error { +func (peer *WebSocketPeerCtx) Send(event string, payload interface{}) { peer.mu.Lock() defer peer.mu.Unlock() if peer.connection == nil { - return nil + return } - raw, err := json.Marshal(v) + raw, err := json.Marshal(payload) if err != nil { - return err + peer.logger.Error().Err(err).Str("event", event).Msg("message marshalling has failed") + return + } + + err = peer.connection.WriteJSON(types.WebSocketMessage{ + Event: event, + Payload: raw, + }) + + if err != nil { + peer.logger.Error().Err(err).Str("event", event).Msg("send message error") + return } peer.logger.Debug(). Str("address", peer.connection.RemoteAddr().String()). - Str("raw", string(raw)). + Str("event", event). + Str("payload", string(raw)). Msg("sending message to client") - - return peer.connection.WriteMessage(websocket.TextMessage, raw) } func (peer *WebSocketPeerCtx) Destroy() { @@ -48,13 +58,11 @@ func (peer *WebSocketPeerCtx) Destroy() { return } - if err := peer.Send( + peer.Send( + event.SYSTEM_DISCONNECT, message.SystemDisconnect{ - Event: event.SYSTEM_DISCONNECT, Message: "connection destroyed", - }); err != nil { - peer.logger.Warn().Err(err).Msg("failed to send disconnect event") - } + }) if err := peer.connection.Close(); err != nil { peer.logger.Warn().Err(err).Msg("peer connection destroyed with an error") From 3ac1b481ad7dc7db5cc6e751d05558c4d01b84f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Sep 2021 21:16:36 +0200 Subject: [PATCH 536/876] session websocket add event. --- internal/session/manager.go | 12 ++++-------- internal/session/session.go | 6 +++--- internal/types/session.go | 6 +++--- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index a7fbe346..97c70b2b 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -197,7 +197,7 @@ func (manager *SessionManagerCtx) ClearHost() { // broadcasts // --- -func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) { +func (manager *SessionManagerCtx) Broadcast(event string, payload interface{}, exclude interface{}) { manager.sessionsMu.Lock() defer manager.sessionsMu.Unlock() @@ -212,13 +212,11 @@ func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{}) } } - if err := session.Send(v); err != nil { - manager.logger.Warn().Err(err).Msgf("broadcasting event has failed") - } + session.Send(event, payload) } } -func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interface{}) { +func (manager *SessionManagerCtx) AdminBroadcast(event string, payload interface{}, exclude interface{}) { manager.sessionsMu.Lock() defer manager.sessionsMu.Unlock() @@ -233,9 +231,7 @@ func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interfac } } - if err := session.Send(v); err != nil { - manager.logger.Warn().Err(err).Msgf("broadcasting admin event has failed") - } + session.Send(event, payload) } } diff --git a/internal/session/session.go b/internal/session/session.go index b501fb63..41ac12ff 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -79,12 +79,12 @@ func (session *SessionCtx) GetWebSocketPeer() types.WebSocketPeer { return session.websocketPeer } -func (session *SessionCtx) Send(v interface{}) error { +func (session *SessionCtx) Send(event string, payload interface{}) { if session.websocketPeer == nil { - return nil + return } - return session.websocketPeer.Send(v) + session.websocketPeer.Send(event, payload) } // --- diff --git a/internal/types/session.go b/internal/types/session.go index d243ec51..045daf84 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -27,7 +27,7 @@ type Session interface { SetWebSocketPeer(websocketPeer WebSocketPeer) SetWebSocketConnected(websocketPeer WebSocketPeer, connected bool) GetWebSocketPeer() WebSocketPeer - Send(v interface{}) error + Send(event string, payload interface{}) // webrtc SetWebRTCPeer(webrtcPeer WebRTCPeer) @@ -47,8 +47,8 @@ type SessionManager interface { GetHost() Session ClearHost() - Broadcast(v interface{}, exclude interface{}) - AdminBroadcast(v interface{}, exclude interface{}) + Broadcast(event string, payload interface{}, exclude interface{}) + AdminBroadcast(event string, payload interface{}, exclude interface{}) OnCreated(listener func(session Session)) OnDeleted(listener func(session Session)) From 49c48b32000c31c5606f65fe6314197fca567fb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Sep 2021 21:58:39 +0200 Subject: [PATCH 537/876] remove event from messages. --- internal/api/room/broadcast.go | 4 +- internal/api/room/screen.go | 2 +- internal/types/message/messages.go | 59 ++++-------- internal/webrtc/manager.go | 11 +-- internal/websocket/filechooserdialog.go | 31 +++---- internal/websocket/handler/control.go | 6 +- internal/websocket/handler/screen.go | 2 +- internal/websocket/handler/send.go | 36 ++++---- internal/websocket/handler/session.go | 18 ++-- internal/websocket/handler/signal.go | 22 +++-- internal/websocket/handler/system.go | 12 ++- internal/websocket/manager.go | 114 +++++++++++------------- 12 files changed, 144 insertions(+), 173 deletions(-) diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index d7665663..d0639770 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -44,8 +44,8 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { } h.sessions.AdminBroadcast( + event.BORADCAST_STATUS, message.BroadcastStatus{ - Event: event.BORADCAST_STATUS, IsActive: broadcast.Started(), URL: broadcast.Url(), }, nil) @@ -63,8 +63,8 @@ func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { broadcast.Stop() h.sessions.AdminBroadcast( + event.BORADCAST_STATUS, message.BroadcastStatus{ - Event: event.BORADCAST_STATUS, IsActive: broadcast.Started(), URL: broadcast.Url(), }, nil) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index ba70fa1b..b58b8948 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -47,8 +47,8 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R } h.sessions.Broadcast( + event.SCREEN_UPDATED, message.ScreenSize{ - Event: event.SCREEN_UPDATED, Width: data.Width, Height: data.Height, Rate: data.Rate, diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 9cfaec79..0649dd7d 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -11,12 +11,10 @@ import ( ///////////////////////////// type SystemWebRTC struct { - Event string `json:"event,omitempty"` Videos []string `json:"videos"` } type SystemInit struct { - Event string `json:"event,omitempty"` SessionId string `json:"session_id"` ControlHost ControlHost `json:"control_host"` ScreenSize ScreenSize `json:"screen_size"` @@ -27,13 +25,11 @@ type SystemInit struct { } type SystemAdmin struct { - Event string `json:"event,omitempty"` ScreenSizesList []ScreenSize `json:"screen_sizes_list"` BroadcastStatus BroadcastStatus `json:"broadcast_status"` } type SystemDisconnect struct { - Event string `json:"event,omitempty"` Message string `json:"message"` } @@ -42,24 +38,20 @@ type SystemDisconnect struct { ///////////////////////////// type SignalProvide struct { - Event string `json:"event,omitempty"` SDP string `json:"sdp"` ICEServers []types.ICEServer `json:"iceservers"` Video string `json:"video"` } type SignalCandidate struct { - Event string `json:"event,omitempty"` - *webrtc.ICECandidateInit + webrtc.ICECandidateInit } type SignalAnswer struct { - Event string `json:"event,omitempty"` - SDP string `json:"sdp"` + SDP string `json:"sdp"` } type SignalVideo struct { - Event string `json:"event,omitempty"` Video string `json:"video"` } @@ -68,24 +60,20 @@ type SignalVideo struct { ///////////////////////////// type SessionID struct { - Event string `json:"event,omitempty"` - ID string `json:"id"` + ID string `json:"id"` } type MemberProfile struct { - Event string `json:"event,omitempty"` - ID string `json:"id"` - *types.MemberProfile + ID string `json:"id"` + types.MemberProfile } type SessionState struct { - Event string `json:"event,omitempty"` - ID string `json:"id"` - *types.SessionState + ID string `json:"id"` + types.SessionState } type SessionData struct { - Event string `json:"event,omitempty"` ID string `json:"id"` Profile types.MemberProfile `json:"profile"` State types.SessionState `json:"state"` @@ -96,29 +84,25 @@ type SessionData struct { ///////////////////////////// type ControlHost struct { - Event string `json:"event,omitempty"` HasHost bool `json:"has_host"` HostID string `json:"host_id,omitempty"` } // TODO: New. type ControlMove struct { - Event string `json:"event,omitempty"` - X uint16 `json:"x"` - Y uint16 `json:"y"` + X uint16 `json:"x"` + Y uint16 `json:"y"` } // TODO: New. type ControlScroll struct { - Event string `json:"event,omitempty"` - X int16 `json:"x"` - Y int16 `json:"y"` + X int16 `json:"x"` + Y int16 `json:"y"` } // TODO: New. type ControlKey struct { - Event string `json:"event,omitempty"` - Key uint32 `json:"key"` + Key uint32 `json:"key"` } ///////////////////////////// @@ -126,10 +110,9 @@ type ControlKey struct { ///////////////////////////// type ScreenSize struct { - Event string `json:"event,omitempty"` - Width int `json:"width"` - Height int `json:"height"` - Rate int16 `json:"rate"` + Width int `json:"width"` + Height int `json:"height"` + Rate int16 `json:"rate"` } ///////////////////////////// @@ -137,8 +120,7 @@ type ScreenSize struct { ///////////////////////////// type ClipboardData struct { - Event string `json:"event,omitempty"` - Text string `json:"text"` + Text string `json:"text"` } ///////////////////////////// @@ -146,15 +128,13 @@ type ClipboardData struct { ///////////////////////////// type KeyboardMap struct { - Event string `json:"event,omitempty"` Layout string `json:"layout"` Variant string `json:"variant"` } type KeyboardModifiers struct { - Event string `json:"event,omitempty"` - CapsLock *bool `json:"capslock"` - NumLock *bool `json:"numlock"` + CapsLock *bool `json:"capslock"` + NumLock *bool `json:"numlock"` } ///////////////////////////// @@ -162,7 +142,6 @@ type KeyboardModifiers struct { ///////////////////////////// type BroadcastStatus struct { - Event string `json:"event,omitempty"` IsActive bool `json:"is_active"` URL string `json:"url,omitempty"` } @@ -172,7 +151,6 @@ type BroadcastStatus struct { ///////////////////////////// type SendUnicast struct { - Event string `json:"event,omitempty"` Sender string `json:"sender"` Receiver string `json:"receiver"` Subject string `json:"subject"` @@ -180,7 +158,6 @@ type SendUnicast struct { } type SendBroadcast struct { - Event string `json:"event,omitempty"` Sender string `json:"sender"` Subject string `json:"subject"` Body interface{} `json:"body"` diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index cbad880b..efff4f7a 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -141,16 +141,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return } - ICECandidateInit := candidate.ToJSON() - err := session.Send( + session.Send( + event.SIGNAL_CANDIDATE, message.SignalCandidate{ - Event: event.SIGNAL_CANDIDATE, - ICECandidateInit: &ICECandidateInit, + ICECandidateInit: candidate.ToJSON(), }) - - if err != nil { - logger.Warn().Err(err).Msg("sending ice candidate failed") - } }) } diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index 9791ea4f..e753e786 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -22,10 +22,11 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { activeSession = host - go manager.sessions.Broadcast(message.SessionID{ - Event: event.FILE_CHOOSER_DIALOG_OPENED, - ID: host.ID(), - }, nil) + go manager.sessions.Broadcast( + event.FILE_CHOOSER_DIALOG_OPENED, + message.SessionID{ + ID: host.ID(), + }, nil) }) // when dialog closes, everyone should be notified. @@ -34,9 +35,9 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { activeSession = nil - go manager.sessions.Broadcast(message.SessionID{ - Event: event.FILE_CHOOSER_DIALOG_CLOSED, - }, nil) + go manager.sessions.Broadcast( + event.FILE_CHOOSER_DIALOG_CLOSED, + message.SessionID{}, nil) }) // when new user joins, and someone holds dialog, he shouldd be notified about it. @@ -45,17 +46,13 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { return } - logger := manager.logger.With().Str("session_id", session.ID()).Logger() - logger.Debug().Msg("sending file chooser dialog status to a new session") + manager.logger.Debug().Str("session_id", session.ID()).Msg("sending file chooser dialog status to a new session") - if err := session.Send(message.SessionID{ - Event: event.FILE_CHOOSER_DIALOG_OPENED, - ID: activeSession.ID(), - }); err != nil { - logger.Warn().Err(err). - Str("event", event.FILE_CHOOSER_DIALOG_OPENED). - Msg("could not send event") - } + session.Send( + event.FILE_CHOOSER_DIALOG_OPENED, + message.SessionID{ + ID: activeSession.ID(), + }) }) // when user, that holds dialog, disconnects, it should be closed. diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 14cc03b2..71c0f21a 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -41,12 +41,14 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { if !h.sessions.ImplicitHosting() { // tell session if there is a host if host := h.sessions.GetHost(); host != nil { - return session.Send( + session.Send( + event.CONTROL_HOST, message.ControlHost{ - Event: event.CONTROL_HOST, HasHost: true, HostID: host.ID(), }) + + return nil } } diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 07a6fc2c..4ae16230 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -23,8 +23,8 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc } h.sessions.Broadcast( + event.SCREEN_UPDATED, message.ScreenSize{ - Event: event.SCREEN_UPDATED, Width: payload.Width, Height: payload.Height, Rate: payload.Rate, diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index 73eac541..5a8be5af 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -15,22 +15,26 @@ func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message. return nil } - return receiver.Send(message.SendUnicast{ - Event: event.SEND_UNICAST, - Sender: session.ID(), - Receiver: receiver.ID(), - Subject: payload.Subject, - Body: payload.Body, - }) -} - -func (h *MessageHandlerCtx) sendBroadcast(session types.Session, payload *message.SendBroadcast) error { - h.sessions.Broadcast(message.SendBroadcast{ - Event: event.SEND_BROADCAST, - Sender: session.ID(), - Subject: payload.Subject, - Body: payload.Body, - }, []string{session.ID()}) + receiver.Send( + event.SEND_UNICAST, + message.SendUnicast{ + Sender: session.ID(), + Receiver: receiver.ID(), + Subject: payload.Subject, + Body: payload.Body, + }) + + return nil +} + +func (h *MessageHandlerCtx) sendBroadcast(session types.Session, payload *message.SendBroadcast) error { + h.sessions.Broadcast( + event.SEND_BROADCAST, + message.SendBroadcast{ + Sender: session.ID(), + Subject: payload.Subject, + Body: payload.Body, + }, []string{session.ID()}) return nil } diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index f50d69f5..1d05dcc7 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -8,8 +8,8 @@ import ( func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { h.sessions.Broadcast( + event.SESSION_CREATED, message.SessionData{ - Event: event.SESSION_CREATED, ID: session.ID(), Profile: session.Profile(), State: session.State(), @@ -20,9 +20,9 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { func (h *MessageHandlerCtx) SessionDeleted(session types.Session) error { h.sessions.Broadcast( + event.SESSION_DELETED, message.SessionID{ - Event: event.SESSION_DELETED, - ID: session.ID(), + ID: session.ID(), }, nil) return nil @@ -53,26 +53,22 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error { } func (h *MessageHandlerCtx) SessionProfileChanged(session types.Session) error { - profile := session.Profile() - h.sessions.Broadcast( + event.SESSION_PROFILE, message.MemberProfile{ - Event: event.SESSION_PROFILE, ID: session.ID(), - MemberProfile: &profile, + MemberProfile: session.Profile(), }, nil) return nil } func (h *MessageHandlerCtx) SessionStateChanged(session types.Session) error { - state := session.State() - h.sessions.Broadcast( + event.SESSION_STATE, message.SessionState{ - Event: event.SESSION_STATE, ID: session.ID(), - SessionState: &state, + SessionState: session.State(), }, nil) return nil diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index e32becd0..0e48b1f3 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -25,13 +25,15 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag return err } - return session.Send( + session.Send( + event.SIGNAL_PROVIDE, message.SignalProvide{ - Event: event.SIGNAL_PROVIDE, SDP: offer.SDP, ICEServers: h.webrtc.ICEServers(), Video: payload.Video, }) + + return nil } func (h *MessageHandlerCtx) signalRestart(session types.Session) error { @@ -48,11 +50,13 @@ func (h *MessageHandlerCtx) signalRestart(session types.Session) error { return err } - return session.Send( + session.Send( + event.SIGNAL_RESTART, message.SignalAnswer{ - Event: event.SIGNAL_RESTART, - SDP: offer.SDP, + SDP: offer.SDP, }) + + return nil } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { @@ -76,7 +80,7 @@ func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *mess return nil } - return peer.SignalCandidate(*payload.ICECandidateInit) + return peer.SignalCandidate(payload.ICECandidateInit) } func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message.SignalVideo) error { @@ -93,9 +97,11 @@ func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message. return err } - return session.Send( + session.Send( + event.SIGNAL_VIDEO, message.SignalVideo{ - Event: event.SIGNAL_VIDEO, Video: payload.Video, }) + + return nil } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 59c2a63a..8f2d1a01 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -33,9 +33,9 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { } } - return session.Send( + session.Send( + event.SYSTEM_INIT, message.SystemInit{ - Event: event.SYSTEM_INIT, SessionId: session.ID(), ControlHost: controlHost, ScreenSize: message.ScreenSize{ @@ -50,6 +50,8 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { Videos: h.capture.VideoIDs(), }, }) + + return nil } func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { @@ -65,13 +67,15 @@ func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { } broadcast := h.capture.Broadcast() - return session.Send( + session.Send( + event.SYSTEM_ADMIN, message.SystemAdmin{ - Event: event.SYSTEM_ADMIN, ScreenSizesList: screenSizesList, BroadcastStatus: message.BroadcastStatus{ IsActive: broadcast.Started(), URL: broadcast.Url(), }, }) + + return nil } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 5686e2de..a81d1170 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -105,20 +105,19 @@ func (manager *WebSocketManagerCtx) Start() { }) manager.sessions.OnHostChanged(func(session types.Session) { - msg := message.ControlHost{ - Event: event.CONTROL_HOST, + payload := message.ControlHost{ HasHost: session != nil, } - if msg.HasHost { - msg.HostID = session.ID() + if payload.HasHost { + payload.HostID = session.ID() } - manager.sessions.Broadcast(msg, nil) + manager.sessions.Broadcast(event.CONTROL_HOST, payload, nil) manager.logger.Debug(). - Bool("has_host", msg.HasHost). - Str("host_id", msg.HostID). + Bool("has_host", payload.HasHost). + Str("host_id", payload.HostID). Msg("session host changed") }) @@ -128,22 +127,20 @@ func (manager *WebSocketManagerCtx) Start() { return } + manager.logger.Debug().Msg("sync clipboard") + data, err := manager.desktop.ClipboardGetText() if err != nil { manager.logger.Warn().Err(err).Msg("could not get clipboard content") return } - if err := session.Send(message.ClipboardData{ - Event: event.CLIPBOARD_UPDATED, - Text: data.Text, - // TODO: Send HTML? - }); err != nil { - manager.logger.Warn().Err(err).Msg("could not sync clipboard") - return - } - - manager.logger.Debug().Msg("session sync clipboard") + session.Send( + event.CLIPBOARD_UPDATED, + message.ClipboardData{ + Text: data.Text, + // TODO: Send HTML? + }) }) manager.fileChooserDialogEvents() @@ -161,13 +158,10 @@ func (manager *WebSocketManagerCtx) AddHandler(handler types.WebSocketHandler) { } func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin types.CheckOrigin) { - // add request data to logger context - logger := manager.logger.With(). + manager.logger.Debug(). Str("address", r.RemoteAddr). Str("agent", r.UserAgent()). - Logger() - - logger.Debug().Msg("attempting to upgrade connection") + Msg("attempting to upgrade connection") upgrader := websocket.Upgrader{ CheckOrigin: checkOrigin, @@ -175,49 +169,60 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque connection, err := upgrader.Upgrade(w, r, nil) if err != nil { - logger.Error().Err(err).Msg("failed to upgrade connection") + manager.logger.Error().Err(err).Msg("failed to upgrade connection") return } session, err := manager.sessions.Authenticate(r) if err != nil { - logger.Debug().Err(err).Msg("authentication failed") + manager.logger.Warn().Err(err).Msg("authentication failed") - // TODO: Refactor, return error code. - if err = connection.WriteJSON( - message.SystemDisconnect{ + // TODO: Better handling... + raw, err := json.Marshal(message.SystemDisconnect{ + Message: err.Error(), + }) + + if err != nil { + manager.logger.Error().Err(err).Msg("failed to create disconnect event") + } + + err = connection.WriteJSON( + types.WebSocketMessage{ Event: event.SYSTEM_DISCONNECT, - Message: err.Error(), - }); err != nil { - logger.Error().Err(err).Msg("failed to send disconnect event") + Payload: raw, + }) + + if err != nil { + manager.logger.Error().Err(err).Msg("failed to send disconnect event") } if err := connection.Close(); err != nil { - logger.Warn().Err(err).Msg("connection closed with an error") + manager.logger.Warn().Err(err).Msg("connection closed with an error") } return } // use session id with defeault logger context - logger = manager.logger.With().Str("session_id", session.ID()).Logger() + logger := manager.logger.With().Str("session_id", session.ID()).Logger() + + // create new peer + peer := &WebSocketPeerCtx{ + logger: logger, + session: session, + connection: connection, + } if !session.Profile().CanConnect { - logger.Debug().Msg("connection disabled") + logger.Warn().Msg("connection disabled") - // TODO: Refactor, return error code. - if err = connection.WriteJSON( + peer.Send( + event.SYSTEM_DISCONNECT, message.SystemDisconnect{ - Event: event.SYSTEM_DISCONNECT, Message: "connection disabled", - }); err != nil { - logger.Error().Err(err).Msg("failed to send disconnect event") - } - - if err := connection.Close(); err != nil { - logger.Warn().Err(err).Msg("connection closed with an error") - } + }) + peer.Destroy() return } @@ -225,32 +230,17 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque logger.Warn().Msg("already connected") if !manager.sessions.MercifulReconnect() { - // TODO: Refactor, return error code. - if err = connection.WriteJSON( + peer.Send( + event.SYSTEM_DISCONNECT, message.SystemDisconnect{ - Event: event.SYSTEM_DISCONNECT, Message: "already connected", - }); err != nil { - logger.Error().Err(err).Msg("failed to send disconnect event") - } - - if err := connection.Close(); err != nil { - logger.Warn().Err(err).Msg("connection closed with an error") - } + }) + peer.Destroy() return } logger.Info().Msg("replacing peer connection") - - // destroy previous peer connection - session.GetWebSocketPeer().Destroy() - } - - peer := &WebSocketPeerCtx{ - logger: logger, - session: session, - connection: connection, } session.SetWebSocketPeer(peer) From c2fe224562dbc0155557fd2b032dc32930c0434a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Sep 2021 23:10:06 +0200 Subject: [PATCH 538/876] audit errors and warnings. --- cmd/root.go | 6 +++--- internal/desktop/manager.go | 2 +- internal/utils/http.go | 4 +--- internal/webrtc/cursor/image.go | 2 +- internal/webrtc/manager.go | 12 ++++++------ internal/websocket/manager.go | 12 ++++++------ internal/websocket/peer.go | 4 ++-- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index ccbd2a0d..3031fc68 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -98,10 +98,10 @@ func init() { if err := viper.ReadInConfig(); err != nil { if _, ok := err.(viper.ConfigFileNotFoundError); !ok { - log.Error().Err(err) + log.Err(err) } if config != "" { - log.Error().Err(err) + log.Err(err) } } @@ -124,7 +124,7 @@ func init() { logger.Warn().Msg("preflight complete without config file") } else { if _, err := os.Stat(file); os.IsNotExist(err) { - logger.Error().Msg("preflight complete with nonexistent config file") + logger.Err(err).Msg("preflight complete with nonexistent config file") } else { logger.Info().Msg("preflight complete") } diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 788e3d65..5909a9f5 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -44,7 +44,7 @@ func (manager *DesktopManagerCtx) Start() { Msgf("setting initial screen size") if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { - manager.logger.Warn().Err(err).Msg("unable to set initial screen size") + manager.logger.Err(err).Msg("unable to set initial screen size") } go xevent.EventLoop(manager.config.Display) diff --git a/internal/utils/http.go b/internal/utils/http.go index 124c15fe..d2e6c382 100644 --- a/internal/utils/http.go +++ b/internal/utils/http.go @@ -32,9 +32,7 @@ func HttpJsonResponse(w http.ResponseWriter, status int, res interface{}) { w.WriteHeader(status) if err := json.NewEncoder(w).Encode(res); err != nil { - log.Warn().Err(err). - Str("module", "http"). - Msg("failed writing json error response") + log.Err(err).Str("module", "http").Msg("sending http json response failed") } } diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 469109b6..3b151152 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -41,7 +41,7 @@ func (manager *ImageCtx) Start() { manager.desktop.OnCursorChanged(func(serial uint64) { entry, err := manager.GetCached(serial) if err != nil { - manager.logger.Warn().Err(err).Msg("failed to get cursor image") + manager.logger.Err(err).Msg("failed to get cursor image") return } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index efff4f7a..00d241ce 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -158,7 +158,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin videoTrack, err := webrtc.NewTrackLocalStaticSample(videoStream.Codec().Capability, "video", "stream") if err != nil { - logger.Warn().Err(err).Msg("unable to create video track") + logger.Err(err).Msg("unable to create video track") return nil, err } @@ -177,7 +177,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // should be stream started if videoStream.ListenersCount() == 0 { if err := videoStream.Start(); err != nil { - logger.Warn().Err(err).Msg("unable to start video pipeline") + logger.Err(err).Msg("unable to start video pipeline") return nil, err } } @@ -246,7 +246,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin cursorImage := func(entry *cursor.ImageEntry) { if err := peer.SendCursorImage(entry.Cursor, entry.Image); err != nil { - logger.Warn().Err(err).Msg("could not send cursor image") + logger.Err(err).Msg("could not send cursor image") } } @@ -256,7 +256,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } if err := peer.SendCursorPosition(x, y); err != nil { - logger.Warn().Err(err).Msg("could not send cursor position") + logger.Err(err).Msg("could not send cursor position") } } @@ -304,7 +304,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin if err == nil { cursorImage(entry) } else { - logger.Warn().Err(err).Msg("failed to get cursor image") + logger.Err(err).Msg("failed to get cursor image") } // send initial cursor position @@ -323,7 +323,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } if err = manager.handle(message, session); err != nil { - logger.Warn().Err(err).Msg("data handle failed") + logger.Err(err).Msg("data handle failed") } }) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index a81d1170..222a52a6 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -131,7 +131,7 @@ func (manager *WebSocketManagerCtx) Start() { data, err := manager.desktop.ClipboardGetText() if err != nil { - manager.logger.Warn().Err(err).Msg("could not get clipboard content") + manager.logger.Err(err).Msg("could not get clipboard content") return } @@ -169,7 +169,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque connection, err := upgrader.Upgrade(w, r, nil) if err != nil { - manager.logger.Error().Err(err).Msg("failed to upgrade connection") + manager.logger.Err(err).Msg("failed to upgrade connection") return } @@ -183,7 +183,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque }) if err != nil { - manager.logger.Error().Err(err).Msg("failed to create disconnect event") + manager.logger.Err(err).Msg("failed to create disconnect event") } err = connection.WriteJSON( @@ -193,7 +193,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque }) if err != nil { - manager.logger.Error().Err(err).Msg("failed to send disconnect event") + manager.logger.Err(err).Msg("failed to send disconnect event") } if err := connection.Close(); err != nil { @@ -297,7 +297,7 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t case raw := <-bytes: data := types.WebSocketMessage{} if err := json.Unmarshal(raw, &data); err != nil { - logger.Error().Err(err).Msg("message unmarshalling has failed") + logger.Err(err).Msg("message unmarshalling has failed") break } @@ -323,7 +323,7 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t return case <-ticker.C: if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { - logger.Error().Err(err).Msg("ping message has failed") + logger.Err(err).Msg("ping message has failed") return } } diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index c182b5d8..792574c0 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -29,7 +29,7 @@ func (peer *WebSocketPeerCtx) Send(event string, payload interface{}) { raw, err := json.Marshal(payload) if err != nil { - peer.logger.Error().Err(err).Str("event", event).Msg("message marshalling has failed") + peer.logger.Err(err).Str("event", event).Msg("message marshalling has failed") return } @@ -39,7 +39,7 @@ func (peer *WebSocketPeerCtx) Send(event string, payload interface{}) { }) if err != nil { - peer.logger.Error().Err(err).Str("event", event).Msg("send message error") + peer.logger.Err(err).Str("event", event).Msg("send message error") return } From 5130d94bbcfb559bf185f744d0bb3b7cd31061e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Sep 2021 23:10:18 +0200 Subject: [PATCH 539/876] websocket handler simplified logging. --- internal/websocket/handler/clipboard.go | 10 ++++----- internal/websocket/handler/control.go | 11 ++++------ internal/websocket/handler/handler.go | 2 +- internal/websocket/handler/keyboard.go | 12 ++++------- internal/websocket/handler/screen.go | 7 +++---- internal/websocket/handler/send.go | 7 +++---- internal/websocket/handler/signal.go | 27 +++++++------------------ internal/websocket/handler/system.go | 5 +++-- 8 files changed, 29 insertions(+), 52 deletions(-) diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 6c4618c6..123c00a7 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -1,21 +1,19 @@ package handler import ( + "errors" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/message" ) func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - if !session.Profile().CanAccessClipboard { - logger.Debug().Msg("cannot access clipboard") - return nil + return errors.New("cannot access clipboard") } if !session.IsHost() { - logger.Debug().Msg("is not the host") - return nil + return errors.New("is not the host") } return h.desktop.ClipboardSetText(types.ClipboardText{ diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 71c0f21a..ebc678e3 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -1,6 +1,8 @@ package handler import ( + "errors" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" @@ -26,16 +28,12 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { } func (h *MessageHandlerCtx) controlRequest(session types.Session) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - if !session.Profile().CanHost { - logger.Debug().Msg("is not allowed to host") - return nil + return errors.New("is not allowed to host") } if session.IsHost() { - logger.Debug().Msg("is already the host") - return nil + return errors.New("is already the host") } if !h.sessions.ImplicitHosting() { @@ -53,6 +51,5 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { } h.sessions.SetHost(session) - return nil } diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index cc6f2e8d..2f3b5b28 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -113,7 +113,7 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM } if err != nil { - logger.Error().Err(err).Msg("message handler has failed") + logger.Warn().Err(err).Msg("message handler has failed") } return true diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 72d21a26..457b3828 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -1,16 +1,15 @@ package handler import ( + "errors" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/message" ) func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - if !session.IsHost() { - logger.Debug().Msg("is not the host") - return nil + return errors.New("is not the host") } return h.desktop.SetKeyboardMap(types.KeyboardMap{ @@ -20,11 +19,8 @@ func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message. } func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *message.KeyboardModifiers) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - if !session.IsHost() { - logger.Debug().Msg("is not the host") - return nil + return errors.New("is not the host") } h.desktop.SetKeyboardModifiers(types.KeyboardModifiers{ diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 4ae16230..cce9f4ec 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -1,17 +1,16 @@ package handler import ( + "errors" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" ) func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - if !session.Profile().IsAdmin { - logger.Debug().Msg("is not the admin") - return nil + return errors.New("is not the admin") } if err := h.desktop.SetScreenSize(types.ScreenSize{ diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index 5a8be5af..9c59b14d 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -1,18 +1,17 @@ package handler import ( + "errors" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" ) func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - receiver, ok := h.sessions.Get(payload.Receiver) if !ok { - logger.Debug().Msg("receiver session ID not found") - return nil + return errors.New("receiver session ID not found") } receiver.Send( diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 0e48b1f3..873fc913 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -1,17 +1,16 @@ package handler import ( + "errors" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" ) func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - if !session.Profile().CanWatch { - logger.Debug().Msg("not allowed to watch") - return nil + return errors.New("not allowed to watch") } // use default first video, if not provided @@ -37,12 +36,9 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag } func (h *MessageHandlerCtx) signalRestart(session types.Session) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - peer := session.GetWebRTCPeer() if peer == nil { - logger.Debug().Msg("webRTC peer does not exist") - return nil + return errors.New("webRTC peer does not exist") } offer, err := peer.CreateOffer(true) @@ -60,36 +56,27 @@ func (h *MessageHandlerCtx) signalRestart(session types.Session) error { } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - peer := session.GetWebRTCPeer() if peer == nil { - logger.Debug().Msg("webRTC peer does not exist") - return nil + return errors.New("webRTC peer does not exist") } return peer.SignalAnswer(payload.SDP) } func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *message.SignalCandidate) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - peer := session.GetWebRTCPeer() if peer == nil { - logger.Debug().Msg("webRTC peer does not exist") - return nil + return errors.New("webRTC peer does not exist") } return peer.SignalCandidate(payload.ICECandidateInit) } func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message.SignalVideo) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - peer := session.GetWebRTCPeer() if peer == nil { - logger.Debug().Msg("webRTC peer does not exist") - return nil + return errors.New("webRTC peer does not exist") } err := peer.SetVideoID(payload.Video) diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 8f2d1a01..6052e079 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -1,6 +1,8 @@ package handler import ( + "errors" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" @@ -19,8 +21,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { size := h.desktop.GetScreenSize() if size == nil { - h.logger.Warn().Msg("could not get screen size") - return nil + return errors.New("could not get screen size") } sessions := map[string]message.SessionData{} From fd3525448726654c6c5d402c178964b911ff1325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Sep 2021 23:30:09 +0200 Subject: [PATCH 540/876] simplified logging. --- internal/websocket/manager.go | 66 +++++++++++++---------------------- neko.go | 51 +++++++++------------------ 2 files changed, 40 insertions(+), 77 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 222a52a6..421ab31f 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -45,63 +45,45 @@ type WebSocketManagerCtx struct { func (manager *WebSocketManagerCtx) Start() { manager.sessions.OnCreated(func(session types.Session) { - logger := manager.logger.With().Str("session_id", session.ID()).Logger() - - if err := manager.handler.SessionCreated(session); err != nil { - logger.Warn().Err(err).Msg("session created with an error") - } else { - logger.Debug().Msg("session created") - } + err := manager.handler.SessionCreated(session) + manager.logger.Err(err). + Str("session_id", session.ID()). + Msg("session created") }) manager.sessions.OnDeleted(func(session types.Session) { - logger := manager.logger.With().Str("session_id", session.ID()).Logger() - - if err := manager.handler.SessionDeleted(session); err != nil { - logger.Warn().Err(err).Msg("session deleted with an error") - } else { - logger.Debug().Msg("session deleted") - } + err := manager.handler.SessionDeleted(session) + manager.logger.Err(err). + Str("session_id", session.ID()). + Msg("session deleted") }) manager.sessions.OnConnected(func(session types.Session) { - logger := manager.logger.With().Str("session_id", session.ID()).Logger() - - if err := manager.handler.SessionConnected(session); err != nil { - logger.Warn().Err(err).Msg("session connected with an error") - } else { - logger.Debug().Msg("session connected") - } + err := manager.handler.SessionConnected(session) + manager.logger.Err(err). + Str("session_id", session.ID()). + Msg("session connected") }) manager.sessions.OnDisconnected(func(session types.Session) { - logger := manager.logger.With().Str("session_id", session.ID()).Logger() - - if err := manager.handler.SessionDisconnected(session); err != nil { - logger.Warn().Err(err).Msg("session disconnected with an error") - } else { - logger.Debug().Msg("session disconnected") - } + err := manager.handler.SessionDisconnected(session) + manager.logger.Err(err). + Str("session_id", session.ID()). + Msg("session disconnected") }) manager.sessions.OnProfileChanged(func(session types.Session) { - logger := manager.logger.With().Str("session_id", session.ID()).Logger() - - if err := manager.handler.SessionProfileChanged(session); err != nil { - logger.Warn().Err(err).Msg("session profile changed with an error") - } else { - logger.Debug().Interface("profile", session.Profile()).Msg("session profile changed") - } + err := manager.handler.SessionProfileChanged(session) + manager.logger.Err(err). + Str("session_id", session.ID()). + Msg("session profile changed") }) manager.sessions.OnStateChanged(func(session types.Session) { - logger := manager.logger.With().Str("session_id", session.ID()).Logger() - - if err := manager.handler.SessionStateChanged(session); err != nil { - logger.Warn().Err(err).Msg("session state changed with an error") - } else { - logger.Debug().Interface("state", session.State()).Msg("session state changed") - } + err := manager.handler.SessionStateChanged(session) + manager.logger.Err(err). + Str("session_id", session.ID()). + Msg("session state changed") }) manager.sessions.OnHostChanged(func(session types.Session) { diff --git a/neko.go b/neko.go index 4448dfe4..4328ba04 100644 --- a/neko.go +++ b/neko.go @@ -195,47 +195,28 @@ func (neko *Neko) Start() { } func (neko *Neko) Shutdown() { - if err := neko.memberManager.Disconnect(); err != nil { - neko.logger.Err(err).Msg("member manager disconnect with an error") - } else { - neko.logger.Debug().Msg("member manager disconnect") - } + var err error - if err := neko.desktopManager.Shutdown(); err != nil { - neko.logger.Err(err).Msg("desktop manager shutdown with an error") - } else { - neko.logger.Debug().Msg("desktop manager shutdown") - } + err = neko.memberManager.Disconnect() + neko.logger.Err(err).Msg("member manager disconnect") - if err := neko.captureManager.Shutdown(); err != nil { - neko.logger.Err(err).Msg("capture manager shutdown with an error") - } else { - neko.logger.Debug().Msg("capture manager shutdown") - } + err = neko.desktopManager.Shutdown() + neko.logger.Err(err).Msg("desktop manager shutdown") - if err := neko.webRTCManager.Shutdown(); err != nil { - neko.logger.Err(err).Msg("webrtc manager shutdown with an error") - } else { - neko.logger.Debug().Msg("webrtc manager shutdown") - } + err = neko.captureManager.Shutdown() + neko.logger.Err(err).Msg("capture manager shutdown") - if err := neko.webSocketManager.Shutdown(); err != nil { - neko.logger.Err(err).Msg("websocket manager shutdown with an error") - } else { - neko.logger.Debug().Msg("websocket manager shutdown") - } + err = neko.webRTCManager.Shutdown() + neko.logger.Err(err).Msg("webrtc manager shutdown") - if err := modules.Shutdown(); err != nil { - neko.logger.Err(err).Msg("modules shutdown with an error") - } else { - neko.logger.Debug().Msg("modules shutdown") - } + err = neko.webSocketManager.Shutdown() + neko.logger.Err(err).Msg("websocket manager shutdown") - if err := neko.httpManager.Shutdown(); err != nil { - neko.logger.Err(err).Msg("http manager shutdown with an error") - } else { - neko.logger.Debug().Msg("http manager shutdown") - } + err = modules.Shutdown() + neko.logger.Err(err).Msg("modules shutdown") + + err = neko.httpManager.Shutdown() + neko.logger.Err(err).Msg("http manager shutdown") } func (neko *Neko) ServeCommand(cmd *cobra.Command, args []string) { From 7e2f1734605e403f54d40e2de5b86a91b1e4fcee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Sep 2021 00:00:29 +0200 Subject: [PATCH 541/876] unify shutdown logs. --- internal/capture/broadcast.go | 2 +- internal/capture/manager.go | 2 +- internal/http/manager.go | 2 ++ internal/webrtc/manager.go | 2 +- internal/websocket/manager.go | 9 ++++----- neko.go | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index ab9d9dfa..fb9615ca 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -30,7 +30,7 @@ func broadcastNew(pipelineStr string) *BroacastManagerCtx { } func (manager *BroacastManagerCtx) shutdown() { - manager.logger.Info().Msgf("shutting down") + manager.logger.Info().Msgf("shutdown") manager.destroyPipeline() } diff --git a/internal/capture/manager.go b/internal/capture/manager.go index b3e6a48a..690de43f 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -162,7 +162,7 @@ func (manager *CaptureManagerCtx) Start() { } func (manager *CaptureManagerCtx) Shutdown() error { - manager.logger.Info().Msgf("capture shutting down") + manager.logger.Info().Msgf("shutdown") manager.broadcast.shutdown() manager.screencast.shutdown() diff --git a/internal/http/manager.go b/internal/http/manager.go index 1a321213..51d3cd1d 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -94,5 +94,7 @@ func (manager *HttpManagerCtx) Start() { } func (manager *HttpManagerCtx) Shutdown() error { + manager.logger.Info().Msg("shutdown") + return manager.http.Shutdown(context.Background()) } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 00d241ce..d33cd212 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -92,7 +92,7 @@ func (manager *WebRTCManagerCtx) Start() { } func (manager *WebRTCManagerCtx) Shutdown() error { - manager.logger.Info().Msg("webrtc shutdown") + manager.logger.Info().Msg("shutdown") manager.curImage.Shutdown() manager.curPosition.Shutdown() diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 421ab31f..9f15fd3d 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -131,7 +131,8 @@ func (manager *WebSocketManagerCtx) Start() { } func (manager *WebSocketManagerCtx) Shutdown() error { - manager.logger.Info().Msg("websocket shutdown") + manager.logger.Info().Msg("shutdown") + // TODO: Kill all connections and add waitgroup for gorutines. return nil } @@ -178,10 +179,8 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque manager.logger.Err(err).Msg("failed to send disconnect event") } - if err := connection.Close(); err != nil { - manager.logger.Warn().Err(err).Msg("connection closed with an error") - } - + err = connection.Close() + manager.logger.Err(err).Msg("connection closed") return } diff --git a/neko.go b/neko.go index 4328ba04..af1ce98b 100644 --- a/neko.go +++ b/neko.go @@ -228,7 +228,7 @@ func (neko *Neko) ServeCommand(cmd *cobra.Command, args []string) { signal.Notify(quit, os.Interrupt) sig := <-quit - neko.logger.Warn().Msgf("received %s, attempting graceful shutdown: \n", sig) + neko.logger.Warn().Msgf("received %s, attempting graceful shutdown", sig) neko.Shutdown() neko.logger.Info().Msg("shutdown complete") } From f18ae2b972c80d7c5d273191582ea629851d4c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Sep 2021 00:00:56 +0200 Subject: [PATCH 542/876] add waitgroups. --- internal/capture/screencast.go | 8 +++++++- internal/capture/stream.go | 8 +++++++- internal/desktop/manager.go | 18 +++++++++++------- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index bec88894..179e8b32 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -16,6 +16,7 @@ import ( type ScreencastManagerCtx struct { logger zerolog.Logger mu sync.Mutex + wg sync.WaitGroup pipelineStr string pipeline *gst.Pipeline enabled bool @@ -39,8 +40,11 @@ func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { emitUpdate: make(chan bool), } + manager.wg.Add(1) + go func() { manager.logger.Debug().Msg("started emitting samples") + defer manager.wg.Done() ticker := time.NewTicker(screencastTimeout) defer ticker.Stop() @@ -66,10 +70,12 @@ func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { } func (manager *ScreencastManagerCtx) shutdown() { - manager.logger.Info().Msgf("shutting down") + manager.logger.Info().Msgf("shutdown") manager.destroyPipeline() + manager.emitStop <- true + manager.wg.Wait() } func (manager *ScreencastManagerCtx) Enabled() bool { diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 34f6a91f..f8af877c 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -15,6 +15,7 @@ import ( type StreamManagerCtx struct { logger zerolog.Logger mu sync.Mutex + wg sync.WaitGroup codec codec.RTPCodec pipelineStr func() string pipeline *gst.Pipeline @@ -42,8 +43,11 @@ func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) started: false, } + manager.wg.Add(1) + go func() { manager.logger.Debug().Msg("started emitting samples") + defer manager.wg.Done() for { select { @@ -66,7 +70,7 @@ func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) } func (manager *StreamManagerCtx) shutdown() { - manager.logger.Info().Msgf("shutting down") + manager.logger.Info().Msgf("shutdown") manager.emitMu.Lock() for key := range manager.listeners { @@ -75,7 +79,9 @@ func (manager *StreamManagerCtx) shutdown() { manager.emitMu.Unlock() manager.destroyPipeline() + manager.emitStop <- true + manager.wg.Wait() } func (manager *StreamManagerCtx) Codec() codec.RTPCodec { diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 5909a9f5..7a1fab7b 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -18,6 +18,7 @@ var mu = sync.Mutex{} type DesktopManagerCtx struct { logger zerolog.Logger + wg sync.WaitGroup shutdown chan bool emmiter events.EventEmmiter config *config.Desktop @@ -39,14 +40,11 @@ func (manager *DesktopManagerCtx) Start() { xorg.GetScreenConfigurations() - manager.logger.Info(). + err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) + manager.logger.Err(err). Str("screen_size", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). Msgf("setting initial screen size") - if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { - manager.logger.Err(err).Msg("unable to set initial screen size") - } - go xevent.EventLoop(manager.config.Display) // In case it was opened @@ -61,14 +59,17 @@ func (manager *DesktopManagerCtx) Start() { Msg("X event error occured") }) + manager.wg.Add(1) + go func() { + defer manager.wg.Done() + ticker := time.NewTicker(1 * time.Second) defer ticker.Stop() for { select { case <-manager.shutdown: - xorg.DisplayClose() return case <-ticker.C: xorg.CheckKeys(time.Second * 10) @@ -90,8 +91,11 @@ func (manager *DesktopManagerCtx) OnAfterScreenSizeChange(listener func()) { } func (manager *DesktopManagerCtx) Shutdown() error { - manager.logger.Info().Msgf("desktop shutting down") + manager.logger.Info().Msgf("shutdown") manager.shutdown <- true + manager.wg.Wait() + + xorg.DisplayClose() return nil } From 1dab0bd8599e43b8b6a3ab1013d1c7573d672b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Sep 2021 20:30:50 +0200 Subject: [PATCH 543/876] remove session from websocket peer. --- internal/websocket/manager.go | 37 ++++++++++------------------------- internal/websocket/peer.go | 18 ++++++++++++++++- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 9f15fd3d..6e9c6476 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -156,43 +156,26 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque return } + // create new peer + peer := newPeer(connection) + session, err := manager.sessions.Authenticate(r) if err != nil { manager.logger.Warn().Err(err).Msg("authentication failed") - // TODO: Better handling... - raw, err := json.Marshal(message.SystemDisconnect{ - Message: err.Error(), - }) - - if err != nil { - manager.logger.Err(err).Msg("failed to create disconnect event") - } - - err = connection.WriteJSON( - types.WebSocketMessage{ - Event: event.SYSTEM_DISCONNECT, - Payload: raw, + peer.Send( + event.SYSTEM_DISCONNECT, + message.SystemDisconnect{ + Message: err.Error(), }) - if err != nil { - manager.logger.Err(err).Msg("failed to send disconnect event") - } - - err = connection.Close() - manager.logger.Err(err).Msg("connection closed") + peer.Destroy() return } - // use session id with defeault logger context + // add session id to all log messages logger := manager.logger.With().Str("session_id", session.ID()).Logger() - - // create new peer - peer := &WebSocketPeerCtx{ - logger: logger, - session: session, - connection: connection, - } + peer.setSessionID(session.ID()) if !session.Profile().CanConnect { logger.Warn().Msg("connection disabled") diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 792574c0..7ac5790c 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -6,6 +6,7 @@ import ( "github.com/gorilla/websocket" "github.com/rs/zerolog" + "github.com/rs/zerolog/log" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" @@ -15,10 +16,25 @@ import ( type WebSocketPeerCtx struct { mu sync.Mutex logger zerolog.Logger - session types.Session connection *websocket.Conn } +func newPeer(connection *websocket.Conn) *WebSocketPeerCtx { + logger := log.With(). + Str("module", "websocket"). + Str("submodule", "peer"). + Logger() + + return &WebSocketPeerCtx{ + logger: logger, + connection: connection, + } +} + +func (peer *WebSocketPeerCtx) setSessionID(sessionId string) { + peer.logger = peer.logger.With().Str("session_id", sessionId).Logger() +} + func (peer *WebSocketPeerCtx) Send(event string, payload interface{}) { peer.mu.Lock() defer peer.mu.Unlock() From e812cb9fbf3a4eab6316e00a53c960c4f2734332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Sep 2021 20:48:15 +0200 Subject: [PATCH 544/876] pionlog to own folder. --- internal/webrtc/manager.go | 8 +++---- internal/webrtc/peer.go | 1 - internal/webrtc/pionlog/factory.go | 27 +++++++++++++++++++++ internal/webrtc/{ => pionlog}/logger.go | 31 +------------------------ internal/webrtc/pionlog/nullog.go | 14 +++++++++++ 5 files changed, 45 insertions(+), 36 deletions(-) create mode 100644 internal/webrtc/pionlog/factory.go rename internal/webrtc/{ => pionlog}/logger.go (57%) create mode 100644 internal/webrtc/pionlog/nullog.go diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index d33cd212..75a99393 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -19,6 +19,7 @@ import ( "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" "demodesk/neko/internal/webrtc/cursor" + "demodesk/neko/internal/webrtc/pionlog" ) // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds @@ -237,10 +238,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin peer := &WebRTCPeerCtx{ logger: logger, - api: api, connection: connection, - changeVideo: changeVideo, dataChannel: dataChannel, + changeVideo: changeVideo, iceTrickle: manager.config.ICETrickle, } @@ -373,9 +373,7 @@ func (manager *WebRTCManagerCtx) mediaEngine(videoID string) (*webrtc.MediaEngin func (manager *WebRTCManagerCtx) apiSettings(logger zerolog.Logger) webrtc.SettingEngine { settings := webrtc.SettingEngine{ - LoggerFactory: loggerFactory{ - logger: logger, - }, + LoggerFactory: pionlog.New(logger), } //nolint diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 49c787fa..3f030826 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -10,7 +10,6 @@ import ( type WebRTCPeerCtx struct { mu sync.Mutex logger zerolog.Logger - api *webrtc.API connection *webrtc.PeerConnection dataChannel *webrtc.DataChannel changeVideo func(videoID string) error diff --git a/internal/webrtc/pionlog/factory.go b/internal/webrtc/pionlog/factory.go new file mode 100644 index 00000000..5a3a6beb --- /dev/null +++ b/internal/webrtc/pionlog/factory.go @@ -0,0 +1,27 @@ +package pionlog + +import ( + "github.com/pion/logging" + "github.com/rs/zerolog" +) + +func New(logger zerolog.Logger) Factory { + return Factory{ + Logger: logger.With().Str("submodule", "pion").Logger(), + } +} + +type Factory struct { + Logger zerolog.Logger +} + +func (l Factory) NewLogger(subsystem string) logging.LeveledLogger { + if subsystem == "sctp" { + return nulllog{} + } + + return logger{ + subsystem: subsystem, + logger: l.Logger.With().Str("subsystem", subsystem).Logger(), + } +} diff --git a/internal/webrtc/logger.go b/internal/webrtc/pionlog/logger.go similarity index 57% rename from internal/webrtc/logger.go rename to internal/webrtc/pionlog/logger.go index 92f57a82..7e48d90e 100644 --- a/internal/webrtc/logger.go +++ b/internal/webrtc/pionlog/logger.go @@ -1,26 +1,12 @@ -package webrtc +package pionlog import ( "fmt" "strings" - "github.com/pion/logging" "github.com/rs/zerolog" ) -type nulllog struct{} - -func (l nulllog) Trace(msg string) {} -func (l nulllog) Tracef(format string, args ...interface{}) {} -func (l nulllog) Debug(msg string) {} -func (l nulllog) Debugf(format string, args ...interface{}) {} -func (l nulllog) Info(msg string) {} -func (l nulllog) Infof(format string, args ...interface{}) {} -func (l nulllog) Warn(msg string) {} -func (l nulllog) Warnf(format string, args ...interface{}) {} -func (l nulllog) Error(msg string) {} -func (l nulllog) Errorf(format string, args ...interface{}) {} - type logger struct { logger zerolog.Logger subsystem string @@ -69,18 +55,3 @@ func (l logger) Errorf(format string, args ...interface{}) { msg := fmt.Sprintf(format, args...) l.logger.Error().Msg(strings.TrimSpace(msg)) } - -type loggerFactory struct { - logger zerolog.Logger -} - -func (l loggerFactory) NewLogger(subsystem string) logging.LeveledLogger { - if subsystem == "sctp" { - return nulllog{} - } - - return logger{ - subsystem: subsystem, - logger: l.logger.With().Str("submodule", "pion").Str("subsystem", subsystem).Logger(), - } -} diff --git a/internal/webrtc/pionlog/nullog.go b/internal/webrtc/pionlog/nullog.go new file mode 100644 index 00000000..4b9c9e90 --- /dev/null +++ b/internal/webrtc/pionlog/nullog.go @@ -0,0 +1,14 @@ +package pionlog + +type nulllog struct{} + +func (l nulllog) Trace(msg string) {} +func (l nulllog) Tracef(format string, args ...interface{}) {} +func (l nulllog) Debug(msg string) {} +func (l nulllog) Debugf(format string, args ...interface{}) {} +func (l nulllog) Info(msg string) {} +func (l nulllog) Infof(format string, args ...interface{}) {} +func (l nulllog) Warn(msg string) {} +func (l nulllog) Warnf(format string, args ...interface{}) {} +func (l nulllog) Error(msg string) {} +func (l nulllog) Errorf(format string, args ...interface{}) {} From 00fc3afcd706817f2c716356f8053d4436a15014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Sep 2021 21:06:58 +0200 Subject: [PATCH 545/876] extract webrtc payload to own module. --- internal/webrtc/handler.go | 66 ++++++++---------------------- internal/webrtc/manager.go | 2 +- internal/webrtc/payload/receive.go | 30 ++++++++++++++ internal/webrtc/payload/send.go | 22 ++++++++++ internal/webrtc/payload/types.go | 6 +++ internal/webrtc/send.go | 32 ++++----------- 6 files changed, 83 insertions(+), 75 deletions(-) create mode 100644 internal/webrtc/payload/receive.go create mode 100644 internal/webrtc/payload/send.go create mode 100644 internal/webrtc/payload/types.go diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 5267703e..e9499529 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -4,48 +4,16 @@ import ( "bytes" "encoding/binary" - "github.com/pion/webrtc/v3" - "demodesk/neko/internal/types" + "demodesk/neko/internal/webrtc/payload" ) -const ( - OP_MOVE = 0x01 - OP_SCROLL = 0x02 - OP_KEY_DOWN = 0x03 - OP_KEY_UP = 0x04 - OP_BTN_DOWN = 0x05 - OP_BTN_UP = 0x06 -) - -type PayloadHeader struct { - Event uint8 - Length uint16 -} - -type PayloadMove struct { - PayloadHeader - X uint16 - Y uint16 -} - -type PayloadScroll struct { - PayloadHeader - X int16 - Y int16 -} - -type PayloadKey struct { - PayloadHeader - Key uint32 -} - -func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage, session types.Session) error { +func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) error { // add session id to logger context logger := manager.logger.With().Str("session_id", session.ID()).Logger() - buffer := bytes.NewBuffer(msg.Data) - header := &PayloadHeader{} + buffer := bytes.NewBuffer(data) + header := &payload.Header{} hbytes := make([]byte, 3) if _, err := buffer.Read(hbytes); err != nil { @@ -56,19 +24,19 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage, session t return err } - buffer = bytes.NewBuffer(msg.Data) + buffer = bytes.NewBuffer(data) switch header.Event { - case OP_MOVE: - payload := &PayloadMove{} + case payload.OP_MOVE: + payload := &payload.Move{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } manager.desktop.Move(int(payload.X), int(payload.Y)) manager.curPosition.Set(int(payload.X), int(payload.Y)) - case OP_SCROLL: - payload := &PayloadScroll{} + case payload.OP_SCROLL: + payload := &payload.Scroll{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } @@ -78,8 +46,8 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage, session t Int16("x", payload.X). Int16("y", payload.Y). Msg("scroll") - case OP_KEY_DOWN: - payload := &PayloadKey{} + case payload.OP_KEY_DOWN: + payload := &payload.Key{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } @@ -89,8 +57,8 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage, session t } else { logger.Trace().Uint32("key", payload.Key).Msg("key down") } - case OP_KEY_UP: - payload := &PayloadKey{} + case payload.OP_KEY_UP: + payload := &payload.Key{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } @@ -100,8 +68,8 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage, session t } else { logger.Trace().Uint32("key", payload.Key).Msg("key up") } - case OP_BTN_DOWN: - payload := &PayloadKey{} + case payload.OP_BTN_DOWN: + payload := &payload.Key{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } @@ -111,8 +79,8 @@ func (manager *WebRTCManagerCtx) handle(msg webrtc.DataChannelMessage, session t } else { logger.Trace().Uint32("key", payload.Key).Msg("button down") } - case OP_BTN_UP: - payload := &PayloadKey{} + case payload.OP_BTN_UP: + payload := &payload.Key{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 75a99393..e073465c 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -322,7 +322,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return } - if err = manager.handle(message, session); err != nil { + if err = manager.handle(message.Data, session); err != nil { logger.Err(err).Msg("data handle failed") } }) diff --git a/internal/webrtc/payload/receive.go b/internal/webrtc/payload/receive.go new file mode 100644 index 00000000..8cbff5c8 --- /dev/null +++ b/internal/webrtc/payload/receive.go @@ -0,0 +1,30 @@ +package payload + +const ( + OP_MOVE = 0x01 + OP_SCROLL = 0x02 + OP_KEY_DOWN = 0x03 + OP_KEY_UP = 0x04 + OP_BTN_DOWN = 0x05 + OP_BTN_UP = 0x06 +) + +type Move struct { + Header + + X uint16 + Y uint16 +} + +type Scroll struct { + Header + + X int16 + Y int16 +} + +type Key struct { + Header + + Key uint32 +} diff --git a/internal/webrtc/payload/send.go b/internal/webrtc/payload/send.go new file mode 100644 index 00000000..b3436f56 --- /dev/null +++ b/internal/webrtc/payload/send.go @@ -0,0 +1,22 @@ +package payload + +const ( + OP_CURSOR_POSITION = 0x01 + OP_CURSOR_IMAGE = 0x02 +) + +type CursorPosition struct { + Header + + X uint16 + Y uint16 +} + +type CursorImage struct { + Header + + Width uint16 + Height uint16 + Xhot uint16 + Yhot uint16 +} diff --git a/internal/webrtc/payload/types.go b/internal/webrtc/payload/types.go new file mode 100644 index 00000000..1395caed --- /dev/null +++ b/internal/webrtc/payload/types.go @@ -0,0 +1,6 @@ +package payload + +type Header struct { + Event uint8 + Length uint16 +} diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index 55733f42..e2c9e0f2 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -5,27 +5,9 @@ import ( "encoding/binary" "demodesk/neko/internal/types" + "demodesk/neko/internal/webrtc/payload" ) -const ( - OP_CURSOR_POSITION = 0x01 - OP_CURSOR_IMAGE = 0x02 -) - -type PayloadCursorPosition struct { - PayloadHeader - X uint16 - Y uint16 -} - -type PayloadCursorImage struct { - PayloadHeader - Width uint16 - Height uint16 - Xhot uint16 - Yhot uint16 -} - func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { peer.mu.Lock() defer peer.mu.Unlock() @@ -34,9 +16,9 @@ func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { return types.ErrWebRTCDataChannelNotFound } - data := PayloadCursorPosition{ - PayloadHeader: PayloadHeader{ - Event: OP_CURSOR_POSITION, + data := payload.CursorPosition{ + Header: payload.Header{ + Event: payload.OP_CURSOR_POSITION, Length: 7, }, X: uint16(x), @@ -59,9 +41,9 @@ func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage, img []byte) e return types.ErrWebRTCDataChannelNotFound } - data := PayloadCursorImage{ - PayloadHeader: PayloadHeader{ - Event: OP_CURSOR_IMAGE, + data := payload.CursorImage{ + Header: payload.Header{ + Event: payload.OP_CURSOR_IMAGE, Length: uint16(11 + len(img)), }, Width: cur.Width, From d7671942a60b2bc711794db32c7ef8826972a548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Sep 2021 21:37:24 +0200 Subject: [PATCH 546/876] code fmt change. --- internal/api/members/handler.go | 4 +--- internal/api/room/upload.go | 10 ++++----- internal/capture/screencast.go | 1 + internal/config/webrtc.go | 17 +++++++++------ internal/desktop/drop.go | 13 +++++------ internal/desktop/filechooserdialog.go | 31 +++++++++++++++------------ internal/desktop/xorg.go | 8 +++---- internal/desktop/xorg/xorg.go | 12 +++++------ internal/http/auth/auth.go | 4 +--- internal/websocket/manager.go | 6 +++--- 10 files changed, 54 insertions(+), 52 deletions(-) diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 558991d0..b5d52718 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -14,9 +14,7 @@ import ( type key int -const ( - keyMemberCtx key = iota -) +const keyMemberCtx key = iota type MembersHandler struct { members types.MemberManager diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 58161271..b4c51fb7 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -10,13 +10,11 @@ import ( "demodesk/neko/internal/utils" ) -const ( - // Maximum upload of 32 MB files. - MAX_UPLOAD_SIZE = 32 << 20 -) +// maximum upload size of 32 MB +const maxUploadSize = 32 << 20 func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { - err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) + err := r.ParseMultipartForm(maxUploadSize) if err != nil { utils.HttpBadRequest(w, "failed to parse multipart form") return @@ -87,7 +85,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { } func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { - err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) + err := r.ParseMultipartForm(maxUploadSize) if err != nil { utils.HttpBadRequest(w, "failed to parse multipart form") return diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 179e8b32..36222b17 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -28,6 +28,7 @@ type ScreencastManagerCtx struct { image types.Sample } +// timeout between intervals, when screencast pipeline is checked const screencastTimeout = 5 * time.Second func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 55bdea31..ab6d84ed 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -13,6 +13,15 @@ import ( "demodesk/neko/internal/utils" ) +// default port range - min +const defEprMin = 59000 + +// default port range - max +const defEprMax = 59100 + +// default stun server +const defStunSrv = "stun:stun.l.google.com:19302" + type WebRTC struct { ICELite bool ICETrickle bool @@ -24,12 +33,6 @@ type WebRTC struct { IpRetrievalUrl string } -const ( - defEprMin = 59000 - defEprMax = 59100 - defStun = "stun:stun.l.google.com:19302" -) - func (WebRTC) Init(cmd *cobra.Command) error { cmd.PersistentFlags().Bool("webrtc.icelite", false, "configures whether or not the ICE agent should be a lite agent") if err := viper.BindPFlag("webrtc.icelite", cmd.PersistentFlags().Lookup("webrtc.icelite")); err != nil { @@ -76,7 +79,7 @@ func (s *WebRTC) Set() { if len(s.ICEServers) == 0 { s.ICEServers = append(s.ICEServers, types.ICEServer{ - URLs: []string{defStun}, + URLs: []string{defStunSrv}, }) } diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index 6dbf186b..ff9166d8 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -6,10 +6,11 @@ import ( "demodesk/neko/internal/desktop/drop" ) -const ( - DROP_MOVE_REPEAT = 4 - DROP_DELAY = 100 * time.Millisecond -) +// repeat move event multiple times +const dropMoveRepeat = 4 + +// wait after each repeated move event +const dropMoveDelay = 100 * time.Millisecond func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { mu.Lock() @@ -31,9 +32,9 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { }) drop.Emmiter.Once("begin", func(payload ...interface{}) { - for i := 0; i < DROP_MOVE_REPEAT; i++ { + for i := 0; i < dropMoveRepeat; i++ { manager.Move(x, y) - time.Sleep(DROP_DELAY) + time.Sleep(dropMoveDelay) } //nolint diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index 5091e001..b10f76a8 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -6,11 +6,14 @@ import ( "time" ) -const ( - FILE_CHOOSER_DIALOG_NAME = "Open File" - FILE_CHOOSER_DIALOG_SHORT_SLEEP = "0.2" - FILE_CHOOSER_DIALOG_LONG_SLEEP = "0.4" -) +// name of the window that is being controlled +const fileChooserDialogName = "Open File" + +// short sleep value between fake user interactions +const fileChooserDialogShortSleep = "0.2" + +// long sleep value between fake user interactions +const fileChooserDialogLongSleep = "0.4" func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { mu.Lock() @@ -19,19 +22,19 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { // TODO: Use native API. err1 := exec.Command( "xdotool", - "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", - "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, + "search", "--name", fileChooserDialogName, "windowfocus", + "sleep", fileChooserDialogShortSleep, "key", "--clearmodifiers", "ctrl+l", "type", "--args", "1", uri+"//", - "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, + "sleep", fileChooserDialogShortSleep, "key", "Delete", // remove autocomplete results - "sleep", FILE_CHOOSER_DIALOG_SHORT_SLEEP, + "sleep", fileChooserDialogShortSleep, "key", "Return", - "sleep", FILE_CHOOSER_DIALOG_LONG_SLEEP, + "sleep", fileChooserDialogLongSleep, "key", "Down", "key", "--clearmodifiers", "ctrl+a", "key", "Return", - "sleep", FILE_CHOOSER_DIALOG_LONG_SLEEP, + "sleep", fileChooserDialogLongSleep, ).Run() if err1 != nil { @@ -41,7 +44,7 @@ func (manager *DesktopManagerCtx) HandleFileChooserDialog(uri string) error { // TODO: Use native API. err2 := exec.Command( "xdotool", - "search", "--name", FILE_CHOOSER_DIALOG_NAME, + "search", "--name", fileChooserDialogName, ).Run() // if last command didn't return error, consider dialog as still open @@ -61,7 +64,7 @@ func (manager *DesktopManagerCtx) CloseFileChooserDialog() { // TODO: Use native API. err := exec.Command( "xdotool", - "search", "--name", FILE_CHOOSER_DIALOG_NAME, "windowfocus", + "search", "--name", fileChooserDialogName, "windowfocus", ).Run() if err != nil { @@ -92,7 +95,7 @@ func (manager *DesktopManagerCtx) IsFileChooserDialogOpened() bool { // TODO: Use native API. err := exec.Command( "xdotool", - "search", "--name", FILE_CHOOSER_DIALOG_NAME, + "search", "--name", fileChooserDialogName, ).Run() return err == nil diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 35a43d5c..047068d1 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -95,19 +95,19 @@ func (manager *DesktopManagerCtx) GetKeyboardMap() (*types.KeyboardMap, error) { func (manager *DesktopManagerCtx) SetKeyboardModifiers(mod types.KeyboardModifiers) { if mod.NumLock != nil { - xorg.SetKeyboardModifier(xorg.KBD_NUM_LOCK, *mod.NumLock) + xorg.SetKeyboardModifier(xorg.KbdModNumLock, *mod.NumLock) } if mod.CapsLock != nil { - xorg.SetKeyboardModifier(xorg.KBD_CAPS_LOCK, *mod.CapsLock) + xorg.SetKeyboardModifier(xorg.KbdModCapsLock, *mod.CapsLock) } } func (manager *DesktopManagerCtx) GetKeyboardModifiers() types.KeyboardModifiers { modifiers := xorg.GetKeyboardModifiers() - NumLock := (modifiers & xorg.KBD_NUM_LOCK) != 0 - CapsLock := (modifiers & xorg.KBD_CAPS_LOCK) != 0 + NumLock := (modifiers & xorg.KbdModNumLock) != 0 + CapsLock := (modifiers & xorg.KbdModCapsLock) != 0 return types.KeyboardModifiers{ NumLock: &NumLock, diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 4598f6cf..827b9149 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -19,11 +19,11 @@ import ( "demodesk/neko/internal/types" ) -type KbdModifiers uint8 +type KbdMod uint8 const ( - KBD_CAPS_LOCK KbdModifiers = 2 - KBD_NUM_LOCK KbdModifiers = 16 + KbdModCapsLock KbdMod = 2 + KbdModNumLock KbdMod = 16 ) var ScreenConfigurations = make(map[int]types.ScreenConfiguration) @@ -213,7 +213,7 @@ func GetScreenSize() *types.ScreenSize { return nil } -func SetKeyboardModifier(mod KbdModifiers, active bool) { +func SetKeyboardModifier(mod KbdMod, active bool) { mu.Lock() defer mu.Unlock() @@ -225,11 +225,11 @@ func SetKeyboardModifier(mod KbdModifiers, active bool) { C.XSetKeyboardModifier(C.int(mod), num) } -func GetKeyboardModifiers() KbdModifiers { +func GetKeyboardModifiers() KbdMod { mu.Lock() defer mu.Unlock() - return KbdModifiers(C.XGetKeyboardModifiers()) + return KbdMod(C.XGetKeyboardModifiers()) } func GetCursorImage() *types.CursorImage { diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index eed1d303..856a6913 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -10,9 +10,7 @@ import ( type key int -const ( - keySessionCtx key = iota -) +const keySessionCtx key = iota func SetSession(r *http.Request, session types.Session) *http.Request { ctx := context.WithValue(r.Context(), keySessionCtx, session) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 6e9c6476..b44e37e5 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -15,6 +15,9 @@ import ( "demodesk/neko/internal/websocket/handler" ) +// send pings to peer with this period - must be less than pongWait +const pingPeriod = 10 * time.Second + func New( sessions types.SessionManager, desktop types.DesktopManager, @@ -32,9 +35,6 @@ func New( } } -// Send pings to peer with this period. Must be less than pongWait. -const pingPeriod = 10 * time.Second - type WebSocketManagerCtx struct { logger zerolog.Logger sessions types.SessionManager From c85d00e50745cf748d8537e8e5302a056533aa03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Sep 2021 21:52:23 +0200 Subject: [PATCH 547/876] add websocket destroy reason. --- internal/session/manager.go | 2 +- internal/session/session.go | 4 ++-- internal/types/websocket.go | 2 +- internal/websocket/manager.go | 26 +++----------------------- internal/websocket/peer.go | 4 ++-- 5 files changed, 9 insertions(+), 29 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 97c70b2b..b2f1790e 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -122,7 +122,7 @@ func (manager *SessionManagerCtx) Delete(id string) error { manager.sessionsMu.Unlock() if session.State().IsConnected { - session.GetWebSocketPeer().Destroy() + session.GetWebSocketPeer().Destroy("session deleted") } if session.State().IsWatching { diff --git a/internal/session/session.go b/internal/session/session.go index 41ac12ff..b4359d4e 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -35,7 +35,7 @@ func (session *SessionCtx) profileChanged() { } if (!session.profile.CanConnect || !session.profile.CanLogin) && session.state.IsConnected { - session.websocketPeer.Destroy() + session.websocketPeer.Destroy("profile changed") } } @@ -53,7 +53,7 @@ func (session *SessionCtx) IsHost() bool { func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { if session.websocketPeer != nil { - session.websocketPeer.Destroy() + session.websocketPeer.Destroy("connection replaced") } session.websocketPeer = websocketPeer diff --git a/internal/types/websocket.go b/internal/types/websocket.go index 6bdf0a3c..885a0c41 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -16,7 +16,7 @@ type CheckOrigin func(r *http.Request) bool type WebSocketPeer interface { Send(event string, payload interface{}) - Destroy() + Destroy(reason string) } type WebSocketManager interface { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index b44e37e5..26bb9b99 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -162,14 +162,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque session, err := manager.sessions.Authenticate(r) if err != nil { manager.logger.Warn().Err(err).Msg("authentication failed") - - peer.Send( - event.SYSTEM_DISCONNECT, - message.SystemDisconnect{ - Message: err.Error(), - }) - - peer.Destroy() + peer.Destroy(err.Error()) return } @@ -179,14 +172,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque if !session.Profile().CanConnect { logger.Warn().Msg("connection disabled") - - peer.Send( - event.SYSTEM_DISCONNECT, - message.SystemDisconnect{ - Message: "connection disabled", - }) - - peer.Destroy() + peer.Destroy("connection disabled") return } @@ -194,13 +180,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque logger.Warn().Msg("already connected") if !manager.sessions.MercifulReconnect() { - peer.Send( - event.SYSTEM_DISCONNECT, - message.SystemDisconnect{ - Message: "already connected", - }) - - peer.Destroy() + peer.Destroy("already connected") return } diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 7ac5790c..a449a601 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -66,7 +66,7 @@ func (peer *WebSocketPeerCtx) Send(event string, payload interface{}) { Msg("sending message to client") } -func (peer *WebSocketPeerCtx) Destroy() { +func (peer *WebSocketPeerCtx) Destroy(reason string) { peer.mu.Lock() defer peer.mu.Unlock() @@ -77,7 +77,7 @@ func (peer *WebSocketPeerCtx) Destroy() { peer.Send( event.SYSTEM_DISCONNECT, message.SystemDisconnect{ - Message: "connection destroyed", + Message: reason, }) if err := peer.connection.Close(); err != nil { From 75c1dd6d226ed234cde2a6a0f9cca9cc650e9faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Sep 2021 21:58:00 +0200 Subject: [PATCH 548/876] peer close simplified logging. --- internal/webrtc/peer.go | 7 ++----- internal/websocket/peer.go | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 3f030826..c7dd5fde 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -74,11 +74,8 @@ func (peer *WebRTCPeerCtx) Destroy() { // TODO: Send webrtc disconnect event via websocket. - if err := peer.connection.Close(); err != nil { - peer.logger.Warn().Err(err).Msg("peer connection destroyed with an error") - } else { - peer.logger.Info().Msg("peer connection destroyed") - } + err := peer.connection.Close() + peer.logger.Err(err).Msg("peer connection destroyed") peer.connection = nil } diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index a449a601..266c974a 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -80,11 +80,8 @@ func (peer *WebSocketPeerCtx) Destroy(reason string) { Message: reason, }) - if err := peer.connection.Close(); err != nil { - peer.logger.Warn().Err(err).Msg("peer connection destroyed with an error") - } else { - peer.logger.Info().Msg("peer connection destroyed") - } + err := peer.connection.Close() + peer.logger.Err(err).Msg("peer connection destroyed") peer.connection = nil } From e0f1857c51fe6b2c155f0874e38a43c2ab62dba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 5 Sep 2021 22:44:16 +0200 Subject: [PATCH 549/876] fx WebRTC logging. --- internal/webrtc/manager.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index e073465c..4cc5fc83 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -153,13 +153,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // create video track videoStream, ok := manager.capture.Video(videoID) if !ok { - logger.Warn().Str("video_id", videoID).Msg("video stream not found") - return nil, err + return nil, types.ErrWebRTCVideoNotFound } videoTrack, err := webrtc.NewTrackLocalStaticSample(videoStream.Codec().Capability, "video", "stream") if err != nil { - logger.Err(err).Msg("unable to create video track") return nil, err } @@ -178,7 +176,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // should be stream started if videoStream.ListenersCount() == 0 { if err := videoStream.Start(); err != nil { - logger.Err(err).Msg("unable to start video pipeline") return nil, err } } From 9deb5adee1dafa1c6a976bf08e6c569ad308b6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Sep 2021 00:33:11 +0200 Subject: [PATCH 550/876] MemberAlreadyExists returns UnprocessableEntity. --- internal/api/members/controler.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index a6a44a94..09f626d2 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -1,6 +1,7 @@ package members import ( + "errors" "net/http" "strconv" @@ -82,7 +83,11 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { id, err := h.members.Insert(data.Username, data.Password, data.Profile) if err != nil { - utils.HttpInternalServerError(w, err) + if errors.Is(err, types.ErrMemberAlreadyExists) { + utils.HttpUnprocessableEntity(w, err) + } else { + utils.HttpInternalServerError(w, err) + } return } From 83aa2dde41e7217640a33ced52810cd3de46917a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Sep 2021 20:38:21 +0200 Subject: [PATCH 551/876] go upgrade deps. --- go.mod | 12 ++++++------ go.sum | 32 +++++++++++++------------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 738feb00..bf882cf1 100644 --- a/go.mod +++ b/go.mod @@ -8,10 +8,10 @@ require ( github.com/go-chi/cors v1.2.0 github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 - github.com/pion/interceptor v0.0.15 + github.com/pion/interceptor v0.0.18 github.com/pion/logging v0.2.2 github.com/pion/webrtc/v3 v3.0.32 - github.com/rs/zerolog v1.24.0 + github.com/rs/zerolog v1.25.0 github.com/spf13/cobra v1.2.1 github.com/spf13/viper v1.8.1 ) @@ -23,7 +23,7 @@ require ( github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/magiconair/properties v1.8.5 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect - github.com/pelletier/go-toml v1.9.3 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect github.com/pion/datachannel v1.4.21 // indirect github.com/pion/dtls/v2 v2.0.9 // indirect github.com/pion/ice/v2 v2.1.12 // indirect @@ -45,10 +45,10 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.2.0 // indirect golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect - golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect - golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect + golang.org/x/net v0.0.0-20210908191846-a5e095526f91 // indirect + golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - gopkg.in/ini.v1 v1.62.0 // indirect + gopkg.in/ini.v1 v1.63.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index ae7f167c..b3763c0c 100644 --- a/go.sum +++ b/go.sum @@ -72,7 +72,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= @@ -223,19 +222,19 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0= github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= github.com/pion/dtls/v2 v2.0.9 h1:7Ow+V++YSZQMYzggI0P9vLJz/hUFcffsfGMfT/Qy+u8= github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho= -github.com/pion/ice/v2 v2.1.10 h1:Jt/BfUsaP+Dr6E5rbsy+w7w1JtHyFN0w2DkgfWq7Fko= github.com/pion/ice/v2 v2.1.10/go.mod h1:kV4EODVD5ux2z8XncbLHIOtcXKtYXVgLVCeVqnpoeP0= github.com/pion/ice/v2 v2.1.12 h1:ZDBuZz+fEI7iDifZCYFVzI4p0Foy0YhdSSZ87ZtRcRE= github.com/pion/ice/v2 v2.1.12/go.mod h1:ovgYHUmwYLlRvcCLI67PnQ5YGe+upXZbGgllBDG/ktU= github.com/pion/interceptor v0.0.13/go.mod h1:svsW2QoLHLoGLUr4pDoSopGBEWk8FZwlfxId/OKRKzo= -github.com/pion/interceptor v0.0.15 h1:pQFkBUL8akUHiGoFr+pM94Q/15x7sLFh0K3Nj+DCC6s= -github.com/pion/interceptor v0.0.15/go.mod h1:pg3J253eGi5bqyKzA74+ej5Y19ez2jkWANVnF+Z9Dfk= +github.com/pion/interceptor v0.0.18 h1:4I4JUcvD4Efrs39AI+MEkoQ6V3RldIjh4Gqu8rcUzho= +github.com/pion/interceptor v0.0.18/go.mod h1:LNvW3RHxHSGDCXWlofLo0eEtnWinHANEDMl4xKdjfjY= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= @@ -246,7 +245,6 @@ github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo= github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/rtp v1.6.5/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.7.0 h1:UTiTgxegU97lq6oDCyBOMjR8+iZr68KN0+rBzWYEWg0= github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/rtp v1.7.2 h1:HCDKDCixh7PVjkQTsqHAbk1lg+bx059EHxcnyl42dYs= github.com/pion/rtp v1.7.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= @@ -255,7 +253,6 @@ github.com/pion/sctp v1.7.12 h1:GsatLufywVruXbZZT1CKg+Jr8ZTkwiPnmUC/oO9+uuY= github.com/pion/sctp v1.7.12/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8= github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= -github.com/pion/srtp/v2 v2.0.2 h1:664iGzVmaY7KYS5M0gleY0DscRo9ReDfTxQrq4UgGoU= github.com/pion/srtp/v2 v2.0.2/go.mod h1:VEyLv4CuxrwGY8cxM+Ng3bmVy8ckz/1t6A0q/msKOw0= github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ= github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A= @@ -282,8 +279,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.24.0 h1:76ivFxmVSRs1u2wUwJVg5VZDYQgeH1JpoS6ndgr9Wy8= -github.com/rs/zerolog v1.24.0/go.mod h1:7KHcEGe0QZPOm2IE4Kpb5rTh6n1h2hIgS5OOnu1rUaI= +github.com/rs/zerolog v1.25.0 h1:Rj7XygbUHKUlDPcVdoLyR91fJBsduXj5fRxyqIQj/II= +github.com/rs/zerolog v1.25.0/go.mod h1:7KHcEGe0QZPOm2IE4Kpb5rTh6n1h2hIgS5OOnu1rUaI= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= @@ -295,7 +292,6 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -342,7 +338,6 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -422,11 +417,10 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw= -golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210908191846-a5e095526f91 h1:E8wdt+zBjoxD3MA65wEc3pl25BsTi7tbkpwc4ANThjc= +golang.org/x/net v0.0.0-20210908191846-a5e095526f91/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -495,11 +489,11 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c= -golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 h1:6wSTsvPddg9gc/mVEEyk9oOAoxn+bT4Z9q1zx+4RwA4= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -508,7 +502,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -681,8 +674,9 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.63.0 h1:2t0h8NA59dpVQpa5Yh8cIcR6nHAeBIEk0zlLVqfw4N4= +gopkg.in/ini.v1 v1.63.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From afc79ed8479947c66511e8ec49d995ba4d87551a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Sep 2021 22:08:39 +0200 Subject: [PATCH 552/876] receive frontend logs using WS. --- internal/types/event/events.go | 1 + internal/types/message/messages.go | 8 ++++++++ internal/websocket/handler/handler.go | 7 +++++++ internal/websocket/handler/system.go | 16 ++++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index fd41b804..e16ed9ab 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -3,6 +3,7 @@ package event const ( SYSTEM_INIT = "system/init" SYSTEM_ADMIN = "system/admin" + SYSTEM_LOGS = "system/logs" SYSTEM_DISCONNECT = "system/disconnect" ) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 0649dd7d..06d63d1c 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -29,6 +29,14 @@ type SystemAdmin struct { BroadcastStatus BroadcastStatus `json:"broadcast_status"` } +type SystemLogs = []SystemLog + +type SystemLog struct { + Level string `json:"level"` + Fields map[string]string `json:"fields"` + Message string `json:"message"` +} + type SystemDisconnect struct { Message string `json:"message"` } diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 2f3b5b28..b112cfb0 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -41,6 +41,13 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM var err error switch data.Event { + // System Events + case event.SYSTEM_LOGS: + payload := &message.SystemLogs{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.systemLogs(session, payload) + }) + // Signal Events case event.SIGNAL_REQUEST: payload := &message.SignalVideo{} diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 6052e079..59f72396 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -3,6 +3,8 @@ package handler import ( "errors" + "github.com/rs/zerolog" + "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" @@ -80,3 +82,17 @@ func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { return nil } + +func (h *MessageHandlerCtx) systemLogs(session types.Session, payload *message.SystemLogs) error { + for _, log := range *payload { + level, _ := zerolog.ParseLevel(log.Level) + + h.logger.WithLevel(level). + Fields(log.Fields). + Str("session_id", session.ID()). + Str("service", "frontend"). + Msg(log.Message) + } + + return nil +} From fb2c4793251ded255385d27706d3533fb63d79e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Sep 2021 22:51:03 +0200 Subject: [PATCH 553/876] logs: interface instead of string. --- internal/types/message/messages.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 06d63d1c..bd64db7b 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -32,9 +32,9 @@ type SystemAdmin struct { type SystemLogs = []SystemLog type SystemLog struct { - Level string `json:"level"` - Fields map[string]string `json:"fields"` - Message string `json:"message"` + Level string `json:"level"` + Fields map[string]interface{} `json:"fields"` + Message string `json:"message"` } type SystemDisconnect struct { From d0e283f1a956c39859985edea7607b9fd0676649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Sep 2021 22:51:24 +0200 Subject: [PATCH 554/876] do not log info about FE log messages. --- internal/websocket/manager.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 26bb9b99..5a347425 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -245,11 +245,13 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t break } - logger.Debug(). - Str("address", connection.RemoteAddr().String()). - Str("event", data.Event). - Str("payload", string(data.Payload)). - Msg("received message from client") + if data.Event != event.SYSTEM_LOGS { + logger.Debug(). + Str("address", connection.RemoteAddr().String()). + Str("event", data.Event). + Str("payload", string(data.Payload)). + Msg("received message from client") + } handled := manager.handler.Message(session, data) for _, handler := range manager.handlers { From 51207c2b50470892df588f25452634b36040ba65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Sep 2021 22:51:37 +0200 Subject: [PATCH 555/876] FE logs: no handler context. --- internal/websocket/handler/system.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 59f72396..dae76063 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -4,6 +4,7 @@ import ( "errors" "github.com/rs/zerolog" + "github.com/rs/zerolog/log" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" @@ -84,14 +85,19 @@ func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { } func (h *MessageHandlerCtx) systemLogs(session types.Session, payload *message.SystemLogs) error { - for _, log := range *payload { - level, _ := zerolog.ParseLevel(log.Level) + for _, msg := range *payload { + level, _ := zerolog.ParseLevel(msg.Level) - h.logger.WithLevel(level). - Fields(log.Fields). + if level < zerolog.DebugLevel || level > zerolog.ErrorLevel { + level = zerolog.NoLevel + } + + // do not use handler logger context + log.WithLevel(level). + Fields(msg.Fields). Str("session_id", session.ID()). Str("service", "frontend"). - Msg(log.Message) + Msg(msg.Message) } return nil From 4f7bd48bece1a4b4a634819913452c852d8602fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Sep 2021 23:55:53 +0200 Subject: [PATCH 556/876] ws close connections on shutdown and add wg. --- internal/websocket/manager.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 5a347425..3d68d74c 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -3,6 +3,7 @@ package websocket import ( "encoding/json" "net/http" + "sync" "time" "github.com/gorilla/websocket" @@ -28,6 +29,7 @@ func New( return &WebSocketManagerCtx{ logger: logger, + shutdown: make(chan interface{}), sessions: sessions, desktop: desktop, handler: handler.New(sessions, desktop, capture, webrtc), @@ -37,6 +39,8 @@ func New( type WebSocketManagerCtx struct { logger zerolog.Logger + wg sync.WaitGroup + shutdown chan interface{} sessions types.SessionManager desktop types.DesktopManager handler *handler.MessageHandlerCtx @@ -132,7 +136,8 @@ func (manager *WebSocketManagerCtx) Start() { func (manager *WebSocketManagerCtx) Shutdown() error { manager.logger.Info().Msg("shutdown") - // TODO: Kill all connections and add waitgroup for gorutines. + close(manager.shutdown) + manager.wg.Wait() return nil } @@ -218,7 +223,10 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t ticker := time.NewTicker(pingPeriod) defer ticker.Stop() + manager.wg.Add(1) go func() { + defer manager.wg.Done() + for { _, raw, err := connection.ReadMessage() if err != nil { @@ -267,6 +275,9 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t } case <-cancel: return + case <-manager.shutdown: + connection.Close() + return case <-ticker.C: if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { logger.Err(err).Msg("ping message has failed") From d21cb9f336a6bb36e16efc7623f79407d115ed45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 12 Sep 2021 17:00:29 +0200 Subject: [PATCH 557/876] client logs use module. --- internal/websocket/handler/system.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index dae76063..86b55b9e 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -95,8 +95,8 @@ func (h *MessageHandlerCtx) systemLogs(session types.Session, payload *message.S // do not use handler logger context log.WithLevel(level). Fields(msg.Fields). + Str("module", "client"). Str("session_id", session.ID()). - Str("service", "frontend"). Msg(msg.Message) } From d46c5d9d306648be5fe05d96c0d2781f8411f0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 13 Sep 2021 23:50:16 +0200 Subject: [PATCH 558/876] desktop module use shutdown close. --- internal/desktop/manager.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 7a1fab7b..ddf8fe65 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -19,7 +19,7 @@ var mu = sync.Mutex{} type DesktopManagerCtx struct { logger zerolog.Logger wg sync.WaitGroup - shutdown chan bool + shutdown chan interface{} emmiter events.EventEmmiter config *config.Desktop } @@ -27,7 +27,7 @@ type DesktopManagerCtx struct { func New(config *config.Desktop) *DesktopManagerCtx { return &DesktopManagerCtx{ logger: log.With().Str("module", "desktop").Logger(), - shutdown: make(chan bool), + shutdown: make(chan interface{}), emmiter: events.New(), config: config, } @@ -93,7 +93,7 @@ func (manager *DesktopManagerCtx) OnAfterScreenSizeChange(listener func()) { func (manager *DesktopManagerCtx) Shutdown() error { manager.logger.Info().Msgf("shutdown") - manager.shutdown <- true + close(manager.shutdown) manager.wg.Wait() xorg.DisplayClose() From 4fa11e6a2aa5c54d172f7007cb228173335df5da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 16 Sep 2021 20:16:51 +0200 Subject: [PATCH 559/876] refactor HTTP error. --- internal/api/members/bluk.go | 11 ++- internal/api/members/controler.go | 16 ++-- internal/api/members/handler.go | 4 +- internal/api/room/broadcast.go | 8 +- internal/api/room/clipboard.go | 18 ++--- internal/api/room/control.go | 8 +- internal/api/room/handler.go | 2 +- internal/api/room/keyboard.go | 4 +- internal/api/room/screen.go | 10 +-- internal/api/room/upload.go | 38 ++++----- internal/api/router.go | 4 +- internal/api/session.go | 4 +- internal/http/auth/auth.go | 10 +-- internal/http/manager.go | 5 +- internal/utils/http.go | 126 ++++++++++++++++++++++-------- 15 files changed, 166 insertions(+), 102 deletions(-) diff --git a/internal/api/members/bluk.go b/internal/api/members/bluk.go index cb1695c4..d317b1a0 100644 --- a/internal/api/members/bluk.go +++ b/internal/api/members/bluk.go @@ -2,7 +2,6 @@ package members import ( "encoding/json" - "fmt" "io" "net/http" @@ -18,13 +17,13 @@ type MemberBulkUpdatePayload struct { func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Request) { bytes, err := io.ReadAll(r.Body) if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpBadRequest(w).WithInternalErr(err).Msg("unable to read post body") return } header := &MemberBulkUpdatePayload{} if err := json.Unmarshal(bytes, &header); err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpBadRequest(w).WithInternalErr(err).Msg("unable to unmarshal payload") return } @@ -32,7 +31,7 @@ func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Reques // TODO: Bulk select? profile, err := h.members.Select(memberId) if err != nil { - utils.HttpInternalServerError(w, fmt.Sprintf("member %s: %v", memberId, err)) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to select member profile").Msgf("failed to update member %s", memberId) return } @@ -41,12 +40,12 @@ func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Reques } if err := json.Unmarshal(bytes, &body); err != nil { - utils.HttpInternalServerError(w, fmt.Sprintf("member %s: %v", memberId, err)) + utils.HttpBadRequest(w).WithInternalErr(err).Msgf("unable to unmarshal payload for member %s", memberId) return } if err := h.members.UpdateProfile(memberId, body.Profile); err != nil { - utils.HttpInternalServerError(w, fmt.Sprintf("member %s: %v", memberId, err)) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to update member profile").Msgf("failed to update member %s", memberId) return } } diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 09f626d2..6e5990a4 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -39,7 +39,7 @@ func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { entries, err := h.members.SelectAll(limit, offset) if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } @@ -72,21 +72,21 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { } if data.Username == "" { - utils.HttpBadRequest(w, "username cannot be empty") + utils.HttpBadRequest(w).Msg("username cannot be empty") return } if data.Password == "" { - utils.HttpBadRequest(w, "password cannot be empty") + utils.HttpBadRequest(w).Msg("password cannot be empty") return } id, err := h.members.Insert(data.Username, data.Password, data.Profile) if err != nil { if errors.Is(err, types.ErrMemberAlreadyExists) { - utils.HttpUnprocessableEntity(w, err) + utils.HttpUnprocessableEntity(w).Msg("member already exists") } else { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() } return } @@ -113,7 +113,7 @@ func (h *MembersHandler) membersUpdateProfile(w http.ResponseWriter, r *http.Req } if err := h.members.UpdateProfile(member.ID, profile); err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } @@ -129,7 +129,7 @@ func (h *MembersHandler) membersUpdatePassword(w http.ResponseWriter, r *http.Re } if err := h.members.UpdatePassword(member.ID, data.Password); err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } @@ -140,7 +140,7 @@ func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) { member := GetMember(r) if err := h.members.Delete(member.ID); err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index b5d52718..4c25f94e 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -71,9 +71,9 @@ func (h *MembersHandler) ExtractMember(next http.Handler) http.Handler { profile, err := h.members.Select(memberId) if err != nil { if errors.Is(err, types.ErrMemberDoesNotExist) { - utils.HttpNotFound(w, err) + utils.HttpNotFound(w).Msg("member not found") } else { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() } return diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index d0639770..24c91a92 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -28,18 +28,18 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { } if data.URL == "" { - utils.HttpBadRequest(w, "missing broadcast URL") + utils.HttpBadRequest(w).Msg("missing broadcast URL") return } broadcast := h.capture.Broadcast() if broadcast.Started() { - utils.HttpUnprocessableEntity(w, "server is already broadcasting") + utils.HttpUnprocessableEntity(w).Msg("server is already broadcasting") return } if err := broadcast.Start(data.URL); err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } @@ -56,7 +56,7 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { broadcast := h.capture.Broadcast() if !broadcast.Started() { - utils.HttpUnprocessableEntity(w, "server is not broadcasting") + utils.HttpUnprocessableEntity(w).Msg("server is not broadcasting") return } diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 4a70da3d..6c6dfcaf 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -18,7 +18,7 @@ type ClipboardPayload struct { func (h *RoomHandler) clipboardGetText(w http.ResponseWriter, r *http.Request) { data, err := h.desktop.ClipboardGetText() if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } @@ -40,7 +40,7 @@ func (h *RoomHandler) clipboardSetText(w http.ResponseWriter, r *http.Request) { }) if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } @@ -50,7 +50,7 @@ func (h *RoomHandler) clipboardSetText(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) clipboardGetImage(w http.ResponseWriter, r *http.Request) { bytes, err := h.desktop.ClipboardGetBinary("image/png") if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } @@ -64,7 +64,7 @@ func (h *RoomHandler) clipboardGetImage(w http.ResponseWriter, r *http.Request) func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) { err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) if err != nil { - utils.HttpBadRequest(w, "failed to parse multipart form") + utils.HttpBadRequest(w).WithInternalErr(err).Msg("failed to parse multipart form") return } @@ -73,7 +73,7 @@ func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) file, header, err := r.FormFile("file") if err != nil { - utils.HttpBadRequest(w, "no file received") + utils.HttpBadRequest(w).WithInternalErr(err).Msg("no file received") return } @@ -81,20 +81,20 @@ func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) mime := header.Header.Get("Content-Type") if !strings.HasPrefix(mime, "image/") { - utils.HttpBadRequest(w, "file must be image") + utils.HttpBadRequest(w).Msg("file must be image") return } buffer := new(bytes.Buffer) _, err = buffer.ReadFrom(file) if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to read from uploaded file").Send() return } err = h.desktop.ClipboardSetBinary("image/png", buffer.Bytes()) if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable set image to clipboard").Send() return } @@ -104,7 +104,7 @@ func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) func (h *RoomHandler) clipboardGetTargets(w http.ResponseWriter, r *http.Request) { targets, err := h.desktop.ClipboardGetTargets() if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 0bd5518a..b4aeb5e1 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -36,7 +36,7 @@ func (h *RoomHandler) controlStatus(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { host := h.sessions.GetHost() if host != nil { - utils.HttpUnprocessableEntity(w, "there is already a host") + utils.HttpUnprocessableEntity(w).Msg("there is already a host") return } @@ -49,7 +49,7 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if !session.IsHost() { - utils.HttpUnprocessableEntity(w, "session is not the host") + utils.HttpUnprocessableEntity(w).Msg("session is not the host") return } @@ -71,12 +71,12 @@ func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { target, ok := h.sessions.Get(sessionId) if !ok { - utils.HttpNotFound(w, "target session was not found") + utils.HttpNotFound(w).Msg("target session was not found") return } if !target.Profile().CanHost { - utils.HttpBadRequest(w, "target session is not allowed to host") + utils.HttpBadRequest(w).Msg("target session is not allowed to host") return } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index dc1e88d9..91f0c52a 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -90,7 +90,7 @@ func (h *RoomHandler) uploadMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := auth.GetSession(r) if !session.IsHost() && (!session.Profile().CanHost || !h.sessions.ImplicitHosting()) { - utils.HttpForbidden(w, "without implicit hosting, only host can upload files") + utils.HttpForbidden(w).Msg("without implicit hosting, only host can upload files") } else { next.ServeHTTP(w, r) } diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index dd1b4c72..289faf97 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -29,7 +29,7 @@ func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) { }) if err != nil { - utils.HttpInternalServerError(w, "unable to change keyboard map") + utils.HttpInternalServerError(w, err).Send() return } @@ -40,7 +40,7 @@ func (h *RoomHandler) keyboardMapGet(w http.ResponseWriter, r *http.Request) { data, err := h.desktop.GetKeyboardMap() if err != nil { - utils.HttpInternalServerError(w, "unable to get keyboard map") + utils.HttpInternalServerError(w, err).Send() return } diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index b58b8948..925702dd 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -20,7 +20,7 @@ func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request size := h.desktop.GetScreenSize() if size == nil { - utils.HttpInternalServerError(w, "unable to get screen configuration") + utils.HttpInternalServerError(w, nil).WithInternalMsg("unable to get screen configuration").Send() return } @@ -42,7 +42,7 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R Height: data.Height, Rate: data.Rate, }); err != nil { - utils.HttpUnprocessableEntity(w, err) + utils.HttpUnprocessableEntity(w).WithInternalErr(err).Msg("cannot set screen size") return } @@ -83,7 +83,7 @@ func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) { img := h.desktop.GetScreenshotImage() bytes, err := utils.CreateJPGImage(img, quality) if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } @@ -96,13 +96,13 @@ func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) screenCastGet(w http.ResponseWriter, r *http.Request) { screencast := h.capture.Screencast() if !screencast.Enabled() { - utils.HttpBadRequest(w, "screencast pipeline is not enabled") + utils.HttpBadRequest(w).Msg("screencast pipeline is not enabled") return } bytes, err := screencast.Image() if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).Send() return } diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index b4c51fb7..c4afa22d 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -10,13 +10,15 @@ import ( "demodesk/neko/internal/utils" ) +// TODO: Extract file uploading to custom utility. + // maximum upload size of 32 MB const maxUploadSize = 32 << 20 func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { err := r.ParseMultipartForm(maxUploadSize) if err != nil { - utils.HttpBadRequest(w, "failed to parse multipart form") + utils.HttpBadRequest(w).WithInternalErr(err).Msg("failed to parse multipart form") return } @@ -25,25 +27,25 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { X, err := strconv.Atoi(r.FormValue("x")) if err != nil { - utils.HttpBadRequest(w, "no X coordinate received") + utils.HttpBadRequest(w).WithInternalErr(err).Msg("no X coordinate received") return } Y, err := strconv.Atoi(r.FormValue("y")) if err != nil { - utils.HttpBadRequest(w, "no Y coordinate received") + utils.HttpBadRequest(w).WithInternalErr(err).Msg("no Y coordinate received") return } req_files := r.MultipartForm.File["files"] if len(req_files) == 0 { - utils.HttpBadRequest(w, "no files received") + utils.HttpBadRequest(w).Msg("no files received") return } dir, err := os.MkdirTemp("", "neko-drop-*") if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to create temporary directory").Send() return } @@ -53,7 +55,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { srcFile, err := req_file.Open() if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to open uploaded file").Send() return } @@ -61,7 +63,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { dstFile, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to open destination file").Send() return } @@ -69,7 +71,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { _, err = io.Copy(dstFile, srcFile) if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to copy uploaded file to destination file").Send() return } @@ -77,7 +79,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { } if !h.desktop.DropFiles(X, Y, files) { - utils.HttpInternalServerError(w, "unable to drop files") + utils.HttpInternalServerError(w, nil).WithInternalMsg("unable to drop files").Send() return } @@ -87,7 +89,7 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { err := r.ParseMultipartForm(maxUploadSize) if err != nil { - utils.HttpBadRequest(w, "failed to parse multipart form") + utils.HttpBadRequest(w).WithInternalErr(err).Msg("failed to parse multipart form") return } @@ -95,19 +97,19 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { defer r.MultipartForm.RemoveAll() if !h.desktop.IsFileChooserDialogOpened() { - utils.HttpBadRequest(w, "open file chooser dialog first") + utils.HttpUnprocessableEntity(w).Msg("file chooser dialog is not open") return } req_files := r.MultipartForm.File["files"] if len(req_files) == 0 { - utils.HttpBadRequest(w, "no files received") + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to copy uploaded file to destination file").Send() return } dir, err := os.MkdirTemp("", "neko-dialog-*") if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to create temporary directory").Send() return } @@ -116,7 +118,7 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { srcFile, err := req_file.Open() if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to open uploaded file").Send() return } @@ -124,7 +126,7 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { dstFile, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to open destination file").Send() return } @@ -132,13 +134,13 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { _, err = io.Copy(dstFile, srcFile) if err != nil { - utils.HttpInternalServerError(w, err) + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to copy uploaded file to destination file").Send() return } } if err := h.desktop.HandleFileChooserDialog(dir); err != nil { - utils.HttpInternalServerError(w, "unable to handle file chooser dialog") + utils.HttpInternalServerError(w, err).WithInternalMsg("unable to handle file chooser dialog").Send() return } @@ -147,7 +149,7 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) uploadDialogClose(w http.ResponseWriter, r *http.Request) { if !h.desktop.IsFileChooserDialogOpened() { - utils.HttpBadRequest(w, "file chooser dialog is not open") + utils.HttpUnprocessableEntity(w).Msg("file chooser dialog is not open") return } diff --git a/internal/api/router.go b/internal/api/router.go index d37dd00b..b0e49619 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -76,9 +76,9 @@ func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { } if errors.Is(err, types.ErrSessionLoginDisabled) { - utils.HttpForbidden(w, err) + utils.HttpForbidden(w).Msg("login is disabled for this session") } else { - utils.HttpUnauthorized(w, err) + utils.HttpUnauthorized(w).WithInternalErr(err).Send() } return diff --git a/internal/api/session.go b/internal/api/session.go index aa1f0a31..79e8c294 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -28,7 +28,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { session, token, err := api.members.Login(data.Username, data.Password) if err != nil { - utils.HttpUnauthorized(w, err) + utils.HttpUnauthorized(w).WithInternalErr(err).Send() return } @@ -52,7 +52,7 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { err := api.members.Logout(session.ID()) if err != nil { - utils.HttpUnauthorized(w, err) + utils.HttpUnauthorized(w).WithInternalErr(err).Send() return } diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index 856a6913..9d25ad90 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -25,7 +25,7 @@ func AdminsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().IsAdmin { - utils.HttpForbidden(w) + utils.HttpForbidden(w).Msg("session is not admin") } else { next.ServeHTTP(w, r) } @@ -36,7 +36,7 @@ func HostsOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.IsHost() { - utils.HttpForbidden(w, "only host can do this") + utils.HttpForbidden(w).Msg("session is not host") } else { next.ServeHTTP(w, r) } @@ -47,7 +47,7 @@ func CanWatchOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().CanWatch { - utils.HttpForbidden(w) + utils.HttpForbidden(w).Msg("session cannot watch") } else { next.ServeHTTP(w, r) } @@ -58,7 +58,7 @@ func CanHostOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().CanHost { - utils.HttpForbidden(w) + utils.HttpForbidden(w).Msg("session cannot host") } else { next.ServeHTTP(w, r) } @@ -69,7 +69,7 @@ func CanAccessClipboardOnly(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := GetSession(r) if !session.Profile().CanAccessClipboard { - utils.HttpForbidden(w) + utils.HttpForbidden(w).Msg("session cannot access clipboard") } else { next.ServeHTTP(w, r) } diff --git a/internal/http/manager.go b/internal/http/manager.go index 51d3cd1d..47a461d8 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -13,7 +13,6 @@ import ( "demodesk/neko/internal/config" "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" ) type HttpManagerCtx struct { @@ -55,13 +54,13 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c if _, err := os.Stat(config.Static + r.URL.Path); !os.IsNotExist(err) { fs.ServeHTTP(w, r) } else { - utils.HttpNotFound(w) + http.NotFound(w, r) } }) } router.NotFound(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - utils.HttpNotFound(w) + http.NotFound(w, r) })) return &HttpManagerCtx{ diff --git a/internal/utils/http.go b/internal/utils/http.go index d2e6c382..0056940d 100644 --- a/internal/utils/http.go +++ b/internal/utils/http.go @@ -9,16 +9,12 @@ import ( "github.com/rs/zerolog/log" ) -type ErrResponse struct { - Message string `json:"message"` -} - func HttpJsonRequest(w http.ResponseWriter, r *http.Request, res interface{}) bool { if err := json.NewDecoder(r.Body).Decode(res); err != nil { if err == io.EOF { - HttpBadRequest(w, "no data provided") + HttpBadRequest(w).WithInternalErr(err).Msg("no data provided") } else { - HttpBadRequest(w, err) + HttpBadRequest(w).WithInternalErr(err).Msg("unable to parse provided data") } return false @@ -27,21 +23,15 @@ func HttpJsonRequest(w http.ResponseWriter, r *http.Request, res interface{}) bo return true } -func HttpJsonResponse(w http.ResponseWriter, status int, res interface{}) { +func HttpJsonResponse(w http.ResponseWriter, code int, res interface{}) { w.Header().Set("Content-Type", "application/json") - w.WriteHeader(status) + w.WriteHeader(code) if err := json.NewEncoder(w).Encode(res); err != nil { log.Err(err).Str("module", "http").Msg("sending http json response failed") } } -func HttpError(w http.ResponseWriter, status int, res interface{}) { - HttpJsonResponse(w, status, &ErrResponse{ - Message: fmt.Sprint(res), - }) -} - func HttpSuccess(w http.ResponseWriter, res ...interface{}) { if len(res) == 0 { w.WriteHeader(http.StatusNoContent) @@ -50,34 +40,108 @@ func HttpSuccess(w http.ResponseWriter, res ...interface{}) { } } -func HttpBadRequest(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusBadRequest, "bad request", res...) +// HTTPError is an error with a message and an HTTP status code. +type HTTPError struct { + Code int `json:"code"` + Message string `json:"message"` + + InternalErr error `json:"-"` + InternalMsg string `json:"-"` + + w http.ResponseWriter `json:"-"` } -func HttpUnauthorized(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusUnauthorized, "invalid or missing access token", res...) +func (e *HTTPError) Error() string { + if e.InternalMsg != "" { + return e.InternalMsg + } + return fmt.Sprintf("%d: %s", e.Code, e.Message) } -func HttpForbidden(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusForbidden, "access token does not have the required scope", res...) +func (e *HTTPError) Cause() error { + if e.InternalErr != nil { + return e.InternalErr + } + return e } -func HttpNotFound(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusNotFound, "resource not found", res...) +// WithInternalErr adds internal error information to the error +func (e *HTTPError) WithInternalErr(err error) *HTTPError { + e.InternalErr = err + return e } -func HttpUnprocessableEntity(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusUnprocessableEntity, "unprocessable entity", res...) +// WithInternalMsg adds internal message information to the error +func (e *HTTPError) WithInternalMsg(msg string) *HTTPError { + e.InternalMsg = msg + return e } -func HttpInternalServerError(w http.ResponseWriter, res ...interface{}) { - defHttpError(w, http.StatusInternalServerError, "internal server error", res...) +// WithInternalMsg adds internal formated message information to the error +func (e *HTTPError) WithInternalMsgf(fmtStr string, args ...interface{}) *HTTPError { + e.InternalMsg = fmt.Sprintf(fmtStr, args...) + return e } -func defHttpError(w http.ResponseWriter, status int, text string, res ...interface{}) { - if len(res) == 0 { - HttpError(w, status, text) - } else { - HttpError(w, status, res[0]) +// Sends error with custom formated message +func (e *HTTPError) Msgf(fmtSt string, args ...interface{}) { + e.Message = fmt.Sprintf(fmtSt, args...) + e.Send() +} + +// Sends error with custom message +func (e *HTTPError) Msg(str string) { + e.Message = str + e.Send() +} + +// Sends error with default status text +func (e *HTTPError) Send() { + if e.Message == "" { + e.Message = http.StatusText(e.Code) + } + + logger := log.Error(). + Err(e.InternalErr). + Str("module", "http"). + Int("code", e.Code) + + message := e.Message + if e.InternalMsg != "" { + message = e.InternalMsg + } + + logger.Msg(message) + HttpJsonResponse(e.w, e.Code, e) +} + +func HttpError(w http.ResponseWriter, code int) *HTTPError { + return &HTTPError{ + Code: code, + w: w, } } + +func HttpBadRequest(w http.ResponseWriter) *HTTPError { + return HttpError(w, http.StatusBadRequest) +} + +func HttpUnauthorized(w http.ResponseWriter) *HTTPError { + return HttpError(w, http.StatusUnauthorized) +} + +func HttpForbidden(w http.ResponseWriter) *HTTPError { + return HttpError(w, http.StatusForbidden) +} + +func HttpNotFound(w http.ResponseWriter) *HTTPError { + return HttpError(w, http.StatusNotFound) +} + +func HttpUnprocessableEntity(w http.ResponseWriter) *HTTPError { + return HttpError(w, http.StatusUnprocessableEntity) +} + +func HttpInternalServerError(w http.ResponseWriter, err error) *HTTPError { + return HttpError(w, http.StatusInternalServerError).WithInternalErr(err) +} From 5a7cdd31fe1f3a27eebe716d452b51e8694a55f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Sep 2021 00:24:33 +0200 Subject: [PATCH 560/876] http refactor. --- internal/http/logger.go | 173 +++++++++++++++++++++------------- internal/http/manager.go | 29 +++--- internal/http/router.go | 112 ++++++++++++++++++++++ internal/types/http.go | 28 ++++++ internal/utils/http.go | 84 +++++++---------- internal/websocket/manager.go | 12 +-- 6 files changed, 300 insertions(+), 138 deletions(-) create mode 100644 internal/http/router.go create mode 100644 internal/types/http.go diff --git a/internal/http/logger.go b/internal/http/logger.go index 419be2a7..fead8fdd 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -1,86 +1,129 @@ package http import ( + "context" "fmt" "net/http" "time" "github.com/go-chi/chi/middleware" "github.com/rs/zerolog/log" + + "demodesk/neko/internal/http/auth" + "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" ) -func Logger(next http.Handler) http.Handler { - fn := func(w http.ResponseWriter, r *http.Request) { - req := map[string]interface{}{} +type logEntryKey int - // exclude healthcheck from logs - if r.RequestURI == "/api/health" { - next.ServeHTTP(w, r) +const logEntryKeyCtx logEntryKey = iota + +func setLogEntry(r *http.Request, data logEntry) *http.Request { + ctx := context.WithValue(r.Context(), logEntryKeyCtx, data) + return r.WithContext(ctx) +} + +func getLogEntry(r *http.Request) logEntry { + return r.Context().Value(logEntryKeyCtx).(logEntry) +} + +func LoggerMiddleware(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + next.ServeHTTP(w, setLogEntry(r, newLogEntry(w, r))) + }) +} + +type logEntry struct { + req struct { + time time.Time + id string + scheme string + proto string + method string + remote string + agent string + uri string + } + res struct { + time time.Time + code int + bytes int + } + err error + elapsed time.Duration + hasSession bool + session types.Session +} + +func newLogEntry(w http.ResponseWriter, r *http.Request) logEntry { + e := logEntry{} + e.req.time = time.Now() + + if reqID := middleware.GetReqID(r.Context()); reqID != "" { + e.req.id = reqID + } + + scheme := "http" + if r.TLS != nil { + scheme = "https" + } + + e.req.scheme = scheme + e.req.proto = r.Proto + e.req.method = r.Method + e.req.remote = r.RemoteAddr + e.req.agent = r.UserAgent() + e.req.uri = fmt.Sprintf("%s://%s%s", scheme, r.Host, r.RequestURI) + return e +} + +func (e *logEntry) SetResponse(w http.ResponseWriter, r *http.Request) { + ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor) + e.res.time = time.Now() + e.res.code = ww.Status() + e.res.bytes = ww.BytesWritten() + + e.elapsed = e.res.time.Sub(e.req.time) + e.session, e.hasSession = auth.GetSession(r) +} + +func (e *logEntry) SetError(err error) { + e.err = err +} + +func (e *logEntry) Write() { + logger := log.With(). + Str("module", "http"). + Float64("elapsed", float64(e.elapsed.Nanoseconds())/1000000.0). + Interface("req", e.req). + Interface("res", e.res). + Logger() + + if e.hasSession { + logger = logger.With().Str("session_id", e.session.ID()).Logger() + } + + if e.err != nil { + httpErr, ok := e.err.(*utils.HTTPError) + if !ok { + logger.Err(e.err).Msgf("request failed (%d)", e.res.code) return } - if reqID := middleware.GetReqID(r.Context()); reqID != "" { - req["id"] = reqID + if httpErr.Message == "" { + httpErr.Message = http.StatusText(httpErr.Code) } - scheme := "http" - if r.TLS != nil { - scheme = "https" + logger := logger.Error().Err(httpErr.InternalErr) + + message := httpErr.Message + if httpErr.InternalMsg != "" { + message = httpErr.InternalMsg } - req["scheme"] = scheme - req["proto"] = r.Proto - req["method"] = r.Method - req["remote"] = r.RemoteAddr - req["agent"] = r.UserAgent() - req["uri"] = fmt.Sprintf("%s://%s%s", scheme, r.Host, r.RequestURI) - - fields := map[string]interface{}{} - fields["req"] = req - - entry := &entry{ - fields: fields, - } - - ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor) - t1 := time.Now() - - defer func() { - entry.Write(ww.Status(), ww.BytesWritten(), time.Since(t1)) - }() - - next.ServeHTTP(ww, r) + logger.Msgf("request failed (%d): %s", e.res.code, message) + return } - return http.HandlerFunc(fn) -} - -type entry struct { - fields map[string]interface{} - errors []map[string]interface{} -} - -func (e *entry) Write(status, bytes int, elapsed time.Duration) { - res := map[string]interface{}{} - res["time"] = time.Now().UTC().Format(time.RFC1123) - res["status"] = status - res["bytes"] = bytes - res["elapsed"] = float64(elapsed.Nanoseconds()) / 1000000.0 - - e.fields["res"] = res - e.fields["module"] = "http" - - if len(e.errors) > 0 { - e.fields["errors"] = e.errors - log.Error().Fields(e.fields).Msgf("request failed (%d)", status) - } else { - log.Debug().Fields(e.fields).Msgf("request complete (%d)", status) - } -} - -func (e *entry) Panic(v interface{}, stack []byte) { - err := map[string]interface{}{} - err["message"] = fmt.Sprintf("%+v", v) - err["stack"] = string(stack) - - e.errors = append(e.errors, err) + + logger.Debug().Msgf("request complete (%d)", e.res.code) } diff --git a/internal/http/manager.go b/internal/http/manager.go index 47a461d8..c5bc750d 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -5,8 +5,6 @@ import ( "net/http" "os" - "github.com/go-chi/chi" - "github.com/go-chi/chi/middleware" "github.com/go-chi/cors" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -18,16 +16,15 @@ import ( type HttpManagerCtx struct { logger zerolog.Logger config *config.Server - router *chi.Mux + router *RouterCtx http *http.Server } func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, config *config.Server) *HttpManagerCtx { logger := log.With().Str("module", "http").Logger() - router := chi.NewRouter() - router.Use(middleware.Recoverer) // Recover from panics without crashing server - router.Use(cors.Handler(cors.Options{ + router := newRouter() + router.UseBypass(cors.Handler(cors.Options{ AllowOriginFunc: func(r *http.Request, origin string) bool { return config.AllowOrigin(origin) }, @@ -37,32 +34,28 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c AllowCredentials: true, MaxAge: 300, // Maximum value not ignored by any of major browsers })) - router.Use(middleware.RequestID) // Create a request ID for each request - router.Use(Logger) // Log API request calls using custom logger function router.Route("/api", ApiManager.Route) - router.Get("/api/ws", func(w http.ResponseWriter, r *http.Request) { - WebSocketManager.Upgrade(w, r, func(r *http.Request) bool { + router.Get("/api/ws", func(w http.ResponseWriter, r *http.Request) error { + return WebSocketManager.Upgrade(w, r, func(r *http.Request) bool { return config.AllowOrigin(r.Header.Get("Origin")) }) }) if config.Static != "" { fs := http.FileServer(http.Dir(config.Static)) - router.Get("/*", func(w http.ResponseWriter, r *http.Request) { - if _, err := os.Stat(config.Static + r.URL.Path); !os.IsNotExist(err) { + router.Get("/*", func(w http.ResponseWriter, r *http.Request) error { + _, err := os.Stat(config.Static + r.URL.Path) + + if !os.IsNotExist(err) { fs.ServeHTTP(w, r) - } else { - http.NotFound(w, r) } + + return err }) } - router.NotFound(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - http.NotFound(w, r) - })) - return &HttpManagerCtx{ logger: logger, config: config, diff --git a/internal/http/router.go b/internal/http/router.go new file mode 100644 index 00000000..87679a4d --- /dev/null +++ b/internal/http/router.go @@ -0,0 +1,112 @@ +package http + +import ( + "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" + "net/http" + + "github.com/go-chi/chi" + "github.com/go-chi/chi/middleware" +) + +type RouterCtx struct { + chi chi.Router +} + +func newRouter() *RouterCtx { + router := chi.NewRouter() + router.Use(middleware.Recoverer) // Recover from panics without crashing server + router.Use(middleware.RequestID) // Create a request ID for each request + router.Use(LoggerMiddleware) + return &RouterCtx{router} +} + +func (r *RouterCtx) Group(fn func(types.Router)) { + r.chi.Group(func(c chi.Router) { + fn(&RouterCtx{c}) + }) +} + +func (r *RouterCtx) Route(pattern string, fn func(types.Router)) { + r.chi.Route(pattern, func(c chi.Router) { + fn(&RouterCtx{c}) + }) +} + +func (r *RouterCtx) Get(pattern string, fn types.RouterHandler) { + r.chi.Get(pattern, routeHandler(fn)) +} +func (r *RouterCtx) Post(pattern string, fn types.RouterHandler) { + r.chi.Post(pattern, routeHandler(fn)) +} +func (r *RouterCtx) Put(pattern string, fn types.RouterHandler) { + r.chi.Put(pattern, routeHandler(fn)) +} +func (r *RouterCtx) Delete(pattern string, fn types.RouterHandler) { + r.chi.Delete(pattern, routeHandler(fn)) +} + +func (r *RouterCtx) With(fn types.MiddlewareHandler) types.Router { + c := r.chi.With(middlewareHandler(fn)) + return &RouterCtx{c} +} + +func (r *RouterCtx) WithBypass(fn func(next http.Handler) http.Handler) types.Router { + c := r.chi.With(fn) + return &RouterCtx{c} +} + +func (r *RouterCtx) Use(fn types.MiddlewareHandler) { + r.chi.Use(middlewareHandler(fn)) +} +func (r *RouterCtx) UseBypass(fn func(next http.Handler) http.Handler) { + r.chi.Use(fn) +} + +func (r *RouterCtx) ServeHTTP(w http.ResponseWriter, req *http.Request) { + r.chi.ServeHTTP(w, req) +} + +func errorHandler(err error, w http.ResponseWriter, r *http.Request) { + httpErr, ok := err.(*utils.HTTPError) + if !ok { + httpErr = utils.HttpInternalServerError().WithInternalErr(err) + } + + utils.HttpJsonResponse(w, httpErr.Code, httpErr) +} + +func routeHandler(fn types.RouterHandler) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + logEntry := getLogEntry(r) + + if err := fn(w, r); err != nil { + logEntry.SetError(err) + errorHandler(err, w, r) + } + + logEntry.SetResponse(w, r) + logEntry.Write() + } +} + +func middlewareHandler(fn types.MiddlewareHandler) func(http.Handler) http.Handler { + return func(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + logEntry := getLogEntry(r) + + ctx, err := fn(w, r) + if err != nil { + logEntry.SetError(err) + errorHandler(err, w, r) + logEntry.SetResponse(w, r) + logEntry.Write() + return + } + if ctx != nil { + r = r.WithContext(ctx) + } + next.ServeHTTP(w, r) + }) + } +} diff --git a/internal/types/http.go b/internal/types/http.go new file mode 100644 index 00000000..3725333b --- /dev/null +++ b/internal/types/http.go @@ -0,0 +1,28 @@ +package types + +import ( + "context" + "net/http" +) + +type RouterHandler func(w http.ResponseWriter, r *http.Request) error +type MiddlewareHandler func(w http.ResponseWriter, r *http.Request) (context.Context, error) + +type Router interface { + Group(fn func(Router)) + Route(pattern string, fn func(Router)) + Get(pattern string, fn RouterHandler) + Post(pattern string, fn RouterHandler) + Put(pattern string, fn RouterHandler) + Delete(pattern string, fn RouterHandler) + With(fn MiddlewareHandler) Router + WithBypass(fn func(next http.Handler) http.Handler) Router + Use(fn MiddlewareHandler) + UseBypass(fn func(next http.Handler) http.Handler) + ServeHTTP(w http.ResponseWriter, req *http.Request) +} + +type HttpManager interface { + Start() + Shutdown() error +} diff --git a/internal/utils/http.go b/internal/utils/http.go index 0056940d..f2b6e79f 100644 --- a/internal/utils/http.go +++ b/internal/utils/http.go @@ -9,18 +9,18 @@ import ( "github.com/rs/zerolog/log" ) -func HttpJsonRequest(w http.ResponseWriter, r *http.Request, res interface{}) bool { - if err := json.NewDecoder(r.Body).Decode(res); err != nil { - if err == io.EOF { - HttpBadRequest(w).WithInternalErr(err).Msg("no data provided") - } else { - HttpBadRequest(w).WithInternalErr(err).Msg("unable to parse provided data") - } +func HttpJsonRequest(w http.ResponseWriter, r *http.Request, res interface{}) error { + err := json.NewDecoder(r.Body).Decode(res) - return false + if err == nil { + return nil } - return true + if err == io.EOF { + return HttpBadRequest("no data provided").WithInternalErr(err) + } + + return HttpBadRequest("unable to parse provided data").WithInternalErr(err) } func HttpJsonResponse(w http.ResponseWriter, code int, res interface{}) { @@ -32,12 +32,14 @@ func HttpJsonResponse(w http.ResponseWriter, code int, res interface{}) { } } -func HttpSuccess(w http.ResponseWriter, res ...interface{}) { +func HttpSuccess(w http.ResponseWriter, res ...interface{}) error { if len(res) == 0 { w.WriteHeader(http.StatusNoContent) } else { HttpJsonResponse(w, http.StatusOK, res[0]) } + + return nil } // HTTPError is an error with a message and an HTTP status code. @@ -47,8 +49,6 @@ type HTTPError struct { InternalErr error `json:"-"` InternalMsg string `json:"-"` - - w http.ResponseWriter `json:"-"` } func (e *HTTPError) Error() string { @@ -84,64 +84,50 @@ func (e *HTTPError) WithInternalMsgf(fmtStr string, args ...interface{}) *HTTPEr } // Sends error with custom formated message -func (e *HTTPError) Msgf(fmtSt string, args ...interface{}) { +func (e *HTTPError) Msgf(fmtSt string, args ...interface{}) *HTTPError { e.Message = fmt.Sprintf(fmtSt, args...) - e.Send() + return e } // Sends error with custom message -func (e *HTTPError) Msg(str string) { +func (e *HTTPError) Msg(str string) *HTTPError { e.Message = str - e.Send() + return e } -// Sends error with default status text -func (e *HTTPError) Send() { - if e.Message == "" { - e.Message = http.StatusText(e.Code) +func HttpError(code int, res ...string) *HTTPError { + err := &HTTPError{ + Code: code, + Message: http.StatusText(code), } - logger := log.Error(). - Err(e.InternalErr). - Str("module", "http"). - Int("code", e.Code) - - message := e.Message - if e.InternalMsg != "" { - message = e.InternalMsg + if len(res) == 1 { + err.Message = res[0] } - logger.Msg(message) - HttpJsonResponse(e.w, e.Code, e) + return err } -func HttpError(w http.ResponseWriter, code int) *HTTPError { - return &HTTPError{ - Code: code, - w: w, - } +func HttpBadRequest(res ...string) *HTTPError { + return HttpError(http.StatusBadRequest, res...) } -func HttpBadRequest(w http.ResponseWriter) *HTTPError { - return HttpError(w, http.StatusBadRequest) +func HttpUnauthorized(res ...string) *HTTPError { + return HttpError(http.StatusUnauthorized, res...) } -func HttpUnauthorized(w http.ResponseWriter) *HTTPError { - return HttpError(w, http.StatusUnauthorized) +func HttpForbidden(res ...string) *HTTPError { + return HttpError(http.StatusForbidden, res...) } -func HttpForbidden(w http.ResponseWriter) *HTTPError { - return HttpError(w, http.StatusForbidden) +func HttpNotFound(res ...string) *HTTPError { + return HttpError(http.StatusNotFound, res...) } -func HttpNotFound(w http.ResponseWriter) *HTTPError { - return HttpError(w, http.StatusNotFound) +func HttpUnprocessableEntity(res ...string) *HTTPError { + return HttpError(http.StatusUnprocessableEntity, res...) } -func HttpUnprocessableEntity(w http.ResponseWriter) *HTTPError { - return HttpError(w, http.StatusUnprocessableEntity) -} - -func HttpInternalServerError(w http.ResponseWriter, err error) *HTTPError { - return HttpError(w, http.StatusInternalServerError).WithInternalErr(err) +func HttpInternalServerError(res ...string) *HTTPError { + return HttpError(http.StatusInternalServerError, res...) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 3d68d74c..540447d3 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -145,7 +145,7 @@ func (manager *WebSocketManagerCtx) AddHandler(handler types.WebSocketHandler) { manager.handlers = append(manager.handlers, handler) } -func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin types.CheckOrigin) { +func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin types.CheckOrigin) error { manager.logger.Debug(). Str("address", r.RemoteAddr). Str("agent", r.UserAgent()). @@ -157,8 +157,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque connection, err := upgrader.Upgrade(w, r, nil) if err != nil { - manager.logger.Err(err).Msg("failed to upgrade connection") - return + return err } // create new peer @@ -168,7 +167,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque if err != nil { manager.logger.Warn().Err(err).Msg("authentication failed") peer.Destroy(err.Error()) - return + return nil } // add session id to all log messages @@ -178,7 +177,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque if !session.Profile().CanConnect { logger.Warn().Msg("connection disabled") peer.Destroy("connection disabled") - return + return nil } if session.State().IsConnected { @@ -186,7 +185,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque if !manager.sessions.MercifulReconnect() { peer.Destroy("already connected") - return + return nil } logger.Info().Msg("replacing peer connection") @@ -211,6 +210,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque }() manager.handle(connection, session) + return nil } func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session types.Session) { From 8d0fcbde70e66d2c1040fea3c1253dc24c1d65bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Sep 2021 00:58:50 +0200 Subject: [PATCH 561/876] use custom logger. --- internal/api/members/bluk.go | 27 +++++----- internal/api/members/controler.go | 67 +++++++++++------------ internal/api/members/handler.go | 45 +++++++--------- internal/api/room/broadcast.go | 29 +++++----- internal/api/room/clipboard.go | 56 +++++++++---------- internal/api/room/control.go | 62 ++++++++++----------- internal/api/room/handler.go | 33 ++++++------ internal/api/room/keyboard.go | 31 ++++++----- internal/api/room/screen.go | 45 ++++++++-------- internal/api/room/upload.go | 88 +++++++++++++++--------------- internal/api/router.go | 49 ++++++++--------- internal/api/session.go | 26 +++++---- internal/http/auth/auth.go | 90 ++++++++++++++----------------- internal/types/api.go | 8 +-- internal/types/websocket.go | 2 +- 15 files changed, 305 insertions(+), 353 deletions(-) diff --git a/internal/api/members/bluk.go b/internal/api/members/bluk.go index d317b1a0..808db44a 100644 --- a/internal/api/members/bluk.go +++ b/internal/api/members/bluk.go @@ -14,25 +14,25 @@ type MemberBulkUpdatePayload struct { Profile types.MemberProfile `json:"profile"` } -func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Request) error { bytes, err := io.ReadAll(r.Body) if err != nil { - utils.HttpBadRequest(w).WithInternalErr(err).Msg("unable to read post body") - return + return utils.HttpBadRequest("unable to read post body").WithInternalErr(err) } header := &MemberBulkUpdatePayload{} if err := json.Unmarshal(bytes, &header); err != nil { - utils.HttpBadRequest(w).WithInternalErr(err).Msg("unable to unmarshal payload") - return + return utils.HttpBadRequest("unable to unmarshal payload").WithInternalErr(err) } for _, memberId := range header.IDs { // TODO: Bulk select? profile, err := h.members.Select(memberId) if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to select member profile").Msgf("failed to update member %s", memberId) - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to select member profile"). + Msgf("failed to update member %s", memberId) } body := &MemberBulkUpdatePayload{ @@ -40,15 +40,18 @@ func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Reques } if err := json.Unmarshal(bytes, &body); err != nil { - utils.HttpBadRequest(w).WithInternalErr(err).Msgf("unable to unmarshal payload for member %s", memberId) - return + return utils.HttpBadRequest(). + WithInternalErr(err). + Msgf("unable to unmarshal payload for member %s", memberId) } if err := h.members.UpdateProfile(memberId, body.Profile); err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to update member profile").Msgf("failed to update member %s", memberId) - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to update member profile"). + Msgf("failed to update member %s", memberId) } } - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 6e5990a4..d26d979d 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -24,7 +24,7 @@ type MemberPasswordPayload struct { Password string `json:"password"` } -func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) error { limit, err := strconv.Atoi(r.URL.Query().Get("limit")) if err != nil { // TODO: Default zero. @@ -39,8 +39,7 @@ func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { entries, err := h.members.SelectAll(limit, offset) if err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } members := []MemberDataPayload{} @@ -51,10 +50,10 @@ func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) { }) } - utils.HttpSuccess(w, members) + return utils.HttpSuccess(w, members) } -func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) error { data := &MemberCreatePayload{ // default values Profile: types.MemberProfile{ @@ -67,82 +66,76 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) { }, } - if !utils.HttpJsonRequest(w, r, data) { - return + if err := utils.HttpJsonRequest(w, r, data); err != nil { + return err } if data.Username == "" { - utils.HttpBadRequest(w).Msg("username cannot be empty") - return + return utils.HttpBadRequest("username cannot be empty") } if data.Password == "" { - utils.HttpBadRequest(w).Msg("password cannot be empty") - return + return utils.HttpBadRequest("password cannot be empty") } id, err := h.members.Insert(data.Username, data.Password, data.Profile) if err != nil { if errors.Is(err, types.ErrMemberAlreadyExists) { - utils.HttpUnprocessableEntity(w).Msg("member already exists") - } else { - utils.HttpInternalServerError(w, err).Send() + return utils.HttpUnprocessableEntity("member already exists") } - return + + return utils.HttpInternalServerError().WithInternalErr(err) } - utils.HttpSuccess(w, MemberDataPayload{ + return utils.HttpSuccess(w, MemberDataPayload{ ID: id, Profile: data.Profile, }) } -func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) error { member := GetMember(r) profile := member.Profile - utils.HttpSuccess(w, profile) + return utils.HttpSuccess(w, profile) } -func (h *MembersHandler) membersUpdateProfile(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersUpdateProfile(w http.ResponseWriter, r *http.Request) error { member := GetMember(r) - profile := member.Profile + data := &member.Profile - if !utils.HttpJsonRequest(w, r, &profile) { - return + if err := utils.HttpJsonRequest(w, r, data); err != nil { + return err } - if err := h.members.UpdateProfile(member.ID, profile); err != nil { - utils.HttpInternalServerError(w, err).Send() - return + if err := h.members.UpdateProfile(member.ID, *data); err != nil { + return utils.HttpInternalServerError().WithInternalErr(err) } - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *MembersHandler) membersUpdatePassword(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersUpdatePassword(w http.ResponseWriter, r *http.Request) error { member := GetMember(r) - data := MemberPasswordPayload{} + data := &MemberPasswordPayload{} - if !utils.HttpJsonRequest(w, r, &data) { - return + if err := utils.HttpJsonRequest(w, r, data); err != nil { + return err } if err := h.members.UpdatePassword(member.ID, data.Password); err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) { +func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) error { member := GetMember(r) if err := h.members.Delete(member.ID); err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 4c25f94e..276c3b40 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -30,12 +30,12 @@ func New( } } -func (h *MembersHandler) Route(r chi.Router) { +func (h *MembersHandler) Route(r types.Router) { r.Get("/", h.membersList) - r.With(auth.AdminsOnly).Group(func(r chi.Router) { + r.With(auth.AdminsOnly).Group(func(r types.Router) { r.Post("/", h.membersCreate) - r.With(h.ExtractMember).Route("/{memberId}", func(r chi.Router) { + r.With(h.ExtractMember).Route("/{memberId}", func(r types.Router) { r.Get("/", h.membersRead) r.Post("/", h.membersUpdateProfile) r.Post("/password", h.membersUpdatePassword) @@ -44,8 +44,8 @@ func (h *MembersHandler) Route(r chi.Router) { }) } -func (h *MembersHandler) RouteBulk(r chi.Router) { - r.With(auth.AdminsOnly).Group(func(r chi.Router) { +func (h *MembersHandler) RouteBulk(r types.Router) { + r.With(auth.AdminsOnly).Group(func(r types.Router) { r.Post("/update", h.membersBulkUpdate) }) } @@ -55,33 +55,28 @@ type MemberData struct { Profile types.MemberProfile } -func SetMember(r *http.Request, session MemberData) *http.Request { - ctx := context.WithValue(r.Context(), keyMemberCtx, session) - return r.WithContext(ctx) +func SetMember(r *http.Request, session MemberData) context.Context { + return context.WithValue(r.Context(), keyMemberCtx, session) } func GetMember(r *http.Request) MemberData { return r.Context().Value(keyMemberCtx).(MemberData) } -func (h *MembersHandler) ExtractMember(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - memberId := chi.URLParam(r, "memberId") +func (h *MembersHandler) ExtractMember(w http.ResponseWriter, r *http.Request) (context.Context, error) { + memberId := chi.URLParam(r, "memberId") - profile, err := h.members.Select(memberId) - if err != nil { - if errors.Is(err, types.ErrMemberDoesNotExist) { - utils.HttpNotFound(w).Msg("member not found") - } else { - utils.HttpInternalServerError(w, err).Send() - } - - return + profile, err := h.members.Select(memberId) + if err != nil { + if errors.Is(err, types.ErrMemberDoesNotExist) { + return nil, utils.HttpNotFound("member not found") } - next.ServeHTTP(w, SetMember(r, MemberData{ - ID: memberId, - Profile: profile, - })) - }) + return nil, utils.HttpInternalServerError().WithInternalErr(err) + } + + return SetMember(r, MemberData{ + ID: memberId, + Profile: profile, + }), nil } diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index 24c91a92..c7afef9f 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -13,34 +13,32 @@ type BroadcastStatusPayload struct { IsActive bool `json:"is_active"` } -func (h *RoomHandler) broadcastStatus(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) broadcastStatus(w http.ResponseWriter, r *http.Request) error { broadcast := h.capture.Broadcast() - utils.HttpSuccess(w, BroadcastStatusPayload{ + + return utils.HttpSuccess(w, BroadcastStatusPayload{ IsActive: broadcast.Started(), URL: broadcast.Url(), }) } -func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) error { data := &BroadcastStatusPayload{} - if !utils.HttpJsonRequest(w, r, data) { - return + if err := utils.HttpJsonRequest(w, r, data); err != nil { + return err } if data.URL == "" { - utils.HttpBadRequest(w).Msg("missing broadcast URL") - return + return utils.HttpBadRequest("missing broadcast URL") } broadcast := h.capture.Broadcast() if broadcast.Started() { - utils.HttpUnprocessableEntity(w).Msg("server is already broadcasting") - return + return utils.HttpUnprocessableEntity("server is already broadcasting") } if err := broadcast.Start(data.URL); err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } h.sessions.AdminBroadcast( @@ -50,14 +48,13 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) { URL: broadcast.Url(), }, nil) - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) error { broadcast := h.capture.Broadcast() if !broadcast.Started() { - utils.HttpUnprocessableEntity(w).Msg("server is not broadcasting") - return + return utils.HttpUnprocessableEntity("server is not broadcasting") } broadcast.Stop() @@ -69,5 +66,5 @@ func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) { URL: broadcast.Url(), }, nil) - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 6c6dfcaf..203282c4 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -4,6 +4,7 @@ import ( // TODO: Unused now. //"bytes" //"strings" + "net/http" "demodesk/neko/internal/types" @@ -15,23 +16,22 @@ type ClipboardPayload struct { HTML string `json:"html,omitempty"` } -func (h *RoomHandler) clipboardGetText(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) clipboardGetText(w http.ResponseWriter, r *http.Request) error { data, err := h.desktop.ClipboardGetText() if err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } - utils.HttpSuccess(w, ClipboardPayload{ + return utils.HttpSuccess(w, ClipboardPayload{ Text: data.Text, HTML: data.HTML, }) } -func (h *RoomHandler) clipboardSetText(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) clipboardSetText(w http.ResponseWriter, r *http.Request) error { data := &ClipboardPayload{} - if !utils.HttpJsonRequest(w, r, data) { - return + if err := utils.HttpJsonRequest(w, r, data); err != nil { + return err } err := h.desktop.ClipboardSetText(types.ClipboardText{ @@ -40,32 +40,30 @@ func (h *RoomHandler) clipboardSetText(w http.ResponseWriter, r *http.Request) { }) if err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *RoomHandler) clipboardGetImage(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) clipboardGetImage(w http.ResponseWriter, r *http.Request) error { bytes, err := h.desktop.ClipboardGetBinary("image/png") if err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") w.Header().Set("Content-Type", "image/png") - //nolint - w.Write(bytes) + + _, err = w.Write(bytes) + return err } /* TODO: Unused now. -func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) error { err := r.ParseMultipartForm(MAX_UPLOAD_SIZE) if err != nil { - utils.HttpBadRequest(w).WithInternalErr(err).Msg("failed to parse multipart form") - return + return utils.HttpBadRequest("failed to parse multipart form").WithInternalErr(err) } //nolint @@ -73,41 +71,37 @@ func (h *RoomHandler) clipboardSetImage(w http.ResponseWriter, r *http.Request) file, header, err := r.FormFile("file") if err != nil { - utils.HttpBadRequest(w).WithInternalErr(err).Msg("no file received") - return + return utils.HttpBadRequest("no file received").WithInternalErr(err) } defer file.Close() mime := header.Header.Get("Content-Type") if !strings.HasPrefix(mime, "image/") { - utils.HttpBadRequest(w).Msg("file must be image") - return + return utils.HttpBadRequest("file must be image") } buffer := new(bytes.Buffer) _, err = buffer.ReadFrom(file) if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to read from uploaded file").Send() - return + return utils.HttpInternalServerError().WithInternalErr(err).WithInternalMsg("unable to read from uploaded file") } err = h.desktop.ClipboardSetBinary("image/png", buffer.Bytes()) if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable set image to clipboard").Send() - return + return utils.HttpInternalServerError().WithInternalErr(err).WithInternalMsg("unable set image to clipboard") } - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *RoomHandler) clipboardGetTargets(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) clipboardGetTargets(w http.ResponseWriter, r *http.Request) error { targets, err := h.desktop.ClipboardGetTargets() if err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } - utils.HttpSuccess(w, targets) + return utils.HttpSuccess(w, targets) } + */ diff --git a/internal/api/room/control.go b/internal/api/room/control.go index b4aeb5e1..400df38c 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -18,82 +18,76 @@ type ControlTargetPayload struct { ID string `json:"id"` } -func (h *RoomHandler) controlStatus(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) controlStatus(w http.ResponseWriter, r *http.Request) error { host := h.sessions.GetHost() - if host == nil { - utils.HttpSuccess(w, ControlStatusPayload{ - HasHost: false, - }) - } else { - utils.HttpSuccess(w, ControlStatusPayload{ + if host != nil { + return utils.HttpSuccess(w, ControlStatusPayload{ HasHost: true, HostId: host.ID(), }) } + + return utils.HttpSuccess(w, ControlStatusPayload{ + HasHost: false, + }) } -func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) error { host := h.sessions.GetHost() if host != nil { - utils.HttpUnprocessableEntity(w).Msg("there is already a host") - return + return utils.HttpUnprocessableEntity("there is already a host") } - session := auth.GetSession(r) + session, _ := auth.GetSession(r) h.sessions.SetHost(session) - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { - session := auth.GetSession(r) +func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) error { + session, _ := auth.GetSession(r) if !session.IsHost() { - utils.HttpUnprocessableEntity(w).Msg("session is not the host") - return + return utils.HttpUnprocessableEntity("session is not the host") } h.desktop.ResetKeys() h.sessions.ClearHost() - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { - session := auth.GetSession(r) +func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) error { + session, _ := auth.GetSession(r) h.sessions.SetHost(session) - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) error { sessionId := chi.URLParam(r, "sessionId") target, ok := h.sessions.Get(sessionId) if !ok { - utils.HttpNotFound(w).Msg("target session was not found") - return + return utils.HttpNotFound("target session was not found") } if !target.Profile().CanHost { - utils.HttpBadRequest(w).Msg("target session is not allowed to host") - return + return utils.HttpBadRequest("target session is not allowed to host") } h.sessions.SetHost(target) - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *RoomHandler) controlReset(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) controlReset(w http.ResponseWriter, r *http.Request) error { host := h.sessions.GetHost() - if host == nil { - utils.HttpSuccess(w) - return + + if host != nil { + h.desktop.ResetKeys() + h.sessions.ClearHost() } - h.desktop.ResetKeys() - h.sessions.ClearHost() - - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 91f0c52a..254f722f 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -1,10 +1,9 @@ package room import ( + "context" "net/http" - "github.com/go-chi/chi" - "demodesk/neko/internal/http/auth" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" @@ -30,14 +29,14 @@ func New( } } -func (h *RoomHandler) Route(r chi.Router) { - r.With(auth.AdminsOnly).Route("/broadcast", func(r chi.Router) { +func (h *RoomHandler) Route(r types.Router) { + r.With(auth.AdminsOnly).Route("/broadcast", func(r types.Router) { r.Get("/", h.broadcastStatus) r.Post("/start", h.boradcastStart) r.Post("/stop", h.boradcastStop) }) - r.With(auth.CanAccessClipboardOnly).With(auth.HostsOnly).Route("/clipboard", func(r chi.Router) { + r.With(auth.CanAccessClipboardOnly).With(auth.HostsOnly).Route("/clipboard", func(r types.Router) { r.Get("/", h.clipboardGetText) r.Post("/", h.clipboardSetText) r.Get("/image.png", h.clipboardGetImage) @@ -52,7 +51,7 @@ func (h *RoomHandler) Route(r chi.Router) { //r.Get("/targets", h.clipboardGetTargets) }) - r.With(auth.CanHostOnly).Route("/keyboard", func(r chi.Router) { + r.With(auth.CanHostOnly).Route("/keyboard", func(r types.Router) { r.Get("/map", h.keyboardMapGet) r.With(auth.HostsOnly).Post("/map", h.keyboardMapSet) @@ -60,7 +59,7 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.HostsOnly).Post("/modifiers", h.keyboardModifiersSet) }) - r.With(auth.CanHostOnly).Route("/control", func(r chi.Router) { + r.With(auth.CanHostOnly).Route("/control", func(r types.Router) { r.Get("/", h.controlStatus) r.Post("/request", h.controlRequest) r.Post("/release", h.controlRelease) @@ -70,7 +69,7 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Post("/reset", h.controlReset) }) - r.With(auth.CanWatchOnly).Route("/screen", func(r chi.Router) { + r.With(auth.CanWatchOnly).Route("/screen", func(r types.Router) { r.Get("/", h.screenConfiguration) r.With(auth.AdminsOnly).Post("/", h.screenConfigurationChange) r.With(auth.AdminsOnly).Get("/configurations", h.screenConfigurationsList) @@ -79,20 +78,18 @@ func (h *RoomHandler) Route(r chi.Router) { r.With(auth.AdminsOnly).Get("/shot.jpg", h.screenShotGet) }) - r.With(h.uploadMiddleware).Route("/upload", func(r chi.Router) { + r.With(h.uploadMiddleware).Route("/upload", func(r types.Router) { r.Post("/drop", h.uploadDrop) r.Post("/dialog", h.uploadDialogPost) r.Delete("/dialog", h.uploadDialogClose) }) } -func (h *RoomHandler) uploadMiddleware(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - session := auth.GetSession(r) - if !session.IsHost() && (!session.Profile().CanHost || !h.sessions.ImplicitHosting()) { - utils.HttpForbidden(w).Msg("without implicit hosting, only host can upload files") - } else { - next.ServeHTTP(w, r) - } - }) +func (h *RoomHandler) uploadMiddleware(w http.ResponseWriter, r *http.Request) (context.Context, error) { + session, ok := auth.GetSession(r) + if !ok || (!session.IsHost() && (!session.Profile().CanHost || !h.sessions.ImplicitHosting())) { + return nil, utils.HttpForbidden("without implicit hosting, only host can upload files") + } + + return nil, nil } diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 289faf97..91cccab0 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -17,10 +17,10 @@ type KeyboardModifiersData struct { CapsLock *bool `json:"capslock"` } -func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) error { data := &KeyboardMapData{} - if !utils.HttpJsonRequest(w, r, data) { - return + if err := utils.HttpJsonRequest(w, r, data); err != nil { + return err } err := h.desktop.SetKeyboardMap(types.KeyboardMap{ @@ -29,44 +29,43 @@ func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) { }) if err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *RoomHandler) keyboardMapGet(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) keyboardMapGet(w http.ResponseWriter, r *http.Request) error { data, err := h.desktop.GetKeyboardMap() if err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } - utils.HttpSuccess(w, KeyboardMapData{ + return utils.HttpSuccess(w, KeyboardMapData{ Layout: data.Layout, Variant: data.Variant, }) } -func (h *RoomHandler) keyboardModifiersSet(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) keyboardModifiersSet(w http.ResponseWriter, r *http.Request) error { data := &KeyboardModifiersData{} - if !utils.HttpJsonRequest(w, r, data) { - return + if err := utils.HttpJsonRequest(w, r, data); err != nil { + return err } h.desktop.SetKeyboardModifiers(types.KeyboardModifiers{ NumLock: data.NumLock, CapsLock: data.CapsLock, }) - utils.HttpSuccess(w) + + return utils.HttpSuccess(w) } -func (h *RoomHandler) keyboardModifiersGet(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) keyboardModifiersGet(w http.ResponseWriter, r *http.Request) error { data := h.desktop.GetKeyboardModifiers() - utils.HttpSuccess(w, KeyboardModifiersData{ + return utils.HttpSuccess(w, KeyboardModifiersData{ NumLock: data.NumLock, CapsLock: data.CapsLock, }) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 925702dd..67c658ef 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -16,25 +16,24 @@ type ScreenConfigurationPayload struct { Rate int16 `json:"rate"` } -func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request) error { size := h.desktop.GetScreenSize() if size == nil { - utils.HttpInternalServerError(w, nil).WithInternalMsg("unable to get screen configuration").Send() - return + return utils.HttpInternalServerError().WithInternalMsg("unable to get screen configuration") } - utils.HttpSuccess(w, ScreenConfigurationPayload{ + return utils.HttpSuccess(w, ScreenConfigurationPayload{ Width: size.Width, Height: size.Height, Rate: size.Rate, }) } -func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.Request) error { data := &ScreenConfigurationPayload{} - if !utils.HttpJsonRequest(w, r, data) { - return + if err := utils.HttpJsonRequest(w, r, data); err != nil { + return err } if err := h.desktop.SetScreenSize(types.ScreenSize{ @@ -42,8 +41,7 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R Height: data.Height, Rate: data.Rate, }); err != nil { - utils.HttpUnprocessableEntity(w).WithInternalErr(err).Msg("cannot set screen size") - return + return utils.HttpUnprocessableEntity("cannot set screen size").WithInternalErr(err) } h.sessions.Broadcast( @@ -54,10 +52,10 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R Rate: data.Rate, }, nil) - utils.HttpSuccess(w, data) + return utils.HttpSuccess(w, data) } -func (h *RoomHandler) screenConfigurationsList(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) screenConfigurationsList(w http.ResponseWriter, r *http.Request) error { list := []ScreenConfigurationPayload{} ScreenConfigurations := h.desktop.ScreenConfigurations() @@ -71,10 +69,10 @@ func (h *RoomHandler) screenConfigurationsList(w http.ResponseWriter, r *http.Re } } - utils.HttpSuccess(w, list) + return utils.HttpSuccess(w, list) } -func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) error { quality, err := strconv.Atoi(r.URL.Query().Get("quality")) if err != nil { quality = 90 @@ -83,31 +81,30 @@ func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) { img := h.desktop.GetScreenshotImage() bytes, err := utils.CreateJPGImage(img, quality) if err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") w.Header().Set("Content-Type", "image/jpeg") - //nolint - w.Write(bytes) + + _, err = w.Write(bytes) + return err } -func (h *RoomHandler) screenCastGet(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) screenCastGet(w http.ResponseWriter, r *http.Request) error { screencast := h.capture.Screencast() if !screencast.Enabled() { - utils.HttpBadRequest(w).Msg("screencast pipeline is not enabled") - return + return utils.HttpBadRequest("screencast pipeline is not enabled") } bytes, err := screencast.Image() if err != nil { - utils.HttpInternalServerError(w, err).Send() - return + return utils.HttpInternalServerError().WithInternalErr(err) } w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") w.Header().Set("Content-Type", "image/jpeg") - //nolint - w.Write(bytes) + + _, err = w.Write(bytes) + return err } diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index c4afa22d..894bcead 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -15,11 +15,10 @@ import ( // maximum upload size of 32 MB const maxUploadSize = 32 << 20 -func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) error { err := r.ParseMultipartForm(maxUploadSize) if err != nil { - utils.HttpBadRequest(w).WithInternalErr(err).Msg("failed to parse multipart form") - return + return utils.HttpBadRequest("failed to parse multipart form").WithInternalErr(err) } //nolint @@ -27,26 +26,24 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { X, err := strconv.Atoi(r.FormValue("x")) if err != nil { - utils.HttpBadRequest(w).WithInternalErr(err).Msg("no X coordinate received") - return + return utils.HttpBadRequest("no X coordinate received").WithInternalErr(err) } Y, err := strconv.Atoi(r.FormValue("y")) if err != nil { - utils.HttpBadRequest(w).WithInternalErr(err).Msg("no Y coordinate received") - return + return utils.HttpBadRequest("no Y coordinate received").WithInternalErr(err) } req_files := r.MultipartForm.File["files"] if len(req_files) == 0 { - utils.HttpBadRequest(w).Msg("no files received") - return + return utils.HttpBadRequest("no files received") } dir, err := os.MkdirTemp("", "neko-drop-*") if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to create temporary directory").Send() - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to create temporary directory") } files := []string{} @@ -55,62 +52,65 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) { srcFile, err := req_file.Open() if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to open uploaded file").Send() - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to open uploaded file") } defer srcFile.Close() dstFile, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to open destination file").Send() - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to open destination file") } defer dstFile.Close() _, err = io.Copy(dstFile, srcFile) if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to copy uploaded file to destination file").Send() - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to copy uploaded file to destination file") } files = append(files, path) } if !h.desktop.DropFiles(X, Y, files) { - utils.HttpInternalServerError(w, nil).WithInternalMsg("unable to drop files").Send() - return + return utils.HttpInternalServerError(). + WithInternalMsg("unable to drop files") } - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) error { err := r.ParseMultipartForm(maxUploadSize) if err != nil { - utils.HttpBadRequest(w).WithInternalErr(err).Msg("failed to parse multipart form") - return + return utils.HttpBadRequest("failed to parse multipart form").WithInternalErr(err) } //nolint defer r.MultipartForm.RemoveAll() if !h.desktop.IsFileChooserDialogOpened() { - utils.HttpUnprocessableEntity(w).Msg("file chooser dialog is not open") - return + return utils.HttpUnprocessableEntity("file chooser dialog is not open") } req_files := r.MultipartForm.File["files"] if len(req_files) == 0 { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to copy uploaded file to destination file").Send() - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to copy uploaded file to destination file") } dir, err := os.MkdirTemp("", "neko-dialog-*") if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to create temporary directory").Send() - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to create temporary directory") } for _, req_file := range req_files { @@ -118,41 +118,45 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) { srcFile, err := req_file.Open() if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to open uploaded file").Send() - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to open uploaded file") } defer srcFile.Close() dstFile, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to open destination file").Send() - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to open destination file") } defer dstFile.Close() _, err = io.Copy(dstFile, srcFile) if err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to copy uploaded file to destination file").Send() - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to copy uploaded file to destination file") } } if err := h.desktop.HandleFileChooserDialog(dir); err != nil { - utils.HttpInternalServerError(w, err).WithInternalMsg("unable to handle file chooser dialog").Send() - return + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to handle file chooser dialog") } - utils.HttpSuccess(w) + return utils.HttpSuccess(w) } -func (h *RoomHandler) uploadDialogClose(w http.ResponseWriter, r *http.Request) { +func (h *RoomHandler) uploadDialogClose(w http.ResponseWriter, r *http.Request) error { if !h.desktop.IsFileChooserDialogOpened() { - utils.HttpUnprocessableEntity(w).Msg("file chooser dialog is not open") - return + return utils.HttpUnprocessableEntity("file chooser dialog is not open") } h.desktop.CloseFileChooserDialog() - utils.HttpSuccess(w) + + return utils.HttpSuccess(w) } diff --git a/internal/api/router.go b/internal/api/router.go index b0e49619..c64b9e68 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -1,11 +1,10 @@ package api import ( + "context" "errors" "net/http" - "github.com/go-chi/chi" - "demodesk/neko/internal/api/members" "demodesk/neko/internal/api/room" "demodesk/neko/internal/config" @@ -19,7 +18,7 @@ type ApiManagerCtx struct { members types.MemberManager desktop types.DesktopManager capture types.CaptureManager - routers map[string]func(chi.Router) + routers map[string]func(types.Router) } func New( @@ -35,15 +34,15 @@ func New( members: members, desktop: desktop, capture: capture, - routers: make(map[string]func(chi.Router)), + routers: make(map[string]func(types.Router)), } } -func (api *ApiManagerCtx) Route(r chi.Router) { +func (api *ApiManagerCtx) Route(r types.Router) { r.Post("/login", api.Login) // Authenticated area - r.Group(func(r chi.Router) { + r.Group(func(r types.Router) { r.Use(api.Authenticate) r.Post("/logout", api.Logout) @@ -61,33 +60,29 @@ func (api *ApiManagerCtx) Route(r chi.Router) { } }) - r.Get("/health", func(w http.ResponseWriter, r *http.Request) { - //nolint - w.Write([]byte("true")) + r.Get("/health", func(w http.ResponseWriter, r *http.Request) error { + _, err := w.Write([]byte("true")) + return err }) } -func (api *ApiManagerCtx) Authenticate(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - session, err := api.sessions.Authenticate(r) - if err != nil { - if api.sessions.CookieEnabled() { - api.sessions.CookieClearToken(w, r) - } - - if errors.Is(err, types.ErrSessionLoginDisabled) { - utils.HttpForbidden(w).Msg("login is disabled for this session") - } else { - utils.HttpUnauthorized(w).WithInternalErr(err).Send() - } - - return +func (api *ApiManagerCtx) Authenticate(w http.ResponseWriter, r *http.Request) (context.Context, error) { + session, err := api.sessions.Authenticate(r) + if err != nil { + if api.sessions.CookieEnabled() { + api.sessions.CookieClearToken(w, r) } - next.ServeHTTP(w, auth.SetSession(r, session)) - }) + if errors.Is(err, types.ErrSessionLoginDisabled) { + return nil, utils.HttpForbidden("login is disabled for this session") + } + + return nil, utils.HttpUnauthorized().WithInternalErr(err) + } + + return auth.SetSession(r, session), nil } -func (api *ApiManagerCtx) AddRouter(path string, router func(chi.Router)) { +func (api *ApiManagerCtx) AddRouter(path string, router func(types.Router)) { api.routers[path] = router } diff --git a/internal/api/session.go b/internal/api/session.go index 79e8c294..7e97434d 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -20,16 +20,15 @@ type SessionDataPayload struct { State types.SessionState `json:"state"` } -func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { +func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) error { data := &SessionLoginPayload{} - if !utils.HttpJsonRequest(w, r, data) { - return + if err := utils.HttpJsonRequest(w, r, data); err != nil { + return err } session, token, err := api.members.Login(data.Username, data.Password) if err != nil { - utils.HttpUnauthorized(w).WithInternalErr(err).Send() - return + return utils.HttpUnauthorized().WithInternalErr(err) } sessionData := SessionDataPayload{ @@ -44,29 +43,28 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) { sessionData.Token = token } - utils.HttpSuccess(w, sessionData) + return utils.HttpSuccess(w, sessionData) } -func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) { - session := auth.GetSession(r) +func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) error { + session, _ := auth.GetSession(r) err := api.members.Logout(session.ID()) if err != nil { - utils.HttpUnauthorized(w).WithInternalErr(err).Send() - return + return utils.HttpUnauthorized().WithInternalErr(err) } if api.sessions.CookieEnabled() { api.sessions.CookieClearToken(w, r) } - utils.HttpSuccess(w, true) + return utils.HttpSuccess(w, true) } -func (api *ApiManagerCtx) Whoami(w http.ResponseWriter, r *http.Request) { - session := auth.GetSession(r) +func (api *ApiManagerCtx) Whoami(w http.ResponseWriter, r *http.Request) error { + session, _ := auth.GetSession(r) - utils.HttpSuccess(w, SessionDataPayload{ + return utils.HttpSuccess(w, SessionDataPayload{ ID: session.ID(), Profile: session.Profile(), State: session.State(), diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index 9d25ad90..2b350e63 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -12,66 +12,56 @@ type key int const keySessionCtx key = iota -func SetSession(r *http.Request, session types.Session) *http.Request { - ctx := context.WithValue(r.Context(), keySessionCtx, session) - return r.WithContext(ctx) +func SetSession(r *http.Request, session types.Session) context.Context { + return context.WithValue(r.Context(), keySessionCtx, session) } -func GetSession(r *http.Request) types.Session { - return r.Context().Value(keySessionCtx).(types.Session) +func GetSession(r *http.Request) (types.Session, bool) { + session, ok := r.Context().Value(keySessionCtx).(types.Session) + return session, ok } -func AdminsOnly(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - session := GetSession(r) - if !session.Profile().IsAdmin { - utils.HttpForbidden(w).Msg("session is not admin") - } else { - next.ServeHTTP(w, r) - } - }) +func AdminsOnly(w http.ResponseWriter, r *http.Request) (context.Context, error) { + session, ok := GetSession(r) + if !ok || !session.Profile().IsAdmin { + return nil, utils.HttpForbidden("session is not admin") + } + + return nil, nil } -func HostsOnly(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - session := GetSession(r) - if !session.IsHost() { - utils.HttpForbidden(w).Msg("session is not host") - } else { - next.ServeHTTP(w, r) - } - }) +func HostsOnly(w http.ResponseWriter, r *http.Request) (context.Context, error) { + session, ok := GetSession(r) + if !ok || !session.IsHost() { + return nil, utils.HttpForbidden("session is not host") + } + + return nil, nil } -func CanWatchOnly(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - session := GetSession(r) - if !session.Profile().CanWatch { - utils.HttpForbidden(w).Msg("session cannot watch") - } else { - next.ServeHTTP(w, r) - } - }) +func CanWatchOnly(w http.ResponseWriter, r *http.Request) (context.Context, error) { + session, ok := GetSession(r) + if !ok || !session.Profile().CanWatch { + return nil, utils.HttpForbidden("session cannot watch") + } + + return nil, nil } -func CanHostOnly(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - session := GetSession(r) - if !session.Profile().CanHost { - utils.HttpForbidden(w).Msg("session cannot host") - } else { - next.ServeHTTP(w, r) - } - }) +func CanHostOnly(w http.ResponseWriter, r *http.Request) (context.Context, error) { + session, ok := GetSession(r) + if !ok || !session.Profile().CanHost { + return nil, utils.HttpForbidden("session cannot host") + } + + return nil, nil } -func CanAccessClipboardOnly(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - session := GetSession(r) - if !session.Profile().CanAccessClipboard { - utils.HttpForbidden(w).Msg("session cannot access clipboard") - } else { - next.ServeHTTP(w, r) - } - }) +func CanAccessClipboardOnly(w http.ResponseWriter, r *http.Request) (context.Context, error) { + session, ok := GetSession(r) + if !ok || !session.Profile().CanAccessClipboard { + return nil, utils.HttpForbidden("session cannot access clipboard") + } + + return nil, nil } diff --git a/internal/types/api.go b/internal/types/api.go index 16571b91..d9625bb3 100644 --- a/internal/types/api.go +++ b/internal/types/api.go @@ -1,10 +1,6 @@ package types -import ( - "github.com/go-chi/chi" -) - type ApiManager interface { - Route(r chi.Router) - AddRouter(path string, router func(chi.Router)) + Route(r Router) + AddRouter(path string, router func(Router)) } diff --git a/internal/types/websocket.go b/internal/types/websocket.go index 885a0c41..e8c22d6f 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -23,5 +23,5 @@ type WebSocketManager interface { Start() Shutdown() error AddHandler(handler WebSocketHandler) - Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin CheckOrigin) + Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin CheckOrigin) error } From 5688be80ba14fa3a730e05c3d10298da45f7e514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Sep 2021 00:58:50 +0200 Subject: [PATCH 562/876] fix logger. --- internal/http/logger.go | 83 ++++++++++++++++++++++++----------------- internal/http/router.go | 2 - 2 files changed, 48 insertions(+), 37 deletions(-) diff --git a/internal/http/logger.go b/internal/http/logger.go index fead8fdd..cd52cfaf 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -7,6 +7,7 @@ import ( "time" "github.com/go-chi/chi/middleware" + "github.com/rs/zerolog" "github.com/rs/zerolog/log" "demodesk/neko/internal/http/auth" @@ -18,36 +19,43 @@ type logEntryKey int const logEntryKeyCtx logEntryKey = iota -func setLogEntry(r *http.Request, data logEntry) *http.Request { +func setLogEntry(r *http.Request, data *logEntry) *http.Request { ctx := context.WithValue(r.Context(), logEntryKeyCtx, data) return r.WithContext(ctx) } -func getLogEntry(r *http.Request) logEntry { - return r.Context().Value(logEntryKeyCtx).(logEntry) +func getLogEntry(r *http.Request) *logEntry { + return r.Context().Value(logEntryKeyCtx).(*logEntry) } func LoggerMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - next.ServeHTTP(w, setLogEntry(r, newLogEntry(w, r))) + ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor) + + logEntry := newLogEntry(w, r) + defer func() { + logEntry.Write(ww.Status(), ww.BytesWritten()) + }() + + next.ServeHTTP(ww, setLogEntry(r, logEntry)) }) } type logEntry struct { req struct { - time time.Time - id string - scheme string - proto string - method string - remote string - agent string - uri string + Time time.Time + Id string + Scheme string + Proto string + Method string + Remote string + Agent string + Uri string } res struct { - time time.Time - code int - bytes int + Time time.Time + Code int + Bytes int } err error elapsed time.Duration @@ -55,12 +63,12 @@ type logEntry struct { session types.Session } -func newLogEntry(w http.ResponseWriter, r *http.Request) logEntry { +func newLogEntry(w http.ResponseWriter, r *http.Request) *logEntry { e := logEntry{} - e.req.time = time.Now() + e.req.Time = time.Now() if reqID := middleware.GetReqID(r.Context()); reqID != "" { - e.req.id = reqID + e.req.Id = reqID } scheme := "http" @@ -68,22 +76,19 @@ func newLogEntry(w http.ResponseWriter, r *http.Request) logEntry { scheme = "https" } - e.req.scheme = scheme - e.req.proto = r.Proto - e.req.method = r.Method - e.req.remote = r.RemoteAddr - e.req.agent = r.UserAgent() - e.req.uri = fmt.Sprintf("%s://%s%s", scheme, r.Host, r.RequestURI) - return e + e.req.Scheme = scheme + e.req.Proto = r.Proto + e.req.Method = r.Method + e.req.Remote = r.RemoteAddr + e.req.Agent = r.UserAgent() + e.req.Uri = fmt.Sprintf("%s://%s%s", scheme, r.Host, r.RequestURI) + return &e } func (e *logEntry) SetResponse(w http.ResponseWriter, r *http.Request) { - ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor) - e.res.time = time.Now() - e.res.code = ww.Status() - e.res.bytes = ww.BytesWritten() + e.res.Time = time.Now() - e.elapsed = e.res.time.Sub(e.req.time) + e.elapsed = e.res.Time.Sub(e.req.Time) e.session, e.hasSession = auth.GetSession(r) } @@ -91,7 +96,10 @@ func (e *logEntry) SetError(err error) { e.err = err } -func (e *logEntry) Write() { +func (e *logEntry) Write(status, bytes int) { + e.res.Code = status + e.res.Bytes = bytes + logger := log.With(). Str("module", "http"). Float64("elapsed", float64(e.elapsed.Nanoseconds())/1000000.0). @@ -106,7 +114,7 @@ func (e *logEntry) Write() { if e.err != nil { httpErr, ok := e.err.(*utils.HTTPError) if !ok { - logger.Err(e.err).Msgf("request failed (%d)", e.res.code) + logger.Err(e.err).Msgf("request failed (%d)", e.res.Code) return } @@ -114,16 +122,21 @@ func (e *logEntry) Write() { httpErr.Message = http.StatusText(httpErr.Code) } - logger := logger.Error().Err(httpErr.InternalErr) + var logEvent *zerolog.Event + if httpErr.Code < 500 { + logEvent = logger.Warn() + } else { + logEvent = logger.Error() + } message := httpErr.Message if httpErr.InternalMsg != "" { message = httpErr.InternalMsg } - logger.Msgf("request failed (%d): %s", e.res.code, message) + logEvent.Err(httpErr.InternalErr).Msgf("request failed (%d): %s", e.res.Code, message) return } - logger.Debug().Msgf("request complete (%d)", e.res.code) + logger.Debug().Msgf("request complete (%d)", e.res.Code) } diff --git a/internal/http/router.go b/internal/http/router.go index 87679a4d..6cb1b0f8 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -86,7 +86,6 @@ func routeHandler(fn types.RouterHandler) http.HandlerFunc { } logEntry.SetResponse(w, r) - logEntry.Write() } } @@ -100,7 +99,6 @@ func middlewareHandler(fn types.MiddlewareHandler) func(http.Handler) http.Handl logEntry.SetError(err) errorHandler(err, w, r) logEntry.SetResponse(w, r) - logEntry.Write() return } if ctx != nil { From fe84e218e622bc3d471afb5bba9de5bc312ddafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Sep 2021 19:22:49 +0200 Subject: [PATCH 563/876] logger use chi's middleware. --- internal/http/logger.go | 97 ++++++++++++++++------------------------- internal/http/router.go | 23 +++++++--- 2 files changed, 55 insertions(+), 65 deletions(-) diff --git a/internal/http/logger.go b/internal/http/logger.go index cd52cfaf..a540d1b4 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -1,7 +1,6 @@ package http import ( - "context" "fmt" "net/http" "time" @@ -10,60 +9,13 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/http/auth" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" ) -type logEntryKey int +type logFormatter struct{} -const logEntryKeyCtx logEntryKey = iota - -func setLogEntry(r *http.Request, data *logEntry) *http.Request { - ctx := context.WithValue(r.Context(), logEntryKeyCtx, data) - return r.WithContext(ctx) -} - -func getLogEntry(r *http.Request) *logEntry { - return r.Context().Value(logEntryKeyCtx).(*logEntry) -} - -func LoggerMiddleware(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor) - - logEntry := newLogEntry(w, r) - defer func() { - logEntry.Write(ww.Status(), ww.BytesWritten()) - }() - - next.ServeHTTP(ww, setLogEntry(r, logEntry)) - }) -} - -type logEntry struct { - req struct { - Time time.Time - Id string - Scheme string - Proto string - Method string - Remote string - Agent string - Uri string - } - res struct { - Time time.Time - Code int - Bytes int - } - err error - elapsed time.Duration - hasSession bool - session types.Session -} - -func newLogEntry(w http.ResponseWriter, r *http.Request) *logEntry { +func (l *logFormatter) NewLogEntry(r *http.Request) middleware.LogEntry { e := logEntry{} e.req.Time = time.Now() @@ -85,30 +37,48 @@ func newLogEntry(w http.ResponseWriter, r *http.Request) *logEntry { return &e } -func (e *logEntry) SetResponse(w http.ResponseWriter, r *http.Request) { - e.res.Time = time.Now() - - e.elapsed = e.res.Time.Sub(e.req.Time) - e.session, e.hasSession = auth.GetSession(r) +type logEntry struct { + req struct { + Time time.Time + Id string + Scheme string + Proto string + Method string + Remote string + Agent string + Uri string + } + res struct { + Time time.Time + Code int + Bytes int + } + err error + session *types.Session } func (e *logEntry) SetError(err error) { e.err = err } -func (e *logEntry) Write(status, bytes int) { +func (e *logEntry) SetSession(session types.Session) { + e.session = &session +} + +func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Duration, extra interface{}) { + e.res.Time = time.Now() e.res.Code = status e.res.Bytes = bytes logger := log.With(). Str("module", "http"). - Float64("elapsed", float64(e.elapsed.Nanoseconds())/1000000.0). + Float64("elapsed", float64(elapsed.Nanoseconds())/1000000.0). Interface("req", e.req). Interface("res", e.res). Logger() - if e.hasSession { - logger = logger.With().Str("session_id", e.session.ID()).Logger() + if e.session != nil { + logger = logger.With().Str("session_id", (*e.session).ID()).Logger() } if e.err != nil { @@ -140,3 +110,12 @@ func (e *logEntry) Write(status, bytes int) { logger.Debug().Msgf("request complete (%d)", e.res.Code) } + +func (e *logEntry) Panic(v interface{}, stack []byte) { + message := fmt.Sprintf("%+v", v) + + log.Fatal(). + Str("message", message). + Str("stack", string(stack)). + Msg("got HTTP panic") +} diff --git a/internal/http/router.go b/internal/http/router.go index 6cb1b0f8..17eb4e9e 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -1,6 +1,7 @@ package http import ( + "demodesk/neko/internal/http/auth" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" "net/http" @@ -15,9 +16,9 @@ type RouterCtx struct { func newRouter() *RouterCtx { router := chi.NewRouter() - router.Use(middleware.Recoverer) // Recover from panics without crashing server router.Use(middleware.RequestID) // Create a request ID for each request - router.Use(LoggerMiddleware) + router.Use(middleware.RequestLogger(&logFormatter{})) + router.Use(middleware.Recoverer) // Recover from panics without crashing server return &RouterCtx{router} } @@ -78,27 +79,37 @@ func errorHandler(err error, w http.ResponseWriter, r *http.Request) { func routeHandler(fn types.RouterHandler) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - logEntry := getLogEntry(r) + // get custom log entry pointer from context + logEntry, _ := r.Context().Value(middleware.LogEntryCtxKey).(*logEntry) if err := fn(w, r); err != nil { logEntry.SetError(err) errorHandler(err, w, r) } - logEntry.SetResponse(w, r) + // set session if exits + if session, ok := auth.GetSession(r); ok { + logEntry.SetSession(session) + } } } func middlewareHandler(fn types.MiddlewareHandler) func(http.Handler) http.Handler { return func(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - logEntry := getLogEntry(r) + // get custom log entry pointer from context + logEntry, _ := r.Context().Value(middleware.LogEntryCtxKey).(*logEntry) ctx, err := fn(w, r) if err != nil { logEntry.SetError(err) errorHandler(err, w, r) - logEntry.SetResponse(w, r) + + // set session if exits + if session, ok := auth.GetSession(r); ok { + logEntry.SetSession(session) + } + return } if ctx != nil { From fb6042ada1626eae930919de019d7f54e10cd5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Sep 2021 19:23:04 +0200 Subject: [PATCH 564/876] do not export router context. --- internal/http/manager.go | 2 +- internal/http/router.go | 44 ++++++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/internal/http/manager.go b/internal/http/manager.go index c5bc750d..6eb01532 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -16,7 +16,7 @@ import ( type HttpManagerCtx struct { logger zerolog.Logger config *config.Server - router *RouterCtx + router types.Router http *http.Server } diff --git a/internal/http/router.go b/internal/http/router.go index 17eb4e9e..2d79e872 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -10,61 +10,61 @@ import ( "github.com/go-chi/chi/middleware" ) -type RouterCtx struct { +type router struct { chi chi.Router } -func newRouter() *RouterCtx { - router := chi.NewRouter() - router.Use(middleware.RequestID) // Create a request ID for each request - router.Use(middleware.RequestLogger(&logFormatter{})) - router.Use(middleware.Recoverer) // Recover from panics without crashing server - return &RouterCtx{router} +func newRouter() *router { + r := chi.NewRouter() + r.Use(middleware.RequestID) // Create a request ID for each request + r.Use(middleware.RequestLogger(&logFormatter{})) + r.Use(middleware.Recoverer) // Recover from panics without crashing server + return &router{r} } -func (r *RouterCtx) Group(fn func(types.Router)) { +func (r *router) Group(fn func(types.Router)) { r.chi.Group(func(c chi.Router) { - fn(&RouterCtx{c}) + fn(&router{c}) }) } -func (r *RouterCtx) Route(pattern string, fn func(types.Router)) { +func (r *router) Route(pattern string, fn func(types.Router)) { r.chi.Route(pattern, func(c chi.Router) { - fn(&RouterCtx{c}) + fn(&router{c}) }) } -func (r *RouterCtx) Get(pattern string, fn types.RouterHandler) { +func (r *router) Get(pattern string, fn types.RouterHandler) { r.chi.Get(pattern, routeHandler(fn)) } -func (r *RouterCtx) Post(pattern string, fn types.RouterHandler) { +func (r *router) Post(pattern string, fn types.RouterHandler) { r.chi.Post(pattern, routeHandler(fn)) } -func (r *RouterCtx) Put(pattern string, fn types.RouterHandler) { +func (r *router) Put(pattern string, fn types.RouterHandler) { r.chi.Put(pattern, routeHandler(fn)) } -func (r *RouterCtx) Delete(pattern string, fn types.RouterHandler) { +func (r *router) Delete(pattern string, fn types.RouterHandler) { r.chi.Delete(pattern, routeHandler(fn)) } -func (r *RouterCtx) With(fn types.MiddlewareHandler) types.Router { +func (r *router) With(fn types.MiddlewareHandler) types.Router { c := r.chi.With(middlewareHandler(fn)) - return &RouterCtx{c} + return &router{c} } -func (r *RouterCtx) WithBypass(fn func(next http.Handler) http.Handler) types.Router { +func (r *router) WithBypass(fn func(next http.Handler) http.Handler) types.Router { c := r.chi.With(fn) - return &RouterCtx{c} + return &router{c} } -func (r *RouterCtx) Use(fn types.MiddlewareHandler) { +func (r *router) Use(fn types.MiddlewareHandler) { r.chi.Use(middlewareHandler(fn)) } -func (r *RouterCtx) UseBypass(fn func(next http.Handler) http.Handler) { +func (r *router) UseBypass(fn func(next http.Handler) http.Handler) { r.chi.Use(fn) } -func (r *RouterCtx) ServeHTTP(w http.ResponseWriter, req *http.Request) { +func (r *router) ServeHTTP(w http.ResponseWriter, req *http.Request) { r.chi.ServeHTTP(w, req) } From 7e548ec00a7a4196e6849c9ee648177a3ad3f33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Sep 2021 19:27:21 +0200 Subject: [PATCH 565/876] logger wrap zerolog. --- internal/http/logger.go | 10 ++++++---- internal/http/manager.go | 2 +- internal/http/router.go | 12 +++++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/internal/http/logger.go b/internal/http/logger.go index a540d1b4..3767de09 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -13,10 +13,12 @@ import ( "demodesk/neko/internal/utils" ) -type logFormatter struct{} +type logFormatter struct { + logger zerolog.Logger +} func (l *logFormatter) NewLogEntry(r *http.Request) middleware.LogEntry { - e := logEntry{} + e := logEntry{logger: l.logger} e.req.Time = time.Now() if reqID := middleware.GetReqID(r.Context()); reqID != "" { @@ -55,6 +57,7 @@ type logEntry struct { } err error session *types.Session + logger zerolog.Logger } func (e *logEntry) SetError(err error) { @@ -70,8 +73,7 @@ func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Dur e.res.Code = status e.res.Bytes = bytes - logger := log.With(). - Str("module", "http"). + logger := e.logger.With(). Float64("elapsed", float64(elapsed.Nanoseconds())/1000000.0). Interface("req", e.req). Interface("res", e.res). diff --git a/internal/http/manager.go b/internal/http/manager.go index 6eb01532..39fa170c 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -23,7 +23,7 @@ type HttpManagerCtx struct { func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, config *config.Server) *HttpManagerCtx { logger := log.With().Str("module", "http").Logger() - router := newRouter() + router := newRouter(logger) router.UseBypass(cors.Handler(cors.Options{ AllowOriginFunc: func(r *http.Request, origin string) bool { return config.AllowOrigin(origin) diff --git a/internal/http/router.go b/internal/http/router.go index 2d79e872..0e645537 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -1,23 +1,25 @@ package http import ( - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" "net/http" "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" + "github.com/rs/zerolog" + + "demodesk/neko/internal/http/auth" + "demodesk/neko/internal/types" + "demodesk/neko/internal/utils" ) type router struct { chi chi.Router } -func newRouter() *router { +func newRouter(logger zerolog.Logger) *router { r := chi.NewRouter() r.Use(middleware.RequestID) // Create a request ID for each request - r.Use(middleware.RequestLogger(&logFormatter{})) + r.Use(middleware.RequestLogger(&logFormatter{logger})) r.Use(middleware.Recoverer) // Recover from panics without crashing server return &router{r} } From 6026ab8a27826f6f0e3a30a5224257e49903aa23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Sep 2021 19:37:09 +0200 Subject: [PATCH 566/876] log http panic. --- internal/http/logger.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/http/logger.go b/internal/http/logger.go index 3767de09..9460f3b2 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -7,7 +7,6 @@ import ( "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" - "github.com/rs/zerolog/log" "demodesk/neko/internal/types" "demodesk/neko/internal/utils" @@ -114,10 +113,8 @@ func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Dur } func (e *logEntry) Panic(v interface{}, stack []byte) { - message := fmt.Sprintf("%+v", v) - - log.Fatal(). - Str("message", message). + e.logger.WithLevel(zerolog.PanicLevel). + Interface("req", e.req). Str("stack", string(stack)). - Msg("got HTTP panic") + Msgf("request panic (500): %+v", v) } From c2d25577042e43bee24e180e47a96e3a7b238b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Sep 2021 20:20:10 +0200 Subject: [PATCH 567/876] http logger add panic. --- internal/http/logger.go | 100 ++++++++++++++++++++-------------------- internal/http/router.go | 4 +- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/internal/http/logger.go b/internal/http/logger.go index 9460f3b2..0f093ef0 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -17,11 +17,10 @@ type logFormatter struct { } func (l *logFormatter) NewLogEntry(r *http.Request) middleware.LogEntry { - e := logEntry{logger: l.logger} - e.req.Time = time.Now() + req := map[string]interface{}{} if reqID := middleware.GetReqID(r.Context()); reqID != "" { - e.req.Id = reqID + req["id"] = reqID } scheme := "http" @@ -29,37 +28,38 @@ func (l *logFormatter) NewLogEntry(r *http.Request) middleware.LogEntry { scheme = "https" } - e.req.Scheme = scheme - e.req.Proto = r.Proto - e.req.Method = r.Method - e.req.Remote = r.RemoteAddr - e.req.Agent = r.UserAgent() - e.req.Uri = fmt.Sprintf("%s://%s%s", scheme, r.Host, r.RequestURI) - return &e + req["scheme"] = scheme + req["proto"] = r.Proto + req["method"] = r.Method + req["remote"] = r.RemoteAddr + req["agent"] = r.UserAgent() + req["uri"] = fmt.Sprintf("%s://%s%s", scheme, r.Host, r.RequestURI) + + return &logEntry{ + logger: l.logger.With().Interface("req", req).Logger(), + } } type logEntry struct { - req struct { - Time time.Time - Id string - Scheme string - Proto string - Method string - Remote string - Agent string - Uri string - } - res struct { - Time time.Time - Code int - Bytes int - } - err error - session *types.Session logger zerolog.Logger + err error + panic *logPanic + session *types.Session } -func (e *logEntry) SetError(err error) { +type logPanic struct { + message string + stack string +} + +func (e *logEntry) Panic(v interface{}, stack []byte) { + e.panic = &logPanic{ + message: fmt.Sprintf("%+v", v), + stack: string(stack), + } +} + +func (e *logEntry) Error(err error) { e.err = err } @@ -68,24 +68,33 @@ func (e *logEntry) SetSession(session types.Session) { } func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Duration, extra interface{}) { - e.res.Time = time.Now() - e.res.Code = status - e.res.Bytes = bytes + res := map[string]interface{}{} + res["time"] = time.Now().UTC().Format(time.RFC1123) + res["status"] = status + res["bytes"] = bytes + res["elapsed"] = float64(elapsed.Nanoseconds()) / 1000000.0 - logger := e.logger.With(). - Float64("elapsed", float64(elapsed.Nanoseconds())/1000000.0). - Interface("req", e.req). - Interface("res", e.res). - Logger() + logger := e.logger.With().Interface("res", res).Logger() + // add session ID to logs (if exists) if e.session != nil { logger = logger.With().Str("session_id", (*e.session).ID()).Logger() } + // handle panic error message + if e.panic != nil { + logger.WithLevel(zerolog.PanicLevel). + Err(e.err). + Str("stack", e.panic.stack). + Msgf("request failed (%d): %s", status, e.panic.message) + return + } + + // handle panic error message if e.err != nil { httpErr, ok := e.err.(*utils.HTTPError) if !ok { - logger.Err(e.err).Msgf("request failed (%d)", e.res.Code) + logger.Err(e.err).Msgf("request failed (%d)", status) return } @@ -93,11 +102,11 @@ func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Dur httpErr.Message = http.StatusText(httpErr.Code) } - var logEvent *zerolog.Event + var logLevel zerolog.Level if httpErr.Code < 500 { - logEvent = logger.Warn() + logLevel = zerolog.WarnLevel } else { - logEvent = logger.Error() + logLevel = zerolog.ErrorLevel } message := httpErr.Message @@ -105,16 +114,9 @@ func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Dur message = httpErr.InternalMsg } - logEvent.Err(httpErr.InternalErr).Msgf("request failed (%d): %s", e.res.Code, message) + logger.WithLevel(logLevel).Err(httpErr.InternalErr).Msgf("request failed (%d): %s", status, message) return } - logger.Debug().Msgf("request complete (%d)", e.res.Code) -} - -func (e *logEntry) Panic(v interface{}, stack []byte) { - e.logger.WithLevel(zerolog.PanicLevel). - Interface("req", e.req). - Str("stack", string(stack)). - Msgf("request panic (500): %+v", v) + logger.Debug().Msgf("request complete (%d)", status) } diff --git a/internal/http/router.go b/internal/http/router.go index 0e645537..20e4f03c 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -85,7 +85,7 @@ func routeHandler(fn types.RouterHandler) http.HandlerFunc { logEntry, _ := r.Context().Value(middleware.LogEntryCtxKey).(*logEntry) if err := fn(w, r); err != nil { - logEntry.SetError(err) + logEntry.Error(err) errorHandler(err, w, r) } @@ -104,7 +104,7 @@ func middlewareHandler(fn types.MiddlewareHandler) func(http.Handler) http.Handl ctx, err := fn(w, r) if err != nil { - logEntry.SetError(err) + logEntry.Error(err) errorHandler(err, w, r) // set session if exits From 6bd46b438e7182624e1ad6ebd75aa14b87ee8e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Sep 2021 20:35:41 +0200 Subject: [PATCH 568/876] exclude healthcheck from logs. --- internal/http/logger.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/internal/http/logger.go b/internal/http/logger.go index 0f093ef0..2e946af1 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -17,6 +17,11 @@ type logFormatter struct { } func (l *logFormatter) NewLogEntry(r *http.Request) middleware.LogEntry { + // exclude healthcheck from logs + if r.RequestURI == "/api/health" { + return &nulllog{} + } + req := map[string]interface{}{} if reqID := middleware.GetReqID(r.Context()); reqID != "" { @@ -120,3 +125,11 @@ func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Dur logger.Debug().Msgf("request complete (%d)", status) } + +type nulllog struct{} + +func (e *nulllog) Panic(v interface{}, stack []byte) {} +func (e *nulllog) Error(err error) {} +func (e *nulllog) SetSession(session types.Session) {} +func (e *nulllog) Write(status, bytes int, header http.Header, elapsed time.Duration, extra interface{}) { +} From 137614c0872a3b849fe256bd567cf97f012940fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 18 Sep 2021 00:56:03 +0200 Subject: [PATCH 569/876] fix deadlock. --- internal/session/manager.go | 14 ++++---------- internal/webrtc/peer.go | 13 ++++--------- internal/websocket/peer.go | 17 +++++++---------- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index b2f1790e..ba0c5305 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -198,16 +198,13 @@ func (manager *SessionManagerCtx) ClearHost() { // --- func (manager *SessionManagerCtx) Broadcast(event string, payload interface{}, exclude interface{}) { - manager.sessionsMu.Lock() - defer manager.sessionsMu.Unlock() - - for id, session := range manager.sessions { + for _, session := range manager.List() { if !session.State().IsConnected { continue } if exclude != nil { - if in, _ := utils.ArrayIn(id, exclude); in { + if in, _ := utils.ArrayIn(session.ID(), exclude); in { continue } } @@ -217,16 +214,13 @@ func (manager *SessionManagerCtx) Broadcast(event string, payload interface{}, e } func (manager *SessionManagerCtx) AdminBroadcast(event string, payload interface{}, exclude interface{}) { - manager.sessionsMu.Lock() - defer manager.sessionsMu.Unlock() - - for id, session := range manager.sessions { + for _, session := range manager.List() { if !session.State().IsConnected || !session.Profile().IsAdmin { continue } if exclude != nil { - if in, _ := utils.ArrayIn(id, exclude); in { + if in, _ := utils.ArrayIn(session.ID(), exclude); in { continue } } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index c7dd5fde..ad74d5d4 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -68,14 +68,9 @@ func (peer *WebRTCPeerCtx) Destroy() { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil || peer.connection.ConnectionState() != webrtc.PeerConnectionStateConnected { - return + if peer.connection != nil { + err := peer.connection.Close() + peer.logger.Err(err).Msg("peer connection destroyed") + peer.connection = nil } - - // TODO: Send webrtc disconnect event via websocket. - - err := peer.connection.Close() - peer.logger.Err(err).Msg("peer connection destroyed") - - peer.connection = nil } diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 266c974a..d25367b4 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -67,21 +67,18 @@ func (peer *WebSocketPeerCtx) Send(event string, payload interface{}) { } func (peer *WebSocketPeerCtx) Destroy(reason string) { - peer.mu.Lock() - defer peer.mu.Unlock() - - if peer.connection == nil { - return - } - peer.Send( event.SYSTEM_DISCONNECT, message.SystemDisconnect{ Message: reason, }) - err := peer.connection.Close() - peer.logger.Err(err).Msg("peer connection destroyed") + peer.mu.Lock() + defer peer.mu.Unlock() - peer.connection = nil + if peer.connection != nil { + err := peer.connection.Close() + peer.logger.Err(err).Msg("peer connection destroyed") + peer.connection = nil + } } From fd9d5ec6f857a7f1d86845be7d43b8e66dff50ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 18 Sep 2021 13:41:20 +0200 Subject: [PATCH 570/876] websocket shutdown + log. --- internal/websocket/manager.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 540447d3..6a0e5a72 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -276,8 +276,8 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t case <-cancel: return case <-manager.shutdown: - connection.Close() - return + err := connection.Close() + manager.logger.Err(err).Msg("connection shutdown") case <-ticker.C: if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { logger.Err(err).Msg("ping message has failed") From f96466b7b9ed205fc75b60920a75dac60b1599e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 18 Sep 2021 14:59:15 +0200 Subject: [PATCH 571/876] websocket upgrade as router handler. --- internal/http/manager.go | 8 +++----- internal/types/websocket.go | 2 +- internal/websocket/manager.go | 38 ++++++++++++++++++++--------------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/internal/http/manager.go b/internal/http/manager.go index 39fa170c..9589114a 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -37,11 +37,9 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c router.Route("/api", ApiManager.Route) - router.Get("/api/ws", func(w http.ResponseWriter, r *http.Request) error { - return WebSocketManager.Upgrade(w, r, func(r *http.Request) bool { - return config.AllowOrigin(r.Header.Get("Origin")) - }) - }) + router.Get("/api/ws", WebSocketManager.Upgrade(func(r *http.Request) bool { + return config.AllowOrigin(r.Header.Get("Origin")) + })) if config.Static != "" { fs := http.FileServer(http.Dir(config.Static)) diff --git a/internal/types/websocket.go b/internal/types/websocket.go index e8c22d6f..f876b0fc 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -23,5 +23,5 @@ type WebSocketManager interface { Start() Shutdown() error AddHandler(handler WebSocketHandler) - Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin CheckOrigin) error + Upgrade(checkOrigin CheckOrigin) RouterHandler } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 6a0e5a72..ef9aed37 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -13,6 +13,7 @@ import ( "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" + "demodesk/neko/internal/utils" "demodesk/neko/internal/websocket/handler" ) @@ -145,21 +146,26 @@ func (manager *WebSocketManagerCtx) AddHandler(handler types.WebSocketHandler) { manager.handlers = append(manager.handlers, handler) } -func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request, checkOrigin types.CheckOrigin) error { - manager.logger.Debug(). - Str("address", r.RemoteAddr). - Str("agent", r.UserAgent()). - Msg("attempting to upgrade connection") +func (manager *WebSocketManagerCtx) Upgrade(checkOrigin types.CheckOrigin) types.RouterHandler { + return func(w http.ResponseWriter, r *http.Request) error { + upgrader := websocket.Upgrader{ + CheckOrigin: checkOrigin, + // Do not return any error while handshake + Error: func(w http.ResponseWriter, r *http.Request, status int, reason error) {}, + } - upgrader := websocket.Upgrader{ - CheckOrigin: checkOrigin, - } - - connection, err := upgrader.Upgrade(w, r, nil) - if err != nil { - return err + connection, err := upgrader.Upgrade(w, r, nil) + if err != nil { + return utils.HttpBadRequest().WithInternalErr(err) + } + + // Cannot write HTTP response after connection upgrade + manager.connect(connection, r) + return nil } +} +func (manager *WebSocketManagerCtx) connect(connection *websocket.Conn, r *http.Request) { // create new peer peer := newPeer(connection) @@ -167,7 +173,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque if err != nil { manager.logger.Warn().Err(err).Msg("authentication failed") peer.Destroy(err.Error()) - return nil + return } // add session id to all log messages @@ -177,7 +183,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque if !session.Profile().CanConnect { logger.Warn().Msg("connection disabled") peer.Destroy("connection disabled") - return nil + return } if session.State().IsConnected { @@ -185,7 +191,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque if !manager.sessions.MercifulReconnect() { peer.Destroy("already connected") - return nil + return } logger.Info().Msg("replacing peer connection") @@ -210,7 +216,6 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque }() manager.handle(connection, session) - return nil } func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session types.Session) { @@ -278,6 +283,7 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t case <-manager.shutdown: err := connection.Close() manager.logger.Err(err).Msg("connection shutdown") + return case <-ticker.C: if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { logger.Err(err).Msg("ping message has failed") From e95cc99ea2be4c14ae6a920e3188c40e064cfe6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 20 Sep 2021 00:19:10 +0200 Subject: [PATCH 572/876] fix whitespaces. --- internal/http/router.go | 4 ++++ internal/webrtc/pionlog/logger.go | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/internal/http/router.go b/internal/http/router.go index 20e4f03c..137b986e 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -39,12 +39,15 @@ func (r *router) Route(pattern string, fn func(types.Router)) { func (r *router) Get(pattern string, fn types.RouterHandler) { r.chi.Get(pattern, routeHandler(fn)) } + func (r *router) Post(pattern string, fn types.RouterHandler) { r.chi.Post(pattern, routeHandler(fn)) } + func (r *router) Put(pattern string, fn types.RouterHandler) { r.chi.Put(pattern, routeHandler(fn)) } + func (r *router) Delete(pattern string, fn types.RouterHandler) { r.chi.Delete(pattern, routeHandler(fn)) } @@ -62,6 +65,7 @@ func (r *router) WithBypass(fn func(next http.Handler) http.Handler) types.Route func (r *router) Use(fn types.MiddlewareHandler) { r.chi.Use(middlewareHandler(fn)) } + func (r *router) UseBypass(fn func(next http.Handler) http.Handler) { r.chi.Use(fn) } diff --git a/internal/webrtc/pionlog/logger.go b/internal/webrtc/pionlog/logger.go index 7e48d90e..f9e66172 100644 --- a/internal/webrtc/pionlog/logger.go +++ b/internal/webrtc/pionlog/logger.go @@ -15,17 +15,21 @@ type logger struct { func (l logger) Trace(msg string) { l.logger.Trace().Msg(strings.TrimSpace(msg)) } + func (l logger) Tracef(format string, args ...interface{}) { msg := fmt.Sprintf(format, args...) l.logger.Trace().Msg(strings.TrimSpace(msg)) } + func (l logger) Debug(msg string) { l.logger.Debug().Msg(strings.TrimSpace(msg)) } + func (l logger) Debugf(format string, args ...interface{}) { msg := fmt.Sprintf(format, args...) l.logger.Debug().Msg(strings.TrimSpace(msg)) } + func (l logger) Info(msg string) { if strings.Contains(msg, "duplicated packet") { return @@ -33,6 +37,7 @@ func (l logger) Info(msg string) { l.logger.Info().Msg(strings.TrimSpace(msg)) } + func (l logger) Infof(format string, args ...interface{}) { msg := fmt.Sprintf(format, args...) if strings.Contains(msg, "duplicated packet") { @@ -41,16 +46,20 @@ func (l logger) Infof(format string, args ...interface{}) { l.logger.Info().Msg(strings.TrimSpace(msg)) } + func (l logger) Warn(msg string) { l.logger.Warn().Msg(strings.TrimSpace(msg)) } + func (l logger) Warnf(format string, args ...interface{}) { msg := fmt.Sprintf(format, args...) l.logger.Warn().Msg(strings.TrimSpace(msg)) } + func (l logger) Error(msg string) { l.logger.Error().Msg(strings.TrimSpace(msg)) } + func (l logger) Errorf(format string, args ...interface{}) { msg := fmt.Sprintf(format, args...) l.logger.Error().Msg(strings.TrimSpace(msg)) From 31eb743a5d178fa4435a54b7ba44e69d45b0581b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 20 Sep 2021 00:19:33 +0200 Subject: [PATCH 573/876] fix static server response code. --- internal/http/manager.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/internal/http/manager.go b/internal/http/manager.go index 9589114a..20169a2e 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -45,11 +45,14 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c fs := http.FileServer(http.Dir(config.Static)) router.Get("/*", func(w http.ResponseWriter, r *http.Request) error { _, err := os.Stat(config.Static + r.URL.Path) - - if !os.IsNotExist(err) { + if err == nil { fs.ServeHTTP(w, r) + return nil + } + if os.IsNotExist(err) { + http.NotFound(w, r) + return nil } - return err }) } From 51577ecff4eaaad38a8d4758f7c9c3b081c16d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 20 Sep 2021 18:28:13 +0200 Subject: [PATCH 574/876] screen size retype one struct. --- internal/api/room/screen.go | 23 ++++++----------------- internal/websocket/handler/screen.go | 16 +++------------- internal/websocket/handler/system.go | 10 +++------- 3 files changed, 12 insertions(+), 37 deletions(-) diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 67c658ef..9cc54b96 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -23,11 +23,8 @@ func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request return utils.HttpInternalServerError().WithInternalMsg("unable to get screen configuration") } - return utils.HttpSuccess(w, ScreenConfigurationPayload{ - Width: size.Width, - Height: size.Height, - Rate: size.Rate, - }) + payload := ScreenConfigurationPayload(*size) + return utils.HttpSuccess(w, payload) } func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.Request) error { @@ -36,21 +33,13 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R return err } - if err := h.desktop.SetScreenSize(types.ScreenSize{ - Width: data.Width, - Height: data.Height, - Rate: data.Rate, - }); err != nil { + size := types.ScreenSize(*data) + if err := h.desktop.SetScreenSize(size); err != nil { return utils.HttpUnprocessableEntity("cannot set screen size").WithInternalErr(err) } - h.sessions.Broadcast( - event.SCREEN_UPDATED, - message.ScreenSize{ - Width: data.Width, - Height: data.Height, - Rate: data.Rate, - }, nil) + payload := message.ScreenSize(*data) + h.sessions.Broadcast(event.SCREEN_UPDATED, payload, nil) return utils.HttpSuccess(w, data) } diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index cce9f4ec..a526bc81 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -13,21 +13,11 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc return errors.New("is not the admin") } - if err := h.desktop.SetScreenSize(types.ScreenSize{ - Width: payload.Width, - Height: payload.Height, - Rate: payload.Rate, - }); err != nil { + data := types.ScreenSize(*payload) + if err := h.desktop.SetScreenSize(data); err != nil { return err } - h.sessions.Broadcast( - event.SCREEN_UPDATED, - message.ScreenSize{ - Width: payload.Width, - Height: payload.Height, - Rate: payload.Rate, - }, nil) - + h.sessions.Broadcast(event.SCREEN_UPDATED, payload, nil) return nil } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 86b55b9e..399453e2 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -40,13 +40,9 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { session.Send( event.SYSTEM_INIT, message.SystemInit{ - SessionId: session.ID(), - ControlHost: controlHost, - ScreenSize: message.ScreenSize{ - Width: size.Width, - Height: size.Height, - Rate: size.Rate, - }, + SessionId: session.ID(), + ControlHost: controlHost, + ScreenSize: message.ScreenSize(*size), Sessions: sessions, ImplicitHosting: h.sessions.ImplicitHosting(), ScreencastEnabled: h.capture.Screencast().Enabled(), From 41d8fa7e22d8d1d4692eda17c946a0b2e0f15748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 20 Sep 2021 20:21:13 +0200 Subject: [PATCH 575/876] do not panic if capture pipeline already exists. --- internal/capture/manager.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 690de43f..ef67774b 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -1,6 +1,7 @@ package capture import ( + "errors" "fmt" "strings" @@ -141,20 +142,23 @@ func (manager *CaptureManagerCtx) Start() { manager.desktop.OnAfterScreenSizeChange(func() { for _, video := range manager.videos { if video.Started() { - if err := video.createPipeline(); err != nil { + err := video.createPipeline() + if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { manager.logger.Panic().Err(err).Msg("unable to recreate video pipeline") } } } if manager.broadcast.Started() { - if err := manager.broadcast.createPipeline(); err != nil { + err := manager.broadcast.createPipeline() + if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { manager.logger.Panic().Err(err).Msg("unable to recreate broadcast pipeline") } } if manager.screencast.Started() { - if err := manager.screencast.createPipeline(); err != nil { + err := manager.screencast.createPipeline() + if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { manager.logger.Panic().Err(err).Msg("unable to recreate screencast pipeline") } } From d91c0a9f7fb0f899b4792e681fbaf08412dd0618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 24 Sep 2021 15:15:59 +0200 Subject: [PATCH 576/876] move websocket Ping to peer. --- internal/types/websocket.go | 1 + internal/websocket/manager.go | 9 ++++----- internal/websocket/peer.go | 12 ++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/internal/types/websocket.go b/internal/types/websocket.go index f876b0fc..70ce0cb9 100644 --- a/internal/types/websocket.go +++ b/internal/types/websocket.go @@ -16,6 +16,7 @@ type CheckOrigin func(r *http.Request) bool type WebSocketPeer interface { Send(event string, payload interface{}) + Ping() error Destroy(reason string) } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index ef9aed37..11cc3392 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -215,10 +215,10 @@ func (manager *WebSocketManagerCtx) connect(connection *websocket.Conn, r *http. session.SetWebSocketConnected(peer, false) }() - manager.handle(connection, session) + manager.handle(connection, peer, session) } -func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session types.Session) { +func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer types.WebSocketPeer, session types.Session) { // add session id to logger context logger := manager.logger.With().Str("session_id", session.ID()).Logger() @@ -281,11 +281,10 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t case <-cancel: return case <-manager.shutdown: - err := connection.Close() - manager.logger.Err(err).Msg("connection shutdown") + peer.Destroy("connection shutdown") return case <-ticker.C: - if err := connection.WriteMessage(websocket.PingMessage, nil); err != nil { + if err := peer.Ping(); err != nil { logger.Err(err).Msg("ping message has failed") return } diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index d25367b4..3d76a13a 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -2,6 +2,7 @@ package websocket import ( "encoding/json" + "errors" "sync" "github.com/gorilla/websocket" @@ -66,6 +67,17 @@ func (peer *WebSocketPeerCtx) Send(event string, payload interface{}) { Msg("sending message to client") } +func (peer *WebSocketPeerCtx) Ping() error { + peer.mu.Lock() + defer peer.mu.Unlock() + + if peer.connection == nil { + return errors.New("peer connection not found") + } + + return peer.connection.WriteMessage(websocket.PingMessage, nil) +} + func (peer *WebSocketPeerCtx) Destroy(reason string) { peer.Send( event.SYSTEM_DISCONNECT, From e623a15771f7f61a5e30989ae3b378a1c2a606a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 26 Sep 2021 21:29:56 +0200 Subject: [PATCH 577/876] update cmd root. --- cmd/root.go | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 3031fc68..aee8c983 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -34,28 +34,26 @@ func init() { ////// // logs ////// - zerolog.TimeFieldFormat = "" + console := zerolog.ConsoleWriter{Out: os.Stdout} + zerolog.TimeFieldFormat = zerolog.TimeFormatUnix zerolog.SetGlobalLevel(zerolog.InfoLevel) - console := zerolog.ConsoleWriter{Out: os.Stdout} - - if !viper.GetBool("logs") { + logs := viper.GetBool("logs") + if !logs { log.Logger = log.Output(console) } else { - logs := filepath.Join(".", "logs") + logsPath := filepath.Join(".", "logs") if runtime.GOOS == "linux" { - logs = "/var/log/neko" + logsPath = "/var/log/neko" } - if _, err := os.Stat(logs); os.IsNotExist(err) { - //nolint - os.Mkdir(logs, os.ModePerm) + if _, err := os.Stat(logsPath); os.IsNotExist(err) { + _ = os.Mkdir(logsPath, os.ModePerm) } - latest := filepath.Join(logs, "neko-latest.log") - _, err := os.Stat(latest) - if err == nil { - err = os.Rename(latest, filepath.Join(logs, "neko."+time.Now().Format("2006-01-02T15-04-05Z07-00")+".log")) + latest := filepath.Join(logsPath, "neko-latest.log") + if _, err := os.Stat(latest); err == nil { + err = os.Rename(latest, filepath.Join(logsPath, "neko."+time.Now().Format("2006-01-02T15-04-05Z07-00")+".log")) if err != nil { log.Panic().Err(err).Msg("failed to rotate log file") } @@ -96,15 +94,14 @@ func init() { viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) viper.AutomaticEnv() // read in environment variables that match - if err := viper.ReadInConfig(); err != nil { - if _, ok := err.(viper.ConfigFileNotFoundError); !ok { - log.Err(err) - } - if config != "" { - log.Err(err) - } + err := viper.ReadInConfig() + if err != nil && config != "" { + log.Err(err) } + // get full config file path + config = viper.ConfigFileUsed() + ////// // debug ////// @@ -113,20 +110,19 @@ func init() { zerolog.SetGlobalLevel(zerolog.DebugLevel) } - file := viper.ConfigFileUsed() logger := log.With(). Bool("debug", debug). - Str("logging", viper.GetString("logs")). - Str("config", file). + Bool("logs", logs). + Str("config", config). Logger() - if file == "" { + if config == "" { logger.Warn().Msg("preflight complete without config file") } else { - if _, err := os.Stat(file); os.IsNotExist(err) { + if _, err := os.Stat(config); os.IsNotExist(err) { logger.Err(err).Msg("preflight complete with nonexistent config file") } else { - logger.Info().Msg("preflight complete") + logger.Info().Msg("preflight complete with config file") } } From fa168a53c9f16e806249d759d07d17cabafa4ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 26 Sep 2021 22:26:22 +0200 Subject: [PATCH 578/876] webrtc extract connection. --- internal/webrtc/manager.go | 149 +++++++----------------------- internal/webrtc/peerconnection.go | 97 +++++++++++++++++++ 2 files changed, 130 insertions(+), 116 deletions(-) create mode 100644 internal/webrtc/peerconnection.go diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 4cc5fc83..01e4f9d1 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -8,7 +8,6 @@ import ( "sync" "time" - "github.com/pion/interceptor" "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" @@ -19,7 +18,6 @@ import ( "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" "demodesk/neko/internal/webrtc/cursor" - "demodesk/neko/internal/webrtc/pionlog" ) // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds @@ -33,27 +31,31 @@ const keepAliveInterval = 2 * time.Second func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ - logger: log.With().Str("module", "webrtc").Logger(), - desktop: desktop, - capture: capture, - config: config, + logger: log.With().Str("module", "webrtc").Logger(), + config: config, + + desktop: desktop, + capture: capture, + curImage: cursor.NewImage(desktop), + curPosition: cursor.NewPosition(desktop), + participants: 0, - curImage: cursor.NewImage(desktop), - curPosition: cursor.NewPosition(desktop), } } type WebRTCManagerCtx struct { - mu sync.Mutex - logger zerolog.Logger - audioTrack *webrtc.TrackLocalStaticSample - audioStop func() - desktop types.DesktopManager - capture types.CaptureManager - config *config.WebRTC - participants uint32 - curImage *cursor.ImageCtx - curPosition *cursor.PositionCtx + mu sync.Mutex + logger zerolog.Logger + config *config.WebRTC + + desktop types.DesktopManager + capture types.CaptureManager + curImage *cursor.ImageCtx + curPosition *cursor.PositionCtx + + audioTrack *webrtc.TrackLocalStaticSample + audioListener func(sample types.Sample) + participants uint32 } func (manager *WebRTCManagerCtx) Start() { @@ -66,7 +68,7 @@ func (manager *WebRTCManagerCtx) Start() { manager.logger.Panic().Err(err).Msg("unable to create audio track") } - audioListener := func(sample types.Sample) { + manager.audioListener = func(sample types.Sample) { if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil { if errors.Is(err, io.ErrClosedPipe) { // The peerConnection has been closed. @@ -75,11 +77,7 @@ func (manager *WebRTCManagerCtx) Start() { manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") } } - - audio.AddListener(&audioListener) - manager.audioStop = func() { - audio.RemoveListener(&audioListener) - } + audio.AddListener(&manager.audioListener) manager.curImage.Start() @@ -98,7 +96,9 @@ func (manager *WebRTCManagerCtx) Shutdown() error { manager.curImage.Shutdown() manager.curPosition.Shutdown() - manager.audioStop() + audio := manager.capture.Audio() + audio.RemoveListener(&manager.audioListener) + return nil } @@ -111,30 +111,18 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin logger := manager.logger.With().Str("session_id", session.ID()).Logger() logger.Info().Msg("creating webrtc peer") - // Create MediaEngine - engine, err := manager.mediaEngine(videoID) + // all videos must have the same codec + videoStream, ok := manager.capture.Video(videoID) + if !ok { + return nil, types.ErrWebRTCVideoNotFound + } + + connection, err := manager.newPeerConnection(videoStream.Codec(), logger) if err != nil { return nil, err } - // Custom settings & configuration - settings := manager.apiSettings(logger) - configuration := manager.apiConfiguration() - - registry := &interceptor.Registry{} - if err := webrtc.RegisterDefaultInterceptors(engine, registry); err != nil { - return nil, err - } - - // Create NewAPI with MediaEngine and SettingEngine - api := webrtc.NewAPI(webrtc.WithMediaEngine(engine), webrtc.WithSettingEngine(settings), webrtc.WithInterceptorRegistry(registry)) - - connection, err := api.NewPeerConnection(*configuration) - if err != nil { - return nil, err - } - - // Asynchronously send local ICE Candidates + // asynchronously send local ICE Candidates if manager.config.ICETrickle { connection.OnICECandidate(func(candidate *webrtc.ICECandidate) { if candidate == nil { @@ -151,11 +139,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } // create video track - videoStream, ok := manager.capture.Video(videoID) - if !ok { - return nil, types.ErrWebRTCVideoNotFound - } - videoTrack, err := webrtc.NewTrackLocalStaticSample(videoStream.Codec().Capability, "video", "stream") if err != nil { return nil, err @@ -345,69 +328,3 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin session.SetWebRTCPeer(peer) return peer.CreateOffer(false) } - -func (manager *WebRTCManagerCtx) mediaEngine(videoID string) (*webrtc.MediaEngine, error) { - engine := &webrtc.MediaEngine{} - - // all videos must have the same codec - video, ok := manager.capture.Video(videoID) - if !ok { - return nil, types.ErrWebRTCVideoNotFound - } - - videoCodec := video.Codec() - if err := videoCodec.Register(engine); err != nil { - return nil, err - } - - audioCodec := manager.capture.Audio().Codec() - if err := audioCodec.Register(engine); err != nil { - return nil, err - } - - return engine, nil -} - -func (manager *WebRTCManagerCtx) apiSettings(logger zerolog.Logger) webrtc.SettingEngine { - settings := webrtc.SettingEngine{ - LoggerFactory: pionlog.New(logger), - } - - //nolint - settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) - settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) - settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) - //settings.SetSRTPReplayProtectionWindow(512) - settings.SetLite(manager.config.ICELite) - - return settings -} - -func (manager *WebRTCManagerCtx) apiConfiguration() *webrtc.Configuration { - if manager.config.ICELite { - return &webrtc.Configuration{ - SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, - } - } - - ICEServers := []webrtc.ICEServer{} - for _, server := range manager.config.ICEServers { - var credential interface{} - if server.Credential != "" { - credential = server.Credential - } else { - credential = false - } - - ICEServers = append(ICEServers, webrtc.ICEServer{ - URLs: server.URLs, - Username: server.Username, - Credential: credential, - }) - } - - return &webrtc.Configuration{ - ICEServers: ICEServers, - SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, - } -} diff --git a/internal/webrtc/peerconnection.go b/internal/webrtc/peerconnection.go new file mode 100644 index 00000000..cab64f2e --- /dev/null +++ b/internal/webrtc/peerconnection.go @@ -0,0 +1,97 @@ +package webrtc + +import ( + "demodesk/neko/internal/types/codec" + "demodesk/neko/internal/webrtc/pionlog" + + "github.com/pion/interceptor" + "github.com/pion/webrtc/v3" + "github.com/rs/zerolog" +) + +func (manager *WebRTCManagerCtx) newPeerConnection(codec codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) { + // create media engine + engine, err := manager.mediaEngine(codec) + if err != nil { + return nil, err + } + + // create setting engine + settings := manager.settingEngine(logger) + + // create interceptor registry + registry := &interceptor.Registry{} + if err := webrtc.RegisterDefaultInterceptors(engine, registry); err != nil { + return nil, err + } + + // create new API + api := webrtc.NewAPI( + webrtc.WithMediaEngine(engine), + webrtc.WithSettingEngine(settings), + webrtc.WithInterceptorRegistry(registry), + ) + + // create new peer connection + configuration := manager.peerConfiguration() + return api.NewPeerConnection(configuration) +} + +func (manager *WebRTCManagerCtx) mediaEngine(codec codec.RTPCodec) (*webrtc.MediaEngine, error) { + engine := &webrtc.MediaEngine{} + + if err := codec.Register(engine); err != nil { + return nil, err + } + + audioCodec := manager.capture.Audio().Codec() + if err := audioCodec.Register(engine); err != nil { + return nil, err + } + + return engine, nil +} + +func (manager *WebRTCManagerCtx) settingEngine(logger zerolog.Logger) webrtc.SettingEngine { + settings := webrtc.SettingEngine{ + LoggerFactory: pionlog.New(logger), + } + + //nolint + settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) + settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) + settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) + //settings.SetSRTPReplayProtectionWindow(512) + settings.SetLite(manager.config.ICELite) + + return settings +} + +func (manager *WebRTCManagerCtx) peerConfiguration() webrtc.Configuration { + if manager.config.ICELite { + return webrtc.Configuration{ + SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, + } + } + + ICEServers := []webrtc.ICEServer{} + for _, server := range manager.config.ICEServers { + var credential interface{} + if server.Credential != "" { + credential = server.Credential + } else { + credential = false + } + + ICEServers = append(ICEServers, webrtc.ICEServer{ + URLs: server.URLs, + Username: server.Username, + Credential: credential, + }) + } + + return webrtc.Configuration{ + ICEServers: ICEServers, + SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, + } +} From beac1cb0880287185b7aa501dcde1aca378784c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 26 Sep 2021 22:59:45 +0200 Subject: [PATCH 579/876] peer configuration multiple codecs. --- internal/webrtc/manager.go | 11 ++++--- internal/webrtc/peerconnection.go | 49 +++++++++---------------------- 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 01e4f9d1..55355e12 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -15,6 +15,7 @@ import ( "demodesk/neko/internal/config" "demodesk/neko/internal/types" + "demodesk/neko/internal/types/codec" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" "demodesk/neko/internal/webrtc/cursor" @@ -117,7 +118,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return nil, types.ErrWebRTCVideoNotFound } - connection, err := manager.newPeerConnection(videoStream.Codec(), logger) + connection, err := manager.newPeerConnection([]codec.RTPCodec{ + videoStream.Codec(), + manager.capture.Audio().Codec(), + }, logger) if err != nil { return nil, err } @@ -244,9 +248,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin switch state { case webrtc.PeerConnectionStateConnected: session.SetWebRTCConnected(peer, true) - case webrtc.PeerConnectionStateDisconnected: - fallthrough - case webrtc.PeerConnectionStateFailed: + case webrtc.PeerConnectionStateDisconnected, + webrtc.PeerConnectionStateFailed: connection.Close() case webrtc.PeerConnectionStateClosed: manager.mu.Lock() diff --git a/internal/webrtc/peerconnection.go b/internal/webrtc/peerconnection.go index cab64f2e..15a93c2d 100644 --- a/internal/webrtc/peerconnection.go +++ b/internal/webrtc/peerconnection.go @@ -9,15 +9,24 @@ import ( "github.com/rs/zerolog" ) -func (manager *WebRTCManagerCtx) newPeerConnection(codec codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) { +func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) { // create media engine - engine, err := manager.mediaEngine(codec) - if err != nil { - return nil, err + engine := &webrtc.MediaEngine{} + for _, codec := range codecs { + if err := codec.Register(engine); err != nil { + return nil, err + } } // create setting engine - settings := manager.settingEngine(logger) + settings := webrtc.SettingEngine{ + LoggerFactory: pionlog.New(logger), + } + + _ = settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) + settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) + settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) + settings.SetLite(manager.config.ICELite) // create interceptor registry registry := &interceptor.Registry{} @@ -37,36 +46,6 @@ func (manager *WebRTCManagerCtx) newPeerConnection(codec codec.RTPCodec, logger return api.NewPeerConnection(configuration) } -func (manager *WebRTCManagerCtx) mediaEngine(codec codec.RTPCodec) (*webrtc.MediaEngine, error) { - engine := &webrtc.MediaEngine{} - - if err := codec.Register(engine); err != nil { - return nil, err - } - - audioCodec := manager.capture.Audio().Codec() - if err := audioCodec.Register(engine); err != nil { - return nil, err - } - - return engine, nil -} - -func (manager *WebRTCManagerCtx) settingEngine(logger zerolog.Logger) webrtc.SettingEngine { - settings := webrtc.SettingEngine{ - LoggerFactory: pionlog.New(logger), - } - - //nolint - settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) - settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) - settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) - //settings.SetSRTPReplayProtectionWindow(512) - settings.SetLite(manager.config.ICELite) - - return settings -} - func (manager *WebRTCManagerCtx) peerConfiguration() webrtc.Configuration { if manager.config.ICELite { return webrtc.Configuration{ From 9d4d5766ef5377f01b917bba5acd3471755c74f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 27 Sep 2021 00:50:49 +0200 Subject: [PATCH 580/876] webrtc refactor peer track. --- internal/capture/stream.go | 156 ++++++++++++++++++-------------- internal/types/capture.go | 8 +- internal/webrtc/manager.go | 167 ++++++----------------------------- internal/webrtc/peertrack.go | 97 ++++++++++++++++++++ 4 files changed, 219 insertions(+), 209 deletions(-) create mode 100644 internal/webrtc/peertrack.go diff --git a/internal/capture/stream.go b/internal/capture/stream.go index f8af877c..3e810a4e 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -1,6 +1,7 @@ package capture import ( + "errors" "reflect" "sync" @@ -13,18 +14,22 @@ import ( ) type StreamManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - wg sync.WaitGroup - codec codec.RTPCodec - pipelineStr func() string + logger zerolog.Logger + mu sync.Mutex + wg sync.WaitGroup + codec codec.RTPCodec + pipeline *gst.Pipeline - sample chan types.Sample - listeners map[uintptr]*func(sample types.Sample) - emitMu sync.Mutex - emitUpdate chan bool - emitStop chan bool - started bool + pipelineMu sync.Mutex + pipelineStr func() string + + sample chan types.Sample + sampleStop chan interface{} + sampleUpdate chan interface{} + + listeners map[uintptr]*func(sample types.Sample) + listenersMu sync.Mutex + listenersCount uint32 } func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) *StreamManagerCtx { @@ -34,13 +39,12 @@ func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) Str("video_id", video_id).Logger() manager := &StreamManagerCtx{ - logger: logger, - codec: codec, - pipelineStr: pipelineStr, - listeners: map[uintptr]*func(sample types.Sample){}, - emitUpdate: make(chan bool), - emitStop: make(chan bool), - started: false, + logger: logger, + codec: codec, + pipelineStr: pipelineStr, + sampleStop: make(chan interface{}), + sampleUpdate: make(chan interface{}), + listeners: map[uintptr]*func(sample types.Sample){}, } manager.wg.Add(1) @@ -51,17 +55,17 @@ func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) for { select { - case <-manager.emitStop: + case <-manager.sampleStop: manager.logger.Debug().Msg("stopped emitting samples") return - case <-manager.emitUpdate: + case <-manager.sampleUpdate: manager.logger.Debug().Msg("update emitting samples") case sample := <-manager.sample: - manager.emitMu.Lock() + manager.listenersMu.Lock() for _, emit := range manager.listeners { (*emit)(sample) } - manager.emitMu.Unlock() + manager.listenersMu.Unlock() } } }() @@ -72,15 +76,15 @@ func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) func (manager *StreamManagerCtx) shutdown() { manager.logger.Info().Msgf("shutdown") - manager.emitMu.Lock() + manager.listenersMu.Lock() for key := range manager.listeners { delete(manager.listeners, key) } - manager.emitMu.Unlock() + manager.listenersMu.Unlock() manager.destroyPipeline() - manager.emitStop <- true + close(manager.sampleStop) manager.wg.Wait() } @@ -88,63 +92,78 @@ func (manager *StreamManagerCtx) Codec() codec.RTPCodec { return manager.codec } -func (manager *StreamManagerCtx) AddListener(listener *func(sample types.Sample)) { - manager.emitMu.Lock() - defer manager.emitMu.Unlock() - - if listener != nil { - ptr := reflect.ValueOf(listener).Pointer() - manager.listeners[ptr] = listener - manager.logger.Debug().Interface("ptr", ptr).Msgf("adding listener") +func (manager *StreamManagerCtx) NewListener(listener *func(sample types.Sample)) (addListener func(), err error) { + if listener == nil { + return addListener, errors.New("listener cannot be nil") } + + manager.mu.Lock() + defer manager.mu.Unlock() + + if manager.listenersCount == 0 { + err := manager.createPipeline() + if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { + return addListener, err + } + + manager.listenersCount++ + manager.logger.Info().Msgf("first listener, starting") + } + + return func() { + ptr := reflect.ValueOf(listener).Pointer() + + manager.listenersMu.Lock() + manager.listeners[ptr] = listener + manager.listenersMu.Unlock() + + manager.logger.Debug().Interface("ptr", ptr).Msgf("adding listener") + }, nil } func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Sample)) { - manager.emitMu.Lock() - defer manager.emitMu.Unlock() - - if listener != nil { - ptr := reflect.ValueOf(listener).Pointer() - delete(manager.listeners, ptr) - manager.logger.Debug().Interface("ptr", ptr).Msgf("removing listener") + if listener == nil { + return } + + ptr := reflect.ValueOf(listener).Pointer() + + manager.listenersMu.Lock() + delete(manager.listeners, ptr) + manager.listenersMu.Unlock() + + manager.logger.Debug().Interface("ptr", ptr).Msgf("removing listener") + + go func() { + manager.mu.Lock() + defer manager.mu.Unlock() + + if manager.listenersCount == 1 { + manager.destroyPipeline() + manager.listenersCount = 0 + manager.logger.Info().Msgf("last listener, stopping") + } + }() } func (manager *StreamManagerCtx) ListenersCount() int { - manager.emitMu.Lock() - defer manager.emitMu.Unlock() + manager.listenersMu.Lock() + defer manager.listenersMu.Unlock() return len(manager.listeners) } -func (manager *StreamManagerCtx) Start() error { - manager.mu.Lock() - defer manager.mu.Unlock() - - err := manager.createPipeline() - if err != nil { - return err - } - - manager.logger.Info().Msgf("start") - manager.started = true - return nil -} - -func (manager *StreamManagerCtx) Stop() { - manager.mu.Lock() - defer manager.mu.Unlock() - - manager.logger.Info().Msgf("stop") - manager.started = false - manager.destroyPipeline() -} - func (manager *StreamManagerCtx) Started() bool { - return manager.started + manager.mu.Lock() + defer manager.mu.Unlock() + + return manager.listenersCount > 0 } func (manager *StreamManagerCtx) createPipeline() error { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + if manager.pipeline != nil { return types.ErrCapturePipelineAlreadyExists } @@ -166,11 +185,14 @@ func (manager *StreamManagerCtx) createPipeline() error { manager.pipeline.Start() manager.sample = manager.pipeline.Sample - manager.emitUpdate <- true + manager.sampleUpdate <- struct{}{} return nil } func (manager *StreamManagerCtx) destroyPipeline() { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + if manager.pipeline == nil { return } diff --git a/internal/types/capture.go b/internal/types/capture.go index 8901bdf6..84c35672 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -35,12 +35,12 @@ type ScreencastManager interface { type StreamManager interface { Codec() codec.RTPCodec - AddListener(listener *func(sample Sample)) + // starts pipeline if was not running before and returns register function + NewListener(listener *func(sample Sample)) (addListener func(), err error) + // stops pipeline if it was last listener RemoveListener(listener *func(sample Sample)) - ListenersCount() int - Start() error - Stop() + ListenersCount() int Started() bool } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 55355e12..04e9b7a7 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -1,15 +1,11 @@ package webrtc import ( - "errors" "fmt" - "io" "strings" - "sync" "time" "github.com/pion/webrtc/v3" - "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -39,13 +35,10 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con capture: capture, curImage: cursor.NewImage(desktop), curPosition: cursor.NewPosition(desktop), - - participants: 0, } } type WebRTCManagerCtx struct { - mu sync.Mutex logger zerolog.Logger config *config.WebRTC @@ -53,33 +46,9 @@ type WebRTCManagerCtx struct { capture types.CaptureManager curImage *cursor.ImageCtx curPosition *cursor.PositionCtx - - audioTrack *webrtc.TrackLocalStaticSample - audioListener func(sample types.Sample) - participants uint32 } func (manager *WebRTCManagerCtx) Start() { - var err error - - // create audio track - audio := manager.capture.Audio() - manager.audioTrack, err = webrtc.NewTrackLocalStaticSample(audio.Codec().Capability, "audio", "stream") - if err != nil { - manager.logger.Panic().Err(err).Msg("unable to create audio track") - } - - manager.audioListener = func(sample types.Sample) { - if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil { - if errors.Is(err, io.ErrClosedPipe) { - // The peerConnection has been closed. - return - } - manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") - } - } - audio.AddListener(&manager.audioListener) - manager.curImage.Start() manager.logger.Info(). @@ -97,9 +66,6 @@ func (manager *WebRTCManagerCtx) Shutdown() error { manager.curImage.Shutdown() manager.curPosition.Shutdown() - audio := manager.capture.Audio() - audio.RemoveListener(&manager.audioListener) - return nil } @@ -112,6 +78,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin logger := manager.logger.With().Str("session_id", session.ID()).Logger() logger.Info().Msg("creating webrtc peer") + // all audios must have the same codec + audioStream := manager.capture.Audio() + // all videos must have the same codec videoStream, ok := manager.capture.Video(videoID) if !ok { @@ -119,8 +88,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } connection, err := manager.newPeerConnection([]codec.RTPCodec{ + audioStream.Codec(), videoStream.Codec(), - manager.capture.Audio().Codec(), }, logger) if err != nil { return nil, err @@ -142,79 +111,32 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) } - // create video track - videoTrack, err := webrtc.NewTrackLocalStaticSample(videoStream.Codec().Capability, "video", "stream") + // audio track + + audioTrack, err := manager.newPeerTrack(audioStream, logger) if err != nil { return nil, err } - videoListener := func(sample types.Sample) { - if err := videoTrack.WriteSample(media.Sample(sample)); err != nil { - if errors.Is(err, io.ErrClosedPipe) { - // The peerConnection has been closed. - return - } - logger.Warn().Err(err).Msg("video pipeline failed to write") - } - } - - manager.mu.Lock() - - // should be stream started - if videoStream.ListenersCount() == 0 { - if err := videoStream.Start(); err != nil { - return nil, err - } - } - - videoStream.AddListener(&videoListener) - - // start audio, when first participant connects - if !manager.capture.Audio().Started() { - if err := manager.capture.Audio().Start(); err != nil { - manager.logger.Panic().Err(err).Msg("unable to start audio stream") - } - } - - manager.participants = manager.participants + 1 - manager.mu.Unlock() - - changeVideo := func(videoID string) error { - newVideoStream, ok := manager.capture.Video(videoID) - if !ok { - return types.ErrWebRTCVideoNotFound - } - - // should be new stream started - if newVideoStream.ListenersCount() == 0 { - if err := newVideoStream.Start(); err != nil { - return err - } - } - - // switch videoListeners - videoStream.RemoveListener(&videoListener) - newVideoStream.AddListener(&videoListener) - - // should be old stream stopped - if videoStream.ListenersCount() == 0 { - videoStream.Stop() - } - - videoStream = newVideoStream - return nil - } - - rtpAudio, err := connection.AddTrack(manager.audioTrack) + audioTrack.AddToConnection(connection) if err != nil { return nil, err } - rtpVideo, err := connection.AddTrack(videoTrack) + // video track + + videoTrack, err := manager.newPeerTrack(videoStream, logger) if err != nil { return nil, err } + videoTrack.AddToConnection(connection) + if err != nil { + return nil, err + } + + // data channel + dataChannel, err := connection.CreateDataChannel("data", nil) if err != nil { return nil, err @@ -224,8 +146,15 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin logger: logger, connection: connection, dataChannel: dataChannel, - changeVideo: changeVideo, - iceTrickle: manager.config.ICETrickle, + changeVideo: func(videoID string) error { + videoStream, ok := manager.capture.Video(videoID) + if !ok { + return types.ErrWebRTCVideoNotFound + } + + return videoTrack.SetStream(videoStream) + }, + iceTrickle: manager.config.ICETrickle, } cursorImage := func(entry *cursor.ImageEntry) { @@ -252,29 +181,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin webrtc.PeerConnectionStateFailed: connection.Close() case webrtc.PeerConnectionStateClosed: - manager.mu.Lock() - session.SetWebRTCConnected(peer, false) - videoStream.RemoveListener(&videoListener) - - // should be stream stopped - if videoStream.ListenersCount() == 0 { - videoStream.Stop() - } - - // decrease participants - manager.participants = manager.participants - 1 - - // stop audio, if last participant disonnects - if manager.participants <= 0 { - manager.participants = 0 - - if manager.capture.Audio().Started() { - manager.capture.Audio().Stop() - } - } - - manager.mu.Unlock() + videoTrack.RemoveStream() + audioTrack.RemoveStream() } }) @@ -310,24 +219,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } }) - go func() { - rtcpBuf := make([]byte, 1500) - for { - if _, _, err := rtpAudio.Read(rtcpBuf); err != nil { - return - } - } - }() - - go func() { - rtcpBuf := make([]byte, 1500) - for { - if _, _, err := rtpVideo.Read(rtcpBuf); err != nil { - return - } - } - }() - session.SetWebRTCPeer(peer) return peer.CreateOffer(false) } diff --git a/internal/webrtc/peertrack.go b/internal/webrtc/peertrack.go new file mode 100644 index 00000000..ef7cf8c6 --- /dev/null +++ b/internal/webrtc/peertrack.go @@ -0,0 +1,97 @@ +package webrtc + +import ( + "demodesk/neko/internal/types" + "errors" + "io" + "sync" + + "github.com/pion/webrtc/v3" + "github.com/pion/webrtc/v3/pkg/media" + "github.com/rs/zerolog" +) + +func (manager *WebRTCManagerCtx) newPeerTrack(stream types.StreamManager, logger zerolog.Logger) (*PeerTrack, error) { + codec := stream.Codec() + + id := codec.Type.String() + track, err := webrtc.NewTrackLocalStaticSample(codec.Capability, id, "stream") + if err != nil { + return nil, err + } + + logger = logger.With().Str("id", id).Logger() + + peer := &PeerTrack{ + logger: logger, + track: track, + listener: func(sample types.Sample) { + err := track.WriteSample(media.Sample(sample)) + if err != nil && errors.Is(err, io.ErrClosedPipe) { + logger.Warn().Err(err).Msg("pipeline failed to write") + } + }, + } + + peer.SetStream(stream) + return peer, nil + +} + +type PeerTrack struct { + logger zerolog.Logger + track *webrtc.TrackLocalStaticSample + listener func(sample types.Sample) + + streamMu sync.Mutex + stream types.StreamManager +} + +func (peer *PeerTrack) SetStream(stream types.StreamManager) error { + peer.streamMu.Lock() + defer peer.streamMu.Unlock() + + // prepare new listener + addListener, err := stream.NewListener(&peer.listener) + if err != nil { + return err + } + + // remove previous listener (in case it existed) + if peer.stream != nil { + peer.stream.RemoveListener(&peer.listener) + } + + // add new listener + addListener() + + peer.stream = stream + return nil +} + +func (peer *PeerTrack) RemoveStream() { + peer.streamMu.Lock() + defer peer.streamMu.Unlock() + + if peer.stream != nil { + peer.stream.RemoveListener(&peer.listener) + } +} + +func (peer *PeerTrack) AddToConnection(connection *webrtc.PeerConnection) error { + sender, err := connection.AddTrack(peer.track) + if err != nil { + return err + } + + go func() { + rtcpBuf := make([]byte, 1500) + for { + if _, _, err := sender.Read(rtcpBuf); err != nil { + return + } + } + }() + + return nil +} From 5bb2da2732af97c3cd9b24107ee8a26b1c1a11f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 27 Sep 2021 01:17:25 +0200 Subject: [PATCH 581/876] stream fix listener counts. --- internal/capture/stream.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 3e810a4e..96907dd9 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -100,13 +100,13 @@ func (manager *StreamManagerCtx) NewListener(listener *func(sample types.Sample) manager.mu.Lock() defer manager.mu.Unlock() - if manager.listenersCount == 0 { + manager.listenersCount++ + if manager.listenersCount == 1 { err := manager.createPipeline() if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { return addListener, err } - manager.listenersCount++ manager.logger.Info().Msgf("first listener, starting") } @@ -134,11 +134,15 @@ func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Samp manager.logger.Debug().Interface("ptr", ptr).Msgf("removing listener") + manager.mu.Lock() + manager.listenersCount-- + manager.mu.Unlock() + go func() { manager.mu.Lock() defer manager.mu.Unlock() - if manager.listenersCount == 1 { + if manager.listenersCount == 0 { manager.destroyPipeline() manager.listenersCount = 0 manager.logger.Info().Msgf("last listener, stopping") From 18fbdb2ff8774b521447a3e0ce8eef65796b08f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 29 Sep 2021 00:21:53 +0200 Subject: [PATCH 582/876] stream listener count <0 handling. --- internal/capture/stream.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 96907dd9..44608cdb 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -29,7 +29,7 @@ type StreamManagerCtx struct { listeners map[uintptr]*func(sample types.Sample) listenersMu sync.Mutex - listenersCount uint32 + listenersCount int } func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) *StreamManagerCtx { @@ -142,11 +142,15 @@ func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Samp manager.mu.Lock() defer manager.mu.Unlock() - if manager.listenersCount == 0 { + if manager.listenersCount <= 0 { manager.destroyPipeline() - manager.listenersCount = 0 manager.logger.Info().Msgf("last listener, stopping") } + + if manager.listenersCount < 0 { + manager.listenersCount = 0 + manager.logger.Error().Int("listeners-count", manager.listenersCount).Msgf("listener counter is < 0, something is wrong") + } }() } From 77d2ef9aaf424f8be559e37d8d37e584be8986a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 29 Sep 2021 00:22:51 +0200 Subject: [PATCH 583/876] stream listener use channel dispatcher. --- internal/capture/stream.go | 26 ++++++++++++++++++++------ internal/types/capture.go | 5 +++-- internal/webrtc/peertrack.go | 4 ++-- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 44608cdb..1c0ee341 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -4,6 +4,7 @@ import ( "errors" "reflect" "sync" + "time" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -13,12 +14,14 @@ import ( "demodesk/neko/internal/types/codec" ) +const newListenerTimeout = 500 * time.Millisecond + type StreamManagerCtx struct { logger zerolog.Logger mu sync.Mutex wg sync.WaitGroup - codec codec.RTPCodec + codec codec.RTPCodec pipeline *gst.Pipeline pipelineMu sync.Mutex pipelineStr func() string @@ -92,9 +95,9 @@ func (manager *StreamManagerCtx) Codec() codec.RTPCodec { return manager.codec } -func (manager *StreamManagerCtx) NewListener(listener *func(sample types.Sample)) (addListener func(), err error) { +func (manager *StreamManagerCtx) NewListener(listener *func(sample types.Sample)) (dispatcher chan interface{}, err error) { if listener == nil { - return addListener, errors.New("listener cannot be nil") + return dispatcher, errors.New("listener cannot be nil") } manager.mu.Lock() @@ -104,13 +107,22 @@ func (manager *StreamManagerCtx) NewListener(listener *func(sample types.Sample) if manager.listenersCount == 1 { err := manager.createPipeline() if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { - return addListener, err + return dispatcher, err } manager.logger.Info().Msgf("first listener, starting") } - return func() { + dispatcher = make(chan interface{}, 1) + go func() { + select { + case <-time.After(newListenerTimeout): + manager.logger.Warn().Msgf("add listener channel was not called, timeouted") + break + case <-dispatcher: + break + } + ptr := reflect.ValueOf(listener).Pointer() manager.listenersMu.Lock() @@ -118,7 +130,9 @@ func (manager *StreamManagerCtx) NewListener(listener *func(sample types.Sample) manager.listenersMu.Unlock() manager.logger.Debug().Interface("ptr", ptr).Msgf("adding listener") - }, nil + }() + + return dispatcher, nil } func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Sample)) { diff --git a/internal/types/capture.go b/internal/types/capture.go index 84c35672..e308daa0 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -35,8 +35,9 @@ type ScreencastManager interface { type StreamManager interface { Codec() codec.RTPCodec - // starts pipeline if was not running before and returns register function - NewListener(listener *func(sample Sample)) (addListener func(), err error) + // starts pipeline if was not running before + // and returns dispatcher channel + NewListener(listener *func(sample Sample)) (dispatcher chan interface{}, err error) // stops pipeline if it was last listener RemoveListener(listener *func(sample Sample)) diff --git a/internal/webrtc/peertrack.go b/internal/webrtc/peertrack.go index ef7cf8c6..a2d1efc8 100644 --- a/internal/webrtc/peertrack.go +++ b/internal/webrtc/peertrack.go @@ -52,7 +52,7 @@ func (peer *PeerTrack) SetStream(stream types.StreamManager) error { defer peer.streamMu.Unlock() // prepare new listener - addListener, err := stream.NewListener(&peer.listener) + dispatcher, err := stream.NewListener(&peer.listener) if err != nil { return err } @@ -63,7 +63,7 @@ func (peer *PeerTrack) SetStream(stream types.StreamManager) error { } // add new listener - addListener() + close(dispatcher) peer.stream = stream return nil From 5bae3503d04eeb5acad66c11b994868dd71b063e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 29 Sep 2021 01:01:03 +0200 Subject: [PATCH 584/876] session websocket & webrtc add mutex. --- internal/session/session.go | 83 +++++++++++++++++++++++++------------ 1 file changed, 56 insertions(+), 27 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index b4359d4e..e7d8a847 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -1,20 +1,26 @@ package session import ( + "sync" + "github.com/rs/zerolog" "demodesk/neko/internal/types" ) type SessionCtx struct { - id string - token string - logger zerolog.Logger - manager *SessionManagerCtx - profile types.MemberProfile - state types.SessionState + id string + token string + logger zerolog.Logger + manager *SessionManagerCtx + profile types.MemberProfile + state types.SessionState + websocketPeer types.WebSocketPeer - webrtcPeer types.WebRTCPeer + websocketMu sync.Mutex + + webrtcPeer types.WebRTCPeer + webrtcMu sync.Mutex } func (session *SessionCtx) ID() string { @@ -31,11 +37,11 @@ func (session *SessionCtx) profileChanged() { } if (!session.profile.CanConnect || !session.profile.CanLogin || !session.profile.CanWatch) && session.state.IsWatching { - session.webrtcPeer.Destroy() + session.GetWebRTCPeer().Destroy() } if (!session.profile.CanConnect || !session.profile.CanLogin) && session.state.IsConnected { - session.websocketPeer.Destroy("profile changed") + session.GetWebSocketPeer().Destroy("profile changed") } } @@ -44,7 +50,7 @@ func (session *SessionCtx) State() types.SessionState { } func (session *SessionCtx) IsHost() bool { - return session.manager.host != nil && session.manager.host == session + return session.manager.GetHost() == session } // --- @@ -52,39 +58,50 @@ func (session *SessionCtx) IsHost() bool { // --- func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { - if session.websocketPeer != nil { - session.websocketPeer.Destroy("connection replaced") - } + session.websocketMu.Lock() + session.websocketPeer, websocketPeer = websocketPeer, session.websocketPeer + session.websocketMu.Unlock() - session.websocketPeer = websocketPeer + if websocketPeer != nil && websocketPeer != session.websocketPeer { + websocketPeer.Destroy("connection replaced") + } } func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPeer, connected bool) { + session.websocketMu.Lock() if websocketPeer != session.websocketPeer { + session.websocketMu.Unlock() return } + session.websocketMu.Unlock() session.state.IsConnected = connected if connected { session.manager.emmiter.Emit("connected", session) - return - } + } else { + session.manager.emmiter.Emit("disconnected", session) - session.manager.emmiter.Emit("disconnected", session) - session.websocketPeer = nil + session.websocketMu.Lock() + if websocketPeer == session.websocketPeer { + session.websocketPeer = nil + } + session.websocketMu.Unlock() + } } func (session *SessionCtx) GetWebSocketPeer() types.WebSocketPeer { + session.websocketMu.Lock() + defer session.websocketMu.Unlock() + return session.websocketPeer } func (session *SessionCtx) Send(event string, payload interface{}) { - if session.websocketPeer == nil { - return + peer := session.GetWebSocketPeer() + if peer != nil { + peer.Send(event, payload) } - - session.websocketPeer.Send(event, payload) } // --- @@ -92,26 +109,38 @@ func (session *SessionCtx) Send(event string, payload interface{}) { // --- func (session *SessionCtx) SetWebRTCPeer(webrtcPeer types.WebRTCPeer) { - if session.webrtcPeer != nil { - session.webrtcPeer.Destroy() - } + session.webrtcMu.Lock() + session.webrtcPeer, webrtcPeer = webrtcPeer, session.webrtcPeer + session.webrtcMu.Unlock() - session.webrtcPeer = webrtcPeer + if webrtcPeer != nil && webrtcPeer != session.webrtcPeer { + webrtcPeer.Destroy() + } } func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, connected bool) { + session.webrtcMu.Lock() if webrtcPeer != session.webrtcPeer { + session.webrtcMu.Unlock() return } + session.webrtcMu.Unlock() session.state.IsWatching = connected session.manager.emmiter.Emit("state_changed", session) if !connected { - session.webrtcPeer = nil + session.webrtcMu.Lock() + if webrtcPeer == session.webrtcPeer { + session.webrtcPeer = nil + } + session.webrtcMu.Unlock() } } func (session *SessionCtx) GetWebRTCPeer() types.WebRTCPeer { + session.webrtcMu.Lock() + defer session.webrtcMu.Unlock() + return session.webrtcPeer } From 325af8fc5acddc116c86efaf87ec346e560f33e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 29 Sep 2021 01:03:39 +0200 Subject: [PATCH 585/876] RemoveListener add dispatcher. --- internal/capture/stream.go | 15 +++++++++++++-- internal/types/capture.go | 2 +- internal/webrtc/peertrack.go | 15 +++++++++++---- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 1c0ee341..085078b9 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -135,9 +135,9 @@ func (manager *StreamManagerCtx) NewListener(listener *func(sample types.Sample) return dispatcher, nil } -func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Sample)) { +func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Sample)) (dispatcher chan interface{}) { if listener == nil { - return + return dispatcher } ptr := reflect.ValueOf(listener).Pointer() @@ -152,7 +152,16 @@ func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Samp manager.listenersCount-- manager.mu.Unlock() + dispatcher = make(chan interface{}, 1) go func() { + select { + case <-time.After(newListenerTimeout): + manager.logger.Warn().Msgf("remote listener channel was not called, timeouted") + break + case <-dispatcher: + break + } + manager.mu.Lock() defer manager.mu.Unlock() @@ -166,6 +175,8 @@ func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Samp manager.logger.Error().Int("listeners-count", manager.listenersCount).Msgf("listener counter is < 0, something is wrong") } }() + + return dispatcher } func (manager *StreamManagerCtx) ListenersCount() int { diff --git a/internal/types/capture.go b/internal/types/capture.go index e308daa0..1644f81b 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -39,7 +39,7 @@ type StreamManager interface { // and returns dispatcher channel NewListener(listener *func(sample Sample)) (dispatcher chan interface{}, err error) // stops pipeline if it was last listener - RemoveListener(listener *func(sample Sample)) + RemoveListener(listener *func(sample Sample)) (dispatcher chan interface{}) ListenersCount() int Started() bool diff --git a/internal/webrtc/peertrack.go b/internal/webrtc/peertrack.go index a2d1efc8..597181fa 100644 --- a/internal/webrtc/peertrack.go +++ b/internal/webrtc/peertrack.go @@ -52,18 +52,24 @@ func (peer *PeerTrack) SetStream(stream types.StreamManager) error { defer peer.streamMu.Unlock() // prepare new listener - dispatcher, err := stream.NewListener(&peer.listener) + addDispatcher, err := stream.NewListener(&peer.listener) if err != nil { return err } // remove previous listener (in case it existed) + var stopDispatcher chan interface{} if peer.stream != nil { - peer.stream.RemoveListener(&peer.listener) + stopDispatcher = peer.stream.RemoveListener(&peer.listener) } // add new listener - close(dispatcher) + close(addDispatcher) + + // stop old pipeline (in case it existed) + if stopDispatcher != nil { + close(stopDispatcher) + } peer.stream = stream return nil @@ -74,7 +80,8 @@ func (peer *PeerTrack) RemoveStream() { defer peer.streamMu.Unlock() if peer.stream != nil { - peer.stream.RemoveListener(&peer.listener) + dispatcher := peer.stream.RemoveListener(&peer.listener) + close(dispatcher) } } From e9502b0d9b3fd7c8af7ed7a4ae6764adbe2b6127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 30 Sep 2021 19:42:25 +0200 Subject: [PATCH 586/876] session update mutex logic. --- internal/session/session.go | 47 ++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index e7d8a847..8cf08892 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -54,7 +54,7 @@ func (session *SessionCtx) IsHost() bool { } // --- -// webscoket +// websocket // --- func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { @@ -69,25 +69,27 @@ func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPeer, connected bool) { session.websocketMu.Lock() - if websocketPeer != session.websocketPeer { - session.websocketMu.Unlock() + isCurrentPeer := websocketPeer == session.websocketPeer + session.websocketMu.Unlock() + + if !isCurrentPeer { return } - session.websocketMu.Unlock() session.state.IsConnected = connected if connected { session.manager.emmiter.Emit("connected", session) - } else { - session.manager.emmiter.Emit("disconnected", session) - - session.websocketMu.Lock() - if websocketPeer == session.websocketPeer { - session.websocketPeer = nil - } - session.websocketMu.Unlock() + return } + + session.manager.emmiter.Emit("disconnected", session) + + session.websocketMu.Lock() + if websocketPeer == session.websocketPeer { + session.websocketPeer = nil + } + session.websocketMu.Unlock() } func (session *SessionCtx) GetWebSocketPeer() types.WebSocketPeer { @@ -120,22 +122,25 @@ func (session *SessionCtx) SetWebRTCPeer(webrtcPeer types.WebRTCPeer) { func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, connected bool) { session.webrtcMu.Lock() - if webrtcPeer != session.webrtcPeer { - session.webrtcMu.Unlock() + isCurrentPeer := webrtcPeer == session.webrtcPeer + session.webrtcMu.Unlock() + + if !isCurrentPeer { return } - session.webrtcMu.Unlock() session.state.IsWatching = connected session.manager.emmiter.Emit("state_changed", session) - if !connected { - session.webrtcMu.Lock() - if webrtcPeer == session.webrtcPeer { - session.webrtcPeer = nil - } - session.webrtcMu.Unlock() + if connected { + return } + + session.webrtcMu.Lock() + if webrtcPeer == session.webrtcPeer { + session.webrtcPeer = nil + } + session.webrtcMu.Unlock() } func (session *SessionCtx) GetWebRTCPeer() types.WebRTCPeer { From 550084e195b00a2ac2da7fd680dd9b01a4889366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 30 Sep 2021 20:01:26 +0200 Subject: [PATCH 587/876] refactor screencast pipeline. --- internal/capture/screencast.go | 72 ++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 25 deletions(-) diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 36222b17..394f0abf 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -13,32 +13,41 @@ import ( "demodesk/neko/internal/types" ) -type ScreencastManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - wg sync.WaitGroup - pipelineStr string - pipeline *gst.Pipeline - enabled bool - started bool - emitStop chan bool - emitUpdate chan bool - expired int32 - sample chan types.Sample - image types.Sample -} - // timeout between intervals, when screencast pipeline is checked const screencastTimeout = 5 * time.Second +type ScreencastManagerCtx struct { + logger zerolog.Logger + mu sync.Mutex + wg sync.WaitGroup + + pipeline *gst.Pipeline + pipelineStr string + pipelineMu sync.Mutex + + image types.Sample + sample chan types.Sample + sampleStop chan interface{} + sampleUpdate chan interface{} + + enabled bool + started bool + expired int32 +} + func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { + logger := log.With(). + Str("module", "capture"). + Str("submodule", "screencast"). + Logger() + manager := &ScreencastManagerCtx{ - logger: log.With().Str("module", "capture").Str("submodule", "screencast").Logger(), - pipelineStr: pipelineStr, - enabled: enabled, - started: false, - emitStop: make(chan bool), - emitUpdate: make(chan bool), + logger: logger, + pipelineStr: pipelineStr, + sampleStop: make(chan interface{}), + sampleUpdate: make(chan interface{}), + enabled: enabled, + started: false, } manager.wg.Add(1) @@ -52,10 +61,10 @@ func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { for { select { - case <-manager.emitStop: + case <-manager.sampleStop: manager.logger.Debug().Msg("stopped emitting samples") return - case <-manager.emitUpdate: + case <-manager.sampleUpdate: manager.logger.Debug().Msg("update emitting samples") case sample := <-manager.sample: manager.image = sample @@ -75,15 +84,21 @@ func (manager *ScreencastManagerCtx) shutdown() { manager.destroyPipeline() - manager.emitStop <- true + close(manager.sampleStop) manager.wg.Wait() } func (manager *ScreencastManagerCtx) Enabled() bool { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.enabled } func (manager *ScreencastManagerCtx) Started() bool { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.started } @@ -137,6 +152,9 @@ func (manager *ScreencastManagerCtx) stop() { } func (manager *ScreencastManagerCtx) createPipeline() error { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + if manager.pipeline != nil { return types.ErrCapturePipelineAlreadyExists } @@ -153,12 +171,16 @@ func (manager *ScreencastManagerCtx) createPipeline() error { } manager.pipeline.Start() + manager.sample = manager.pipeline.Sample - manager.emitUpdate <- true + manager.sampleUpdate <- struct{}{} return nil } func (manager *ScreencastManagerCtx) destroyPipeline() { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + if manager.pipeline == nil { return } From 4debddf27db75d2e636b929405ef6ed89b035fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 30 Sep 2021 20:03:30 +0200 Subject: [PATCH 588/876] remove leftover variable from capture manager. --- internal/capture/manager.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index ef67774b..fb622e02 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -13,9 +13,9 @@ import ( ) type CaptureManagerCtx struct { - logger zerolog.Logger - desktop types.DesktopManager - streaming bool + logger zerolog.Logger + desktop types.DesktopManager + broadcast *BroacastManagerCtx screencast *ScreencastManagerCtx audio *StreamManagerCtx @@ -92,9 +92,9 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt } return &CaptureManagerCtx{ - logger: logger, - desktop: desktop, - streaming: false, + logger: logger, + desktop: desktop, + broadcast: broadcastNew(broadcastPipeline), screencast: screencastNew(config.ScreencastEnabled, screencastPipeline), audio: streamNew(config.AudioCodec, func() string { From c9c8cc67ca957af1788183f0efaeb225e780f219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 30 Sep 2021 20:06:43 +0200 Subject: [PATCH 589/876] refactor broadcast pipeline. --- internal/capture/broadcast.go | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index fb9615ca..d5510ca0 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -12,20 +12,28 @@ import ( ) type BroacastManagerCtx struct { - logger zerolog.Logger - mu sync.Mutex - pipelineStr string + logger zerolog.Logger + mu sync.Mutex + pipeline *gst.Pipeline - started bool - url string + pipelineStr string + pipelineMu sync.Mutex + + url string + started bool } func broadcastNew(pipelineStr string) *BroacastManagerCtx { + logger := log.With(). + Str("module", "capture"). + Str("submodule", "broadcast"). + Logger() + return &BroacastManagerCtx{ - logger: log.With().Str("module", "capture").Str("submodule", "broadcast").Logger(), + logger: logger, pipelineStr: pipelineStr, - started: false, url: "", + started: false, } } @@ -58,14 +66,23 @@ func (manager *BroacastManagerCtx) Stop() { } func (manager *BroacastManagerCtx) Started() bool { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.started } func (manager *BroacastManagerCtx) Url() string { + manager.mu.Lock() + defer manager.mu.Unlock() + return manager.url } func (manager *BroacastManagerCtx) createPipeline() error { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + if manager.pipeline != nil { return types.ErrCapturePipelineAlreadyExists } @@ -89,6 +106,9 @@ func (manager *BroacastManagerCtx) createPipeline() error { } func (manager *BroacastManagerCtx) destroyPipeline() { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + if manager.pipeline == nil { return } From 0245c73e2b8b2b4ca2bcf8940c1451c5e270618c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 1 Oct 2021 00:02:54 +0200 Subject: [PATCH 590/876] rename to PeerStreamTrack. --- internal/webrtc/manager.go | 4 ++-- .../webrtc/{peertrack.go => peerstreamtrack.go} | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) rename internal/webrtc/{peertrack.go => peerstreamtrack.go} (81%) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 04e9b7a7..f410bb4a 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -113,7 +113,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // audio track - audioTrack, err := manager.newPeerTrack(audioStream, logger) + audioTrack, err := manager.newPeerStreamTrack(audioStream, logger) if err != nil { return nil, err } @@ -125,7 +125,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // video track - videoTrack, err := manager.newPeerTrack(videoStream, logger) + videoTrack, err := manager.newPeerStreamTrack(videoStream, logger) if err != nil { return nil, err } diff --git a/internal/webrtc/peertrack.go b/internal/webrtc/peerstreamtrack.go similarity index 81% rename from internal/webrtc/peertrack.go rename to internal/webrtc/peerstreamtrack.go index 597181fa..7e9e7296 100644 --- a/internal/webrtc/peertrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog" ) -func (manager *WebRTCManagerCtx) newPeerTrack(stream types.StreamManager, logger zerolog.Logger) (*PeerTrack, error) { +func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamManager, logger zerolog.Logger) (*PeerStreamTrack, error) { codec := stream.Codec() id := codec.Type.String() @@ -22,7 +22,7 @@ func (manager *WebRTCManagerCtx) newPeerTrack(stream types.StreamManager, logger logger = logger.With().Str("id", id).Logger() - peer := &PeerTrack{ + peer := &PeerStreamTrack{ logger: logger, track: track, listener: func(sample types.Sample) { @@ -35,19 +35,18 @@ func (manager *WebRTCManagerCtx) newPeerTrack(stream types.StreamManager, logger peer.SetStream(stream) return peer, nil - } -type PeerTrack struct { +type PeerStreamTrack struct { logger zerolog.Logger track *webrtc.TrackLocalStaticSample listener func(sample types.Sample) - streamMu sync.Mutex stream types.StreamManager + streamMu sync.Mutex } -func (peer *PeerTrack) SetStream(stream types.StreamManager) error { +func (peer *PeerStreamTrack) SetStream(stream types.StreamManager) error { peer.streamMu.Lock() defer peer.streamMu.Unlock() @@ -75,7 +74,7 @@ func (peer *PeerTrack) SetStream(stream types.StreamManager) error { return nil } -func (peer *PeerTrack) RemoveStream() { +func (peer *PeerStreamTrack) RemoveStream() { peer.streamMu.Lock() defer peer.streamMu.Unlock() @@ -85,7 +84,7 @@ func (peer *PeerTrack) RemoveStream() { } } -func (peer *PeerTrack) AddToConnection(connection *webrtc.PeerConnection) error { +func (peer *PeerStreamTrack) AddToConnection(connection *webrtc.PeerConnection) error { sender, err := connection.AddTrack(peer.track) if err != nil { return err From 27cb473ef903fa2d2610c87e961f6a4115382a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 1 Oct 2021 13:46:10 +0200 Subject: [PATCH 591/876] stream implement MoveListenerTo. --- internal/capture/stream.go | 147 ++++++++++++++++------------- internal/types/capture.go | 8 +- internal/webrtc/peerstreamtrack.go | 32 +++---- 3 files changed, 94 insertions(+), 93 deletions(-) diff --git a/internal/capture/stream.go b/internal/capture/stream.go index 085078b9..ddba3eda 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -4,7 +4,6 @@ import ( "errors" "reflect" "sync" - "time" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -14,8 +13,6 @@ import ( "demodesk/neko/internal/types/codec" ) -const newListenerTimeout = 500 * time.Millisecond - type StreamManagerCtx struct { logger zerolog.Logger mu sync.Mutex @@ -30,9 +27,8 @@ type StreamManagerCtx struct { sampleStop chan interface{} sampleUpdate chan interface{} - listeners map[uintptr]*func(sample types.Sample) - listenersMu sync.Mutex - listenersCount int + listeners map[uintptr]*func(sample types.Sample) + listenersMu sync.Mutex } func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) *StreamManagerCtx { @@ -95,51 +91,37 @@ func (manager *StreamManagerCtx) Codec() codec.RTPCodec { return manager.codec } -func (manager *StreamManagerCtx) NewListener(listener *func(sample types.Sample)) (dispatcher chan interface{}, err error) { - if listener == nil { - return dispatcher, errors.New("listener cannot be nil") - } - - manager.mu.Lock() - defer manager.mu.Unlock() - - manager.listenersCount++ - if manager.listenersCount == 1 { +func (manager *StreamManagerCtx) start() error { + if len(manager.listeners) == 0 { err := manager.createPipeline() if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { - return dispatcher, err + return err } manager.logger.Info().Msgf("first listener, starting") } - dispatcher = make(chan interface{}, 1) - go func() { - select { - case <-time.After(newListenerTimeout): - manager.logger.Warn().Msgf("add listener channel was not called, timeouted") - break - case <-dispatcher: - break - } - - ptr := reflect.ValueOf(listener).Pointer() - - manager.listenersMu.Lock() - manager.listeners[ptr] = listener - manager.listenersMu.Unlock() - - manager.logger.Debug().Interface("ptr", ptr).Msgf("adding listener") - }() - - return dispatcher, nil + return nil } -func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Sample)) (dispatcher chan interface{}) { - if listener == nil { - return dispatcher +func (manager *StreamManagerCtx) stop() { + if len(manager.listeners) == 0 { + manager.destroyPipeline() + manager.logger.Info().Msgf("last listener, stopping") } +} +func (manager *StreamManagerCtx) addListener(listener *func(sample types.Sample)) { + ptr := reflect.ValueOf(listener).Pointer() + + manager.listenersMu.Lock() + manager.listeners[ptr] = listener + manager.listenersMu.Unlock() + + manager.logger.Debug().Interface("ptr", ptr).Msgf("adding listener") +} + +func (manager *StreamManagerCtx) removeListener(listener *func(sample types.Sample)) { ptr := reflect.ValueOf(listener).Pointer() manager.listenersMu.Lock() @@ -147,36 +129,70 @@ func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Samp manager.listenersMu.Unlock() manager.logger.Debug().Interface("ptr", ptr).Msgf("removing listener") +} +func (manager *StreamManagerCtx) AddListener(listener *func(sample types.Sample)) error { manager.mu.Lock() - manager.listenersCount-- - manager.mu.Unlock() + defer manager.mu.Unlock() - dispatcher = make(chan interface{}, 1) - go func() { - select { - case <-time.After(newListenerTimeout): - manager.logger.Warn().Msgf("remote listener channel was not called, timeouted") - break - case <-dispatcher: - break - } + if listener == nil { + return errors.New("listener cannot be nil") + } - manager.mu.Lock() - defer manager.mu.Unlock() + // start if stopped + if err := manager.start(); err != nil { + return err + } - if manager.listenersCount <= 0 { - manager.destroyPipeline() - manager.logger.Info().Msgf("last listener, stopping") - } + // add listener + manager.addListener(listener) - if manager.listenersCount < 0 { - manager.listenersCount = 0 - manager.logger.Error().Int("listeners-count", manager.listenersCount).Msgf("listener counter is < 0, something is wrong") - } - }() + return nil +} - return dispatcher +func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Sample)) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + if listener == nil { + return errors.New("listener cannot be nil") + } + + // remove listener + manager.removeListener(listener) + + // stop if started + manager.stop() + + return nil +} + +func (manager *StreamManagerCtx) MoveListenerTo(listener *func(sample types.Sample), stream types.StreamManager) error { + manager.mu.Lock() + defer manager.mu.Unlock() + + targetStream, ok := stream.(*StreamManagerCtx) + if !ok { + return errors.New("stream manager does not support moving listeners") + } + + if listener == nil { + return errors.New("listener cannot be nil") + } + + // start if stopped + if err := targetStream.start(); err != nil { + return err + } + + // swap listeners + manager.removeListener(listener) + targetStream.addListener(listener) + + // stop if started + manager.stop() + + return nil } func (manager *StreamManagerCtx) ListenersCount() int { @@ -187,10 +203,7 @@ func (manager *StreamManagerCtx) ListenersCount() int { } func (manager *StreamManagerCtx) Started() bool { - manager.mu.Lock() - defer manager.mu.Unlock() - - return manager.listenersCount > 0 + return manager.ListenersCount() > 0 } func (manager *StreamManagerCtx) createPipeline() error { diff --git a/internal/types/capture.go b/internal/types/capture.go index 1644f81b..ed00b999 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -35,11 +35,9 @@ type ScreencastManager interface { type StreamManager interface { Codec() codec.RTPCodec - // starts pipeline if was not running before - // and returns dispatcher channel - NewListener(listener *func(sample Sample)) (dispatcher chan interface{}, err error) - // stops pipeline if it was last listener - RemoveListener(listener *func(sample Sample)) (dispatcher chan interface{}) + AddListener(listener *func(sample Sample)) error + RemoveListener(listener *func(sample Sample)) error + MoveListenerTo(listener *func(sample Sample), targetStream StreamManager) error ListenersCount() int Started() bool diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go index 7e9e7296..946d87ad 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -33,8 +33,8 @@ func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamManager, }, } - peer.SetStream(stream) - return peer, nil + err = peer.SetStream(stream) + return peer, err } type PeerStreamTrack struct { @@ -50,28 +50,18 @@ func (peer *PeerStreamTrack) SetStream(stream types.StreamManager) error { peer.streamMu.Lock() defer peer.streamMu.Unlock() - // prepare new listener - addDispatcher, err := stream.NewListener(&peer.listener) - if err != nil { - return err - } - - // remove previous listener (in case it existed) - var stopDispatcher chan interface{} + var err error if peer.stream != nil { - stopDispatcher = peer.stream.RemoveListener(&peer.listener) + err = peer.stream.MoveListenerTo(&peer.listener, stream) + } else { + err = peer.stream.AddListener(&peer.listener) } - // add new listener - close(addDispatcher) - - // stop old pipeline (in case it existed) - if stopDispatcher != nil { - close(stopDispatcher) + if err != nil { + peer.stream = stream } - peer.stream = stream - return nil + return err } func (peer *PeerStreamTrack) RemoveStream() { @@ -79,8 +69,8 @@ func (peer *PeerStreamTrack) RemoveStream() { defer peer.streamMu.Unlock() if peer.stream != nil { - dispatcher := peer.stream.RemoveListener(&peer.listener) - close(dispatcher) + peer.stream.RemoveListener(&peer.listener) + peer.stream = nil } } From 8960fc23711cea65324e9ab4c421005cfac6d8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 1 Oct 2021 14:41:21 +0200 Subject: [PATCH 592/876] MoveListenerTo ensure atomic execution. --- internal/capture/stream.go | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/internal/capture/stream.go b/internal/capture/stream.go index ddba3eda..bf93d757 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -13,6 +13,8 @@ import ( "demodesk/neko/internal/types/codec" ) +var moveListenerMu = sync.Mutex{} + type StreamManagerCtx struct { logger zerolog.Logger mu sync.Mutex @@ -167,19 +169,36 @@ func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Samp return nil } +// moving listeners between streams ensures, that target pipeline is running +// before listener is added, and stops source pipeline if there are 0 listeners func (manager *StreamManagerCtx) MoveListenerTo(listener *func(sample types.Sample), stream types.StreamManager) error { - manager.mu.Lock() - defer manager.mu.Unlock() - - targetStream, ok := stream.(*StreamManagerCtx) - if !ok { - return errors.New("stream manager does not support moving listeners") - } - if listener == nil { return errors.New("listener cannot be nil") } + targetStream, ok := stream.(*StreamManagerCtx) + if !ok { + return errors.New("target stream manager does not support moving listeners") + } + + // we need to acquire both mutextes, from source stream and from target stream + // in order to do that safely (without possibility of deadlock) we need third + // global mutex, that ensures atomic locking + + // lock global mutex + moveListenerMu.Lock() + + // lock source stream + manager.mu.Lock() + defer manager.mu.Unlock() + + // lock target stream + targetStream.mu.Lock() + defer targetStream.mu.Unlock() + + // unlock global mutex + moveListenerMu.Unlock() + // start if stopped if err := targetStream.start(); err != nil { return err From 74dbdea78a7044f78940bb4d1323a205f9f8a007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 2 Oct 2021 13:51:22 +0200 Subject: [PATCH 593/876] fix typo. --- internal/webrtc/peerstreamtrack.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go index 946d87ad..c6c882a5 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -54,10 +54,10 @@ func (peer *PeerStreamTrack) SetStream(stream types.StreamManager) error { if peer.stream != nil { err = peer.stream.MoveListenerTo(&peer.listener, stream) } else { - err = peer.stream.AddListener(&peer.listener) + err = stream.AddListener(&peer.listener) } - if err != nil { + if err == nil { peer.stream = stream } From e45bd7098f5ccfadfa23110e8daf5025995949e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Oct 2021 14:40:20 +0200 Subject: [PATCH 594/876] replace chan struct{}. --- internal/capture/screencast.go | 8 ++++---- internal/capture/stream.go | 8 ++++---- internal/desktop/manager.go | 4 ++-- internal/websocket/manager.go | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 394f0abf..4583c240 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -27,8 +27,8 @@ type ScreencastManagerCtx struct { image types.Sample sample chan types.Sample - sampleStop chan interface{} - sampleUpdate chan interface{} + sampleStop chan struct{} + sampleUpdate chan struct{} enabled bool started bool @@ -44,8 +44,8 @@ func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { manager := &ScreencastManagerCtx{ logger: logger, pipelineStr: pipelineStr, - sampleStop: make(chan interface{}), - sampleUpdate: make(chan interface{}), + sampleStop: make(chan struct{}), + sampleUpdate: make(chan struct{}), enabled: enabled, started: false, } diff --git a/internal/capture/stream.go b/internal/capture/stream.go index bf93d757..a6450eed 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -26,8 +26,8 @@ type StreamManagerCtx struct { pipelineStr func() string sample chan types.Sample - sampleStop chan interface{} - sampleUpdate chan interface{} + sampleStop chan struct{} + sampleUpdate chan struct{} listeners map[uintptr]*func(sample types.Sample) listenersMu sync.Mutex @@ -43,8 +43,8 @@ func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) logger: logger, codec: codec, pipelineStr: pipelineStr, - sampleStop: make(chan interface{}), - sampleUpdate: make(chan interface{}), + sampleStop: make(chan struct{}), + sampleUpdate: make(chan struct{}), listeners: map[uintptr]*func(sample types.Sample){}, } diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index ddf8fe65..2dc3771e 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -19,7 +19,7 @@ var mu = sync.Mutex{} type DesktopManagerCtx struct { logger zerolog.Logger wg sync.WaitGroup - shutdown chan interface{} + shutdown chan struct{} emmiter events.EventEmmiter config *config.Desktop } @@ -27,7 +27,7 @@ type DesktopManagerCtx struct { func New(config *config.Desktop) *DesktopManagerCtx { return &DesktopManagerCtx{ logger: log.With().Str("module", "desktop").Logger(), - shutdown: make(chan interface{}), + shutdown: make(chan struct{}), emmiter: events.New(), config: config, } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 11cc3392..573aa20d 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -30,7 +30,7 @@ func New( return &WebSocketManagerCtx{ logger: logger, - shutdown: make(chan interface{}), + shutdown: make(chan struct{}), sessions: sessions, desktop: desktop, handler: handler.New(sessions, desktop, capture, webrtc), @@ -41,7 +41,7 @@ func New( type WebSocketManagerCtx struct { logger zerolog.Logger wg sync.WaitGroup - shutdown chan interface{} + shutdown chan struct{} sessions types.SessionManager desktop types.DesktopManager handler *handler.MessageHandlerCtx From d5c0c62675c1ce006c21b3ba99fed3ac65a7b3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 7 Oct 2021 21:41:19 +0200 Subject: [PATCH 595/876] lint fix minor problems. --- internal/webrtc/manager.go | 36 ++++++++++++++---------------- internal/webrtc/peerstreamtrack.go | 2 +- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index f410bb4a..f71726f6 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -118,8 +118,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return nil, err } - audioTrack.AddToConnection(connection) - if err != nil { + if err := audioTrack.AddToConnection(connection); err != nil { return nil, err } @@ -130,8 +129,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return nil, err } - videoTrack.AddToConnection(connection) - if err != nil { + if err := videoTrack.AddToConnection(connection); err != nil { return nil, err } @@ -157,6 +155,20 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin iceTrickle: manager.config.ICETrickle, } + connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { + switch state { + case webrtc.PeerConnectionStateConnected: + session.SetWebRTCConnected(peer, true) + case webrtc.PeerConnectionStateDisconnected, + webrtc.PeerConnectionStateFailed: + connection.Close() + case webrtc.PeerConnectionStateClosed: + session.SetWebRTCConnected(peer, false) + videoTrack.RemoveStream() + audioTrack.RemoveStream() + } + }) + cursorImage := func(entry *cursor.ImageEntry) { if err := peer.SendCursorImage(entry.Cursor, entry.Image); err != nil { logger.Err(err).Msg("could not send cursor image") @@ -173,20 +185,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } } - connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { - switch state { - case webrtc.PeerConnectionStateConnected: - session.SetWebRTCConnected(peer, true) - case webrtc.PeerConnectionStateDisconnected, - webrtc.PeerConnectionStateFailed: - connection.Close() - case webrtc.PeerConnectionStateClosed: - session.SetWebRTCConnected(peer, false) - videoTrack.RemoveStream() - audioTrack.RemoveStream() - } - }) - dataChannel.OnOpen(func() { manager.curImage.AddListener(&cursorImage) manager.curPosition.AddListener(&cursorPosition) @@ -214,7 +212,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return } - if err = manager.handle(message.Data, session); err != nil { + if err := manager.handle(message.Data, session); err != nil { logger.Err(err).Msg("data handle failed") } }) diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go index c6c882a5..2e3251e6 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -69,7 +69,7 @@ func (peer *PeerStreamTrack) RemoveStream() { defer peer.streamMu.Unlock() if peer.stream != nil { - peer.stream.RemoveListener(&peer.listener) + _ = peer.stream.RemoveListener(&peer.listener) peer.stream = nil } } From 2068c0ee05e68c907bfd752135860a13b1b08374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 21 Oct 2021 22:53:54 +0200 Subject: [PATCH 596/876] webrtc remote desktop from cursor pos. --- internal/webrtc/cursor/position.go | 10 +--------- internal/webrtc/manager.go | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/internal/webrtc/cursor/position.go b/internal/webrtc/cursor/position.go index de5994fd..81b65eed 100644 --- a/internal/webrtc/cursor/position.go +++ b/internal/webrtc/cursor/position.go @@ -6,21 +6,17 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - - "demodesk/neko/internal/types" ) -func NewPosition(desktop types.DesktopManager) *PositionCtx { +func NewPosition() *PositionCtx { return &PositionCtx{ logger: log.With().Str("module", "webrtc").Str("submodule", "cursor-position").Logger(), - desktop: desktop, listeners: map[uintptr]*func(x, y int){}, } } type PositionCtx struct { logger zerolog.Logger - desktop types.DesktopManager emitMu sync.Mutex listeners map[uintptr]*func(x, y int) } @@ -35,10 +31,6 @@ func (manager *PositionCtx) Shutdown() { manager.emitMu.Unlock() } -func (manager *PositionCtx) Get() (x, y int) { - return manager.desktop.GetCursorPosition() -} - func (manager *PositionCtx) Set(x, y int) { for _, emit := range manager.listeners { (*emit)(x, y) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index f71726f6..20407936 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -34,7 +34,7 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con desktop: desktop, capture: capture, curImage: cursor.NewImage(desktop), - curPosition: cursor.NewPosition(desktop), + curPosition: cursor.NewPosition(), } } @@ -198,7 +198,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } // send initial cursor position - x, y := manager.curPosition.Get() + x, y := manager.desktop.GetCursorPosition() cursorPosition(x, y) }) From 60f459392a6349ac5426e6640b6b9c8bd928928f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 21 Oct 2021 22:55:01 +0200 Subject: [PATCH 597/876] webrtc handle. --- internal/webrtc/handler.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index e9499529..898e4f47 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -12,18 +12,26 @@ func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) erro // add session id to logger context logger := manager.logger.With().Str("session_id", session.ID()).Logger() - buffer := bytes.NewBuffer(data) - header := &payload.Header{} - hbytes := make([]byte, 3) + // + // parse header + // + buffer := bytes.NewBuffer(data) + + hbytes := make([]byte, 3) if _, err := buffer.Read(hbytes); err != nil { return err } + header := &payload.Header{} if err := binary.Read(bytes.NewBuffer(hbytes), binary.BigEndian, header); err != nil { return err } + // + // parse body + // + buffer = bytes.NewBuffer(data) switch header.Event { From 318b833b30f6e5cbedd816a8349cc343678f7229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 23 Oct 2021 20:25:18 +0200 Subject: [PATCH 598/876] set position in session. --- internal/session/session.go | 16 ++++++++++++++++ internal/types/session.go | 3 +++ internal/webrtc/handler.go | 29 +++++++++++++++++++++++++---- internal/webrtc/manager.go | 4 ---- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 8cf08892..5c84d726 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -16,6 +16,10 @@ type SessionCtx struct { profile types.MemberProfile state types.SessionState + positionX int + positionY int + positionMu sync.Mutex + websocketPeer types.WebSocketPeer websocketMu sync.Mutex @@ -53,6 +57,18 @@ func (session *SessionCtx) IsHost() bool { return session.manager.GetHost() == session } +// --- +// cursor position +// --- + +func (session *SessionCtx) SetPosition(x, y int) { + session.positionMu.Lock() + defer session.positionMu.Unlock() + + session.positionX = x + session.positionY = y +} + // --- // websocket // --- diff --git a/internal/types/session.go b/internal/types/session.go index 045daf84..c814fc5d 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -23,6 +23,9 @@ type Session interface { State() SessionState IsHost() bool + // cursor position + SetPosition(x, y int) + // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) SetWebSocketConnected(websocketPeer WebSocketPeer, connected bool) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 898e4f47..3c06ae4f 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -34,15 +34,36 @@ func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) erro buffer = bytes.NewBuffer(data) - switch header.Event { - case payload.OP_MOVE: + // handle cursor move event + if header.Event == payload.OP_MOVE { payload := &payload.Move{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { return err } - manager.desktop.Move(int(payload.X), int(payload.Y)) - manager.curPosition.Set(int(payload.X), int(payload.Y)) + x, y := int(payload.X), int(payload.Y) + + // handle active cursor movement + if session.IsHost() { + manager.desktop.Move(x, y) + manager.curPosition.Set(x, y) + return nil + } + + // handle inactive cursor movement + if session.Profile().CanHost { + session.SetPosition(x, y) + } + + return nil + } + + // continue only if session is host + if !session.IsHost() { + return nil + } + + switch header.Event { case payload.OP_SCROLL: payload := &payload.Scroll{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 20407936..205f601e 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -208,10 +208,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { - if !session.IsHost() { - return - } - if err := manager.handle(message.Data, session); err != nil { logger.Err(err).Msg("data handle failed") } From 0b5e064cab1f34ec305919d8f839b8287ebd7307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 24 Oct 2021 01:09:41 +0200 Subject: [PATCH 599/876] add sessions cursors. --- internal/session/manager.go | 54 +++++++++++++++++++++++------- internal/session/session.go | 16 ++------- internal/types/event/events.go | 1 + internal/types/message/messages.go | 6 ++++ internal/types/session.go | 12 +++++-- internal/webrtc/handler.go | 2 +- internal/websocket/manager.go | 35 +++++++++++++++++++ 7 files changed, 97 insertions(+), 29 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index ba0c5305..f5d39166 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -15,14 +15,12 @@ import ( func New(config *config.Session) *SessionManagerCtx { manager := &SessionManagerCtx{ - logger: log.With().Str("module", "session").Logger(), - config: config, - host: nil, - hostMu: sync.Mutex{}, - tokens: make(map[string]string), - sessions: make(map[string]*SessionCtx), - sessionsMu: sync.Mutex{}, - emmiter: events.New(), + logger: log.With().Str("module", "session").Logger(), + config: config, + tokens: make(map[string]string), + sessions: make(map[string]*SessionCtx), + cursors: make(map[types.Session]types.Cursor), + emmiter: events.New(), } // create API session @@ -48,13 +46,19 @@ func New(config *config.Session) *SessionManagerCtx { } type SessionManagerCtx struct { - logger zerolog.Logger - config *config.Session - host types.Session - hostMu sync.Mutex + logger zerolog.Logger + config *config.Session + tokens map[string]string sessions map[string]*SessionCtx sessionsMu sync.Mutex + + host types.Session + hostMu sync.Mutex + + cursors map[types.Session]types.Cursor + cursorsMu sync.Mutex + emmiter events.EventEmmiter apiSession *SessionCtx } @@ -193,6 +197,32 @@ func (manager *SessionManagerCtx) ClearHost() { manager.SetHost(nil) } +// --- +// cursors +// --- + +func (manager *SessionManagerCtx) SetCursor(x, y int, session types.Session) { + manager.cursorsMu.Lock() + defer manager.cursorsMu.Unlock() + + pos, ok := manager.cursors[session] + if ok { + pos.X, pos.Y = x, y + } else { + manager.cursors[session] = types.Cursor{X: x, Y: y} + } +} + +func (manager *SessionManagerCtx) PopCursors() map[types.Session]types.Cursor { + manager.cursorsMu.Lock() + defer manager.cursorsMu.Unlock() + + cursors := manager.cursors + manager.cursors = make(map[types.Session]types.Cursor) + + return cursors +} + // --- // broadcasts // --- diff --git a/internal/session/session.go b/internal/session/session.go index 5c84d726..85e16a30 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -16,10 +16,6 @@ type SessionCtx struct { profile types.MemberProfile state types.SessionState - positionX int - positionY int - positionMu sync.Mutex - websocketPeer types.WebSocketPeer websocketMu sync.Mutex @@ -57,16 +53,8 @@ func (session *SessionCtx) IsHost() bool { return session.manager.GetHost() == session } -// --- -// cursor position -// --- - -func (session *SessionCtx) SetPosition(x, y int) { - session.positionMu.Lock() - defer session.positionMu.Unlock() - - session.positionX = x - session.positionY = y +func (session *SessionCtx) SetCursor(x, y int) { + session.manager.SetCursor(x, y, session) } // --- diff --git a/internal/types/event/events.go b/internal/types/event/events.go index e16ed9ab..7583e258 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -21,6 +21,7 @@ const ( SESSION_DELETED = "session/deleted" SESSION_PROFILE = "session/profile" SESSION_STATE = "session/state" + SESSION_CURSORS = "session/cursors" ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index bd64db7b..bff58a34 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -87,6 +87,12 @@ type SessionData struct { State types.SessionState `json:"state"` } +type SessionCursor struct { + ID string `json:"id"` + X uint16 `json:"x"` + Y uint16 `json:"y"` +} + ///////////////////////////// // Control ///////////////////////////// diff --git a/internal/types/session.go b/internal/types/session.go index c814fc5d..95063766 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -12,6 +12,11 @@ var ( ErrSessionLoginDisabled = errors.New("session login disabled") ) +type Cursor struct { + X int + Y int +} + type SessionState struct { IsConnected bool `json:"is_connected"` IsWatching bool `json:"is_watching"` @@ -23,8 +28,8 @@ type Session interface { State() SessionState IsHost() bool - // cursor position - SetPosition(x, y int) + // cursor + SetCursor(x, y int) // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) @@ -50,6 +55,9 @@ type SessionManager interface { GetHost() Session ClearHost() + SetCursor(x, y int, session Session) + PopCursors() map[Session]Cursor + Broadcast(event string, payload interface{}, exclude interface{}) AdminBroadcast(event string, payload interface{}, exclude interface{}) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 3c06ae4f..0732206b 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -52,7 +52,7 @@ func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) erro // handle inactive cursor movement if session.Profile().CanHost { - session.SetPosition(x, y) + session.SetCursor(x, y) } return nil diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 573aa20d..9295e253 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -132,6 +132,41 @@ func (manager *WebSocketManagerCtx) Start() { manager.fileChooserDialogEvents() + manager.wg.Add(1) + go func() { + defer manager.wg.Done() + + ticker := time.NewTicker(500 * time.Millisecond) + defer ticker.Stop() + + for { + select { + case <-manager.shutdown: + return + case <-ticker.C: + cursorsMap := manager.sessions.PopCursors() + if len(cursorsMap) == 0 { + continue + } + + cursors := []message.SessionCursor{} + for session, cursor := range cursorsMap { + cursors = append( + cursors, + message.SessionCursor{ + ID: session.ID(), + X: uint16(cursor.X), + Y: uint16(cursor.Y), + }, + ) + } + + // TODO: Send to subscribers only. + manager.sessions.AdminBroadcast(event.SESSION_CURSORS, cursors, nil) + } + } + }() + manager.logger.Info().Msg("websocket starting") } From 78e4c382645dda92748ec741523b03a190a34ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 26 Oct 2021 21:07:57 +0200 Subject: [PATCH 600/876] lastEmpty session cursors. --- internal/websocket/manager.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 9295e253..10ff58f9 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -139,6 +139,8 @@ func (manager *WebSocketManagerCtx) Start() { ticker := time.NewTicker(500 * time.Millisecond) defer ticker.Stop() + lastEmpty := false + for { select { case <-manager.shutdown: @@ -146,7 +148,13 @@ func (manager *WebSocketManagerCtx) Start() { case <-ticker.C: cursorsMap := manager.sessions.PopCursors() if len(cursorsMap) == 0 { - continue + if lastEmpty { + continue + } + + lastEmpty = true + } else { + lastEmpty = false } cursors := []message.SessionCursor{} From 1025eedc22b321c38716be9d2a1ee09ffaa337f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 26 Oct 2021 22:35:38 +0200 Subject: [PATCH 601/876] inactive cursor length rewrite. --- internal/websocket/manager.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 10ff58f9..ccd403c1 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -147,15 +147,12 @@ func (manager *WebSocketManagerCtx) Start() { return case <-ticker.C: cursorsMap := manager.sessions.PopCursors() - if len(cursorsMap) == 0 { - if lastEmpty { - continue - } - lastEmpty = true - } else { - lastEmpty = false + length := len(cursorsMap) + if length == 0 && lastEmpty { + continue } + lastEmpty = length == 0 cursors := []message.SessionCursor{} for session, cursor := range cursorsMap { From 28c22a254bbdf1e729161dfedd86dc6aab09b2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Nov 2021 17:31:00 +0100 Subject: [PATCH 602/876] use types.Cursor. --- internal/session/manager.go | 9 ++------- internal/session/session.go | 4 ++-- internal/types/session.go | 4 ++-- internal/webrtc/handler.go | 5 ++++- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index f5d39166..549e2a9b 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -201,16 +201,11 @@ func (manager *SessionManagerCtx) ClearHost() { // cursors // --- -func (manager *SessionManagerCtx) SetCursor(x, y int, session types.Session) { +func (manager *SessionManagerCtx) SetCursor(cursor types.Cursor, session types.Session) { manager.cursorsMu.Lock() defer manager.cursorsMu.Unlock() - pos, ok := manager.cursors[session] - if ok { - pos.X, pos.Y = x, y - } else { - manager.cursors[session] = types.Cursor{X: x, Y: y} - } + manager.cursors[session] = cursor } func (manager *SessionManagerCtx) PopCursors() map[types.Session]types.Cursor { diff --git a/internal/session/session.go b/internal/session/session.go index 85e16a30..d46458d5 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -53,8 +53,8 @@ func (session *SessionCtx) IsHost() bool { return session.manager.GetHost() == session } -func (session *SessionCtx) SetCursor(x, y int) { - session.manager.SetCursor(x, y, session) +func (session *SessionCtx) SetCursor(cursor types.Cursor) { + session.manager.SetCursor(cursor, session) } // --- diff --git a/internal/types/session.go b/internal/types/session.go index 95063766..82d28210 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -29,7 +29,7 @@ type Session interface { IsHost() bool // cursor - SetCursor(x, y int) + SetCursor(cursor Cursor) // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) @@ -55,7 +55,7 @@ type SessionManager interface { GetHost() Session ClearHost() - SetCursor(x, y int, session Session) + SetCursor(cursor Cursor, session Session) PopCursors() map[Session]Cursor Broadcast(event string, payload interface{}, exclude interface{}) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 0732206b..7ff5f81c 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -52,7 +52,10 @@ func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) erro // handle inactive cursor movement if session.Profile().CanHost { - session.SetCursor(x, y) + session.SetCursor(types.Cursor{ + X: x, + Y: y, + }) } return nil From 3528766e7f97cfc4ac9b236a61b3a2367985c203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Nov 2021 17:49:02 +0100 Subject: [PATCH 603/876] inactive cursors to config. --- internal/config/session.go | 7 ++++ internal/session/manager.go | 4 ++ internal/session/session.go | 4 +- internal/types/session.go | 1 + internal/websocket/manager.go | 74 +++++++++++++++++++---------------- 5 files changed, 56 insertions(+), 34 deletions(-) diff --git a/internal/config/session.go b/internal/config/session.go index 1cff4b32..182e3f62 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -9,6 +9,7 @@ import ( type Session struct { ImplicitHosting bool + InactiveCursors bool MercifulReconnect bool APIToken string @@ -24,6 +25,11 @@ func (Session) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("session.inactive_cursors", true, "show inactive cursors on the screen") + if err := viper.BindPFlag("session.inactive_cursors", cmd.PersistentFlags().Lookup("session.inactive_cursors")); err != nil { + return err + } + cmd.PersistentFlags().Bool("session.merciful_reconnect", true, "allow reconnecting to websocket even if previous connection was not closed") if err := viper.BindPFlag("session.merciful_reconnect", cmd.PersistentFlags().Lookup("session.merciful_reconnect")); err != nil { return err @@ -60,6 +66,7 @@ func (Session) Init(cmd *cobra.Command) error { func (s *Session) Set() { s.ImplicitHosting = viper.GetBool("session.implicit_hosting") + s.InactiveCursors = viper.GetBool("session.inactive_cursors") s.MercifulReconnect = viper.GetBool("session.merciful_reconnect") s.APIToken = viper.GetString("session.api_token") diff --git a/internal/session/manager.go b/internal/session/manager.go index 549e2a9b..d7697ab9 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -312,6 +312,10 @@ func (manager *SessionManagerCtx) ImplicitHosting() bool { return manager.config.ImplicitHosting } +func (manager *SessionManagerCtx) InactiveCursors() bool { + return manager.config.InactiveCursors +} + func (manager *SessionManagerCtx) CookieEnabled() bool { return manager.config.CookieEnabled } diff --git a/internal/session/session.go b/internal/session/session.go index d46458d5..79461927 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -54,7 +54,9 @@ func (session *SessionCtx) IsHost() bool { } func (session *SessionCtx) SetCursor(cursor types.Cursor) { - session.manager.SetCursor(cursor, session) + if session.manager.InactiveCursors() { + session.manager.SetCursor(cursor, session) + } } // --- diff --git a/internal/types/session.go b/internal/types/session.go index 82d28210..dd96f924 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -70,6 +70,7 @@ type SessionManager interface { OnHostChanged(listener func(session Session)) ImplicitHosting() bool + InactiveCursors() bool CookieEnabled() bool MercifulReconnect() bool diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index ccd403c1..b81e8cc1 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -20,6 +20,9 @@ import ( // send pings to peer with this period - must be less than pongWait const pingPeriod = 10 * time.Second +// period for sending inactive cursor messages +const inactiveCursorsPeriod = 500 * time.Millisecond + func New( sessions types.SessionManager, desktop types.DesktopManager, @@ -132,45 +135,50 @@ func (manager *WebSocketManagerCtx) Start() { manager.fileChooserDialogEvents() - manager.wg.Add(1) - go func() { - defer manager.wg.Done() + if manager.sessions.InactiveCursors() { + manager.logger.Info().Msg("starting inactive cursors handler") - ticker := time.NewTicker(500 * time.Millisecond) - defer ticker.Stop() + manager.wg.Add(1) + go func() { + defer manager.wg.Done() - lastEmpty := false + ticker := time.NewTicker(inactiveCursorsPeriod) + defer ticker.Stop() - for { - select { - case <-manager.shutdown: - return - case <-ticker.C: - cursorsMap := manager.sessions.PopCursors() + lastEmpty := false - length := len(cursorsMap) - if length == 0 && lastEmpty { - continue + for { + select { + case <-manager.shutdown: + manager.logger.Info().Msg("stopping inactive cursors handler") + return + case <-ticker.C: + cursorsMap := manager.sessions.PopCursors() + + length := len(cursorsMap) + if length == 0 && lastEmpty { + continue + } + lastEmpty = length == 0 + + cursors := []message.SessionCursor{} + for session, cursor := range cursorsMap { + cursors = append( + cursors, + message.SessionCursor{ + ID: session.ID(), + X: uint16(cursor.X), + Y: uint16(cursor.Y), + }, + ) + } + + // TODO: Send to subscribers only. + manager.sessions.AdminBroadcast(event.SESSION_CURSORS, cursors, nil) } - lastEmpty = length == 0 - - cursors := []message.SessionCursor{} - for session, cursor := range cursorsMap { - cursors = append( - cursors, - message.SessionCursor{ - ID: session.ID(), - X: uint16(cursor.X), - Y: uint16(cursor.Y), - }, - ) - } - - // TODO: Send to subscribers only. - manager.sessions.AdminBroadcast(event.SESSION_CURSORS, cursors, nil) } - } - }() + }() + } manager.logger.Info().Msg("websocket starting") } From 6fa2f4513fbe1422b86afddf55a6cc481c5e2bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Nov 2021 18:38:16 +0100 Subject: [PATCH 604/876] add InactiveCursors to ws init. --- internal/types/message/messages.go | 1 + internal/websocket/handler/system.go | 1 + 2 files changed, 2 insertions(+) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index bff58a34..f6f00254 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -20,6 +20,7 @@ type SystemInit struct { ScreenSize ScreenSize `json:"screen_size"` Sessions map[string]SessionData `json:"sessions"` ImplicitHosting bool `json:"implicit_hosting"` + InactiveCursors bool `json:"inactive_cursors"` ScreencastEnabled bool `json:"screencast_enabled"` WebRTC SystemWebRTC `json:"webrtc"` } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 399453e2..59411779 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -45,6 +45,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { ScreenSize: message.ScreenSize(*size), Sessions: sessions, ImplicitHosting: h.sessions.ImplicitHosting(), + InactiveCursors: h.sessions.InactiveCursors(), ScreencastEnabled: h.capture.Screencast().Enabled(), WebRTC: message.SystemWebRTC{ Videos: h.capture.VideoIDs(), From 6b417131f29a78a7037d73228ecd5e40a48094a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Nov 2021 21:35:15 +0100 Subject: [PATCH 605/876] inactive cursors default false. --- internal/config/session.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/config/session.go b/internal/config/session.go index 182e3f62..0b3454fa 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -25,7 +25,7 @@ func (Session) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().Bool("session.inactive_cursors", true, "show inactive cursors on the screen") + cmd.PersistentFlags().Bool("session.inactive_cursors", false, "show inactive cursors on the screen") if err := viper.BindPFlag("session.inactive_cursors", cmd.PersistentFlags().Lookup("session.inactive_cursors")); err != nil { return err } From 437eb44003112ccd28f8f78974b116a7e8f55e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 3 Nov 2021 21:59:38 +0100 Subject: [PATCH 606/876] inactive cursors access control. --- internal/api/members/controler.go | 14 +++++++------ internal/member/dummy/provider.go | 14 +++++++------ internal/member/object/provider.go | 32 +++++++++++++++++------------- internal/session/manager.go | 16 +++++++++++++++ internal/session/session.go | 2 +- internal/types/member.go | 16 ++++++++------- internal/types/session.go | 1 + internal/websocket/manager.go | 3 +-- 8 files changed, 62 insertions(+), 36 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index d26d979d..e5de26b0 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -57,12 +57,14 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) e data := &MemberCreatePayload{ // default values Profile: types.MemberProfile{ - IsAdmin: false, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanAccessClipboard: true, + IsAdmin: false, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + SendsInactiveCursor: true, + CanSeeInactiveCursors: true, }, } diff --git a/internal/member/dummy/provider.go b/internal/member/dummy/provider.go index 5dafd59d..073d8327 100644 --- a/internal/member/dummy/provider.go +++ b/internal/member/dummy/provider.go @@ -9,12 +9,14 @@ import ( func New() types.MemberProvider { return &MemberProviderCtx{ profile: types.MemberProfile{ - IsAdmin: true, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanAccessClipboard: true, + IsAdmin: true, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + SendsInactiveCursor: true, + CanSeeInactiveCursors: true, }, } } diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index 4dbdb77e..1bcb5c49 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -22,26 +22,30 @@ func (provider *MemberProviderCtx) Connect() error { if provider.config.AdminPassword != "" { // create default admin account at startup _, err = provider.Insert("admin", provider.config.AdminPassword, types.MemberProfile{ - Name: "Administrator", - IsAdmin: true, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanAccessClipboard: true, + Name: "Administrator", + IsAdmin: true, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + SendsInactiveCursor: true, + CanSeeInactiveCursors: true, }) } if provider.config.UserPassword != "" { // create default user account at startup _, err = provider.Insert("user", provider.config.UserPassword, types.MemberProfile{ - Name: "User", - IsAdmin: false, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanAccessClipboard: true, + Name: "User", + IsAdmin: false, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanAccessClipboard: true, + SendsInactiveCursor: true, + CanSeeInactiveCursors: false, }) } diff --git a/internal/session/manager.go b/internal/session/manager.go index d7697ab9..f94e2131 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -254,6 +254,22 @@ func (manager *SessionManagerCtx) AdminBroadcast(event string, payload interface } } +func (manager *SessionManagerCtx) InactiveCursorsBroadcast(event string, payload interface{}, exclude interface{}) { + for _, session := range manager.List() { + if !session.State().IsConnected || !session.Profile().CanSeeInactiveCursors { + continue + } + + if exclude != nil { + if in, _ := utils.ArrayIn(session.ID(), exclude); in { + continue + } + } + + session.Send(event, payload) + } +} + // --- // events // --- diff --git a/internal/session/session.go b/internal/session/session.go index 79461927..8e9c4d77 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -54,7 +54,7 @@ func (session *SessionCtx) IsHost() bool { } func (session *SessionCtx) SetCursor(cursor types.Cursor) { - if session.manager.InactiveCursors() { + if session.manager.InactiveCursors() && session.profile.SendsInactiveCursor { session.manager.SetCursor(cursor, session) } } diff --git a/internal/types/member.go b/internal/types/member.go index 17173754..c220b856 100644 --- a/internal/types/member.go +++ b/internal/types/member.go @@ -9,13 +9,15 @@ var ( ) type MemberProfile struct { - Name string `json:"name"` - IsAdmin bool `json:"is_admin"` - CanLogin bool `json:"can_login"` - CanConnect bool `json:"can_connect"` - CanWatch bool `json:"can_watch"` - CanHost bool `json:"can_host"` - CanAccessClipboard bool `json:"can_access_clipboard"` + Name string `json:"name"` + IsAdmin bool `json:"is_admin"` + CanLogin bool `json:"can_login"` + CanConnect bool `json:"can_connect"` + CanWatch bool `json:"can_watch"` + CanHost bool `json:"can_host"` + CanAccessClipboard bool `json:"can_access_clipboard"` + SendsInactiveCursor bool `json:"sends_inactive_cursor"` + CanSeeInactiveCursors bool `json:"can_see_inactive_cursors"` } type MemberProvider interface { diff --git a/internal/types/session.go b/internal/types/session.go index dd96f924..e8a6ed64 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -60,6 +60,7 @@ type SessionManager interface { Broadcast(event string, payload interface{}, exclude interface{}) AdminBroadcast(event string, payload interface{}, exclude interface{}) + InactiveCursorsBroadcast(event string, payload interface{}, exclude interface{}) OnCreated(listener func(session Session)) OnDeleted(listener func(session Session)) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index b81e8cc1..115a9aae 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -173,8 +173,7 @@ func (manager *WebSocketManagerCtx) Start() { ) } - // TODO: Send to subscribers only. - manager.sessions.AdminBroadcast(event.SESSION_CURSORS, cursors, nil) + manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, cursors, nil) } } }() From 6b77f54b8c870471f8bf322cf1a99492bb81e377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 3 Nov 2021 23:52:44 +0100 Subject: [PATCH 607/876] inactiveCursors to own func. --- internal/websocket/manager.go | 86 ++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 115a9aae..6da1896c 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -136,47 +136,7 @@ func (manager *WebSocketManagerCtx) Start() { manager.fileChooserDialogEvents() if manager.sessions.InactiveCursors() { - manager.logger.Info().Msg("starting inactive cursors handler") - - manager.wg.Add(1) - go func() { - defer manager.wg.Done() - - ticker := time.NewTicker(inactiveCursorsPeriod) - defer ticker.Stop() - - lastEmpty := false - - for { - select { - case <-manager.shutdown: - manager.logger.Info().Msg("stopping inactive cursors handler") - return - case <-ticker.C: - cursorsMap := manager.sessions.PopCursors() - - length := len(cursorsMap) - if length == 0 && lastEmpty { - continue - } - lastEmpty = length == 0 - - cursors := []message.SessionCursor{} - for session, cursor := range cursorsMap { - cursors = append( - cursors, - message.SessionCursor{ - ID: session.ID(), - X: uint16(cursor.X), - Y: uint16(cursor.Y), - }, - ) - } - - manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, cursors, nil) - } - } - }() + manager.inactiveCursors() } manager.logger.Info().Msg("websocket starting") @@ -338,3 +298,47 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer type } } } + +func (manager *WebSocketManagerCtx) inactiveCursors() { + manager.logger.Info().Msg("starting inactive cursors handler") + + manager.wg.Add(1) + go func() { + defer manager.wg.Done() + + ticker := time.NewTicker(inactiveCursorsPeriod) + defer ticker.Stop() + + lastEmpty := false + + for { + select { + case <-manager.shutdown: + manager.logger.Info().Msg("stopping inactive cursors handler") + return + case <-ticker.C: + cursorsMap := manager.sessions.PopCursors() + + length := len(cursorsMap) + if length == 0 && lastEmpty { + continue + } + lastEmpty = length == 0 + + cursors := []message.SessionCursor{} + for session, cursor := range cursorsMap { + cursors = append( + cursors, + message.SessionCursor{ + ID: session.ID(), + X: uint16(cursor.X), + Y: uint16(cursor.Y), + }, + ) + } + + manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, cursors, nil) + } + } + }() +} From 15cb4300a5eceb150c901be94a987eda78768e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 7 Nov 2021 21:23:23 +0100 Subject: [PATCH 608/876] cursors add currentEmpty. --- internal/websocket/manager.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 6da1896c..a753d23a 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -309,7 +309,8 @@ func (manager *WebSocketManagerCtx) inactiveCursors() { ticker := time.NewTicker(inactiveCursorsPeriod) defer ticker.Stop() - lastEmpty := false + var currentEmpty bool + var lastEmpty = false for { select { @@ -319,11 +320,11 @@ func (manager *WebSocketManagerCtx) inactiveCursors() { case <-ticker.C: cursorsMap := manager.sessions.PopCursors() - length := len(cursorsMap) - if length == 0 && lastEmpty { + currentEmpty = len(cursorsMap) == 0 + if currentEmpty && lastEmpty { continue } - lastEmpty = length == 0 + lastEmpty = currentEmpty cursors := []message.SessionCursor{} for session, cursor := range cursorsMap { From 1b9572887078078ba296f9f69f5d9f46ef941a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 8 Nov 2021 18:45:34 +0100 Subject: [PATCH 609/876] clear CanHost dependency from SendsInactiveCursor. --- internal/webrtc/handler.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 7ff5f81c..68020977 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -42,16 +42,12 @@ func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) erro } x, y := int(payload.X), int(payload.Y) - - // handle active cursor movement if session.IsHost() { + // handle active cursor movement manager.desktop.Move(x, y) manager.curPosition.Set(x, y) - return nil - } - - // handle inactive cursor movement - if session.Profile().CanHost { + } else { + // handle inactive cursor movement session.SetCursor(types.Cursor{ X: x, Y: y, From 8dbe0d1d2d5dcded1ceb490288cc70d370bee567 Mon Sep 17 00:00:00 2001 From: Maksim Dorokhin Date: Tue, 9 Nov 2021 15:40:47 +0000 Subject: [PATCH 610/876] add .idea to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e660fd93..5e85427e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bin/ +.idea From 097e8d2a87e903e2d12362f1dbe0f64a1df868b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 12 Nov 2021 15:27:05 +0000 Subject: [PATCH 611/876] Inactive cursors - multiple positions. --- internal/session/manager.go | 16 +++++++++++----- internal/types/message/messages.go | 7 +++---- internal/types/session.go | 6 +++--- internal/websocket/manager.go | 19 +++++++++---------- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index f94e2131..492e5fbd 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -19,7 +19,7 @@ func New(config *config.Session) *SessionManagerCtx { config: config, tokens: make(map[string]string), sessions: make(map[string]*SessionCtx), - cursors: make(map[types.Session]types.Cursor), + cursors: make(map[types.Session][]types.Cursor), emmiter: events.New(), } @@ -56,7 +56,7 @@ type SessionManagerCtx struct { host types.Session hostMu sync.Mutex - cursors map[types.Session]types.Cursor + cursors map[types.Session][]types.Cursor cursorsMu sync.Mutex emmiter events.EventEmmiter @@ -205,15 +205,21 @@ func (manager *SessionManagerCtx) SetCursor(cursor types.Cursor, session types.S manager.cursorsMu.Lock() defer manager.cursorsMu.Unlock() - manager.cursors[session] = cursor + list, ok := manager.cursors[session] + if !ok { + list = []types.Cursor{} + } + + list = append(list, cursor) + manager.cursors[session] = list } -func (manager *SessionManagerCtx) PopCursors() map[types.Session]types.Cursor { +func (manager *SessionManagerCtx) PopCursors() map[types.Session][]types.Cursor { manager.cursorsMu.Lock() defer manager.cursorsMu.Unlock() cursors := manager.cursors - manager.cursors = make(map[types.Session]types.Cursor) + manager.cursors = make(map[types.Session][]types.Cursor) return cursors } diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index f6f00254..0365ea86 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -88,10 +88,9 @@ type SessionData struct { State types.SessionState `json:"state"` } -type SessionCursor struct { - ID string `json:"id"` - X uint16 `json:"x"` - Y uint16 `json:"y"` +type SessionCursors struct { + ID string `json:"id"` + Cursors []types.Cursor `json:"cursors"` } ///////////////////////////// diff --git a/internal/types/session.go b/internal/types/session.go index e8a6ed64..8bc0f3a4 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -13,8 +13,8 @@ var ( ) type Cursor struct { - X int - Y int + X int `json:"x"` + Y int `json:"y"` } type SessionState struct { @@ -56,7 +56,7 @@ type SessionManager interface { ClearHost() SetCursor(cursor Cursor, session Session) - PopCursors() map[Session]Cursor + PopCursors() map[Session][]Cursor Broadcast(event string, payload interface{}, exclude interface{}) AdminBroadcast(event string, payload interface{}, exclude interface{}) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index a753d23a..f0aa2559 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -21,7 +21,7 @@ import ( const pingPeriod = 10 * time.Second // period for sending inactive cursor messages -const inactiveCursorsPeriod = 500 * time.Millisecond +const inactiveCursorsPeriod = 750 * time.Millisecond func New( sessions types.SessionManager, @@ -326,19 +326,18 @@ func (manager *WebSocketManagerCtx) inactiveCursors() { } lastEmpty = currentEmpty - cursors := []message.SessionCursor{} - for session, cursor := range cursorsMap { - cursors = append( - cursors, - message.SessionCursor{ - ID: session.ID(), - X: uint16(cursor.X), - Y: uint16(cursor.Y), + sessionCursors := []message.SessionCursors{} + for session, cursors := range cursorsMap { + sessionCursors = append( + sessionCursors, + message.SessionCursors{ + ID: session.ID(), + Cursors: cursors, }, ) } - manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, cursors, nil) + manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, sessionCursors, nil) } } }() From ddf44cbeac5ca5644b4d2b42825191d44af5abe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Nov 2021 21:48:43 +0100 Subject: [PATCH 612/876] add audio input sink. --- internal/config/capture.go | 2 +- runtime/default.pa | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/internal/config/capture.go b/internal/config/capture.go index 6ff91461..5b47635b 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -36,7 +36,7 @@ type Capture struct { func (Capture) Init(cmd *cobra.Command) error { // audio - cmd.PersistentFlags().String("capture.audio.device", "auto_null.monitor", "audio device to capture") + cmd.PersistentFlags().String("capture.audio.device", "audio_output.monitor", "audio device to capture") if err := viper.BindPFlag("capture.audio.device", cmd.PersistentFlags().Lookup("capture.audio.device")); err != nil { return err } diff --git a/runtime/default.pa b/runtime/default.pa index b0a26b10..5ceb8624 100644 --- a/runtime/default.pa +++ b/runtime/default.pa @@ -1,6 +1,15 @@ #!/usr/bin/pulseaudio -nF -# Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices +#### Create virtual output device sink +load-module module-null-sink sink_name=audio_output sink_properties=device.description="Virtual_Audio_Output" + +#### Create virtual input device sink +load-module module-null-sink sink_name=audio_input sink_properties=device.description="Virtual_Audio_Input" + +#### Create a virtual audio source linked up to the virtual input device +load-module module-virtual-source source_name=microphone master=audio_input.monitor source_properties=device.description="Virtual_Microphone" + +#### Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1 ### Make sure we always have a sink around, even if it is a null sink. From a260ce6a603029ce28a1443874f8cb4de5634b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 18 Nov 2021 22:01:41 +0100 Subject: [PATCH 613/876] fix comments. --- runtime/default.pa | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/default.pa b/runtime/default.pa index 5ceb8624..dbcd0a4e 100644 --- a/runtime/default.pa +++ b/runtime/default.pa @@ -1,15 +1,15 @@ #!/usr/bin/pulseaudio -nF -#### Create virtual output device sink +### Create virtual output device sink load-module module-null-sink sink_name=audio_output sink_properties=device.description="Virtual_Audio_Output" -#### Create virtual input device sink +### Create virtual input device sink load-module module-null-sink sink_name=audio_input sink_properties=device.description="Virtual_Audio_Input" -#### Create a virtual audio source linked up to the virtual input device +### Create a virtual audio source linked up to the virtual input device load-module module-virtual-source source_name=microphone master=audio_input.monitor source_properties=device.description="Virtual_Microphone" -#### Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices +### Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1 ### Make sure we always have a sink around, even if it is a null sink. From 44e74e308868e5f3d69d5f178c9ebbd0bb4de788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Nov 2021 00:07:17 +0100 Subject: [PATCH 614/876] implement signal offer. --- internal/types/event/events.go | 1 + internal/types/message/messages.go | 2 +- internal/types/webrtc.go | 1 + internal/webrtc/peer.go | 7 +++++++ internal/websocket/handler/handler.go | 7 ++++++- internal/websocket/handler/signal.go | 13 +++++++++++-- 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 7583e258..04eb4b2e 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -10,6 +10,7 @@ const ( const ( SIGNAL_REQUEST = "signal/request" SIGNAL_RESTART = "signal/restart" + SIGNAL_OFFER = "signal/offer" SIGNAL_ANSWER = "signal/answer" SIGNAL_PROVIDE = "signal/provide" SIGNAL_CANDIDATE = "signal/candidate" diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 0365ea86..f4845a3a 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -56,7 +56,7 @@ type SignalCandidate struct { webrtc.ICECandidateInit } -type SignalAnswer struct { +type SignalDescription struct { SDP string `json:"sdp"` } diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 45f84f13..19286f9c 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -19,6 +19,7 @@ type ICEServer struct { type WebRTCPeer interface { CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) + SignalOffer(sdp string) error SignalAnswer(sdp string) error SignalCandidate(candidate webrtc.ICECandidateInit) error diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index ad74d5d4..8acfa6ae 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -45,6 +45,13 @@ func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescript return peer.connection.LocalDescription(), nil } +func (peer *WebRTCPeerCtx) SignalOffer(sdp string) error { + return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ + SDP: sdp, + Type: webrtc.SDPTypeOffer, + }) +} + func (peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ SDP: sdp, diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index b112cfb0..67a5bf85 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -56,8 +56,13 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM }) case event.SIGNAL_RESTART: err = h.signalRestart(session) + case event.SIGNAL_OFFER: + payload := &message.SignalDescription{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.signalOffer(session, payload) + }) case event.SIGNAL_ANSWER: - payload := &message.SignalAnswer{} + payload := &message.SignalDescription{} err = utils.Unmarshal(payload, data.Payload, func() error { return h.signalAnswer(session, payload) }) diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 873fc913..a319708b 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -48,14 +48,23 @@ func (h *MessageHandlerCtx) signalRestart(session types.Session) error { session.Send( event.SIGNAL_RESTART, - message.SignalAnswer{ + message.SignalDescription{ SDP: offer.SDP, }) return nil } -func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { +func (h *MessageHandlerCtx) signalOffer(session types.Session, payload *message.SignalDescription) error { + peer := session.GetWebRTCPeer() + if peer == nil { + return errors.New("webRTC peer does not exist") + } + + return peer.SignalOffer(payload.SDP) +} + +func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalDescription) error { peer := session.GetWebRTCPeer() if peer == nil { return errors.New("webRTC peer does not exist") From 0075cdca2b99b56cc88de083d1e84690b7dfabfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Nov 2021 21:43:39 +0100 Subject: [PATCH 615/876] implement OnNegotiationNeeded. --- internal/webrtc/manager.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 205f601e..2844d9b5 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -155,6 +155,22 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin iceTrickle: manager.config.ICETrickle, } + connection.OnNegotiationNeeded(func() { + logger.Warn().Msg("negotiation is needed") + + offer, err := peer.CreateOffer(false) + if err != nil { + logger.Err(err).Msg("sdp offer failed") + return + } + + session.Send( + event.SIGNAL_OFFER, + message.SignalDescription{ + SDP: offer.SDP, + }) + }) + connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: From 096efe9b3850d7749986edc062f270111087ca91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 25 Nov 2021 23:46:06 +0100 Subject: [PATCH 616/876] add on track log. --- internal/webrtc/manager.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 2844d9b5..ba6bf697 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -155,6 +155,14 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin iceTrickle: manager.config.ICETrickle, } + connection.OnTrack(func(tr *webrtc.TrackRemote, r *webrtc.RTPReceiver) { + logger.Info().Interface("track", tr).Interface("receiver", r).Msg("got remote track") + }) + + connection.OnDataChannel(func(dc *webrtc.DataChannel) { + logger.Info().Interface("data-channel", dc).Msg("got remote data channel") + }) + connection.OnNegotiationNeeded(func() { logger.Warn().Msg("negotiation is needed") From 7b2c1570bfc1832ebe57f1799f16b0a8978fbfff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 28 Nov 2021 18:36:47 +0100 Subject: [PATCH 617/876] add SDP answer. --- internal/types/webrtc.go | 9 +++---- internal/webrtc/manager.go | 4 ++-- internal/webrtc/peer.go | 35 ++++++++++++++++++++++++---- internal/websocket/handler/signal.go | 30 ++++++++++++++++++++---- 4 files changed, 63 insertions(+), 15 deletions(-) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 19286f9c..ce53b003 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -19,9 +19,10 @@ type ICEServer struct { type WebRTCPeer interface { CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) - SignalOffer(sdp string) error - SignalAnswer(sdp string) error - SignalCandidate(candidate webrtc.ICECandidateInit) error + CreateAnswer() (*webrtc.SessionDescription, error) + SetOffer(sdp string) error + SetAnswer(sdp string) error + SetCandidate(candidate webrtc.ICECandidateInit) error SetVideoID(videoID string) error SendCursorPosition(x, y int) error @@ -36,5 +37,5 @@ type WebRTCManager interface { ICEServers() []ICEServer - CreatePeer(session Session, videoID string) (*webrtc.SessionDescription, error) + CreatePeer(session Session, videoID string) (WebRTCPeer, error) } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index ba6bf697..9a8da87e 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -73,7 +73,7 @@ func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { return manager.config.ICEServers } -func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) { +func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (types.WebRTCPeer, error) { // add session id to logger context logger := manager.logger.With().Str("session_id", session.ID()).Logger() logger.Info().Msg("creating webrtc peer") @@ -238,5 +238,5 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) session.SetWebRTCPeer(peer) - return peer.CreateOffer(false) + return peer, nil } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 8acfa6ae..97be3cb2 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -27,17 +27,33 @@ func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescript return nil, err } + return peer.setLocalDescription(offer) +} + +func (peer *WebRTCPeerCtx) CreateAnswer() (*webrtc.SessionDescription, error) { + peer.mu.Lock() + defer peer.mu.Unlock() + + answer, err := peer.connection.CreateAnswer(nil) + if err != nil { + return nil, err + } + + return peer.setLocalDescription(answer) +} + +func (peer *WebRTCPeerCtx) setLocalDescription(description webrtc.SessionDescription) (*webrtc.SessionDescription, error) { if !peer.iceTrickle { // Create channel that is blocked until ICE Gathering is complete gatherComplete := webrtc.GatheringCompletePromise(peer.connection) - if err := peer.connection.SetLocalDescription(offer); err != nil { + if err := peer.connection.SetLocalDescription(description); err != nil { return nil, err } <-gatherComplete } else { - if err := peer.connection.SetLocalDescription(offer); err != nil { + if err := peer.connection.SetLocalDescription(description); err != nil { return nil, err } } @@ -45,21 +61,30 @@ func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescript return peer.connection.LocalDescription(), nil } -func (peer *WebRTCPeerCtx) SignalOffer(sdp string) error { +func (peer *WebRTCPeerCtx) SetOffer(sdp string) error { + peer.mu.Lock() + defer peer.mu.Unlock() + return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ SDP: sdp, Type: webrtc.SDPTypeOffer, }) } -func (peer *WebRTCPeerCtx) SignalAnswer(sdp string) error { +func (peer *WebRTCPeerCtx) SetAnswer(sdp string) error { + peer.mu.Lock() + defer peer.mu.Unlock() + return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ SDP: sdp, Type: webrtc.SDPTypeAnswer, }) } -func (peer *WebRTCPeerCtx) SignalCandidate(candidate webrtc.ICECandidateInit) error { +func (peer *WebRTCPeerCtx) SetCandidate(candidate webrtc.ICECandidateInit) error { + peer.mu.Lock() + defer peer.mu.Unlock() + return peer.connection.AddICECandidate(candidate) } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index a319708b..88229265 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -19,7 +19,12 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag payload.Video = videos[0] } - offer, err := h.webrtc.CreatePeer(session, payload.Video) + peer, err := h.webrtc.CreatePeer(session, payload.Video) + if err != nil { + return err + } + + offer, err := peer.CreateOffer(false) if err != nil { return err } @@ -46,6 +51,7 @@ func (h *MessageHandlerCtx) signalRestart(session types.Session) error { return err } + // TODO: Use offer event intead. session.Send( event.SIGNAL_RESTART, message.SignalDescription{ @@ -61,7 +67,23 @@ func (h *MessageHandlerCtx) signalOffer(session types.Session, payload *message. return errors.New("webRTC peer does not exist") } - return peer.SignalOffer(payload.SDP) + err := peer.SetOffer(payload.SDP) + if err != nil { + return err + } + + answer, err := peer.CreateAnswer() + if err != nil { + return err + } + + session.Send( + event.SIGNAL_ANSWER, + message.SignalDescription{ + SDP: answer.SDP, + }) + + return nil } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalDescription) error { @@ -70,7 +92,7 @@ func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message return errors.New("webRTC peer does not exist") } - return peer.SignalAnswer(payload.SDP) + return peer.SetAnswer(payload.SDP) } func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *message.SignalCandidate) error { @@ -79,7 +101,7 @@ func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *mess return errors.New("webRTC peer does not exist") } - return peer.SignalCandidate(payload.ICECandidateInit) + return peer.SetCandidate(payload.ICECandidateInit) } func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message.SignalVideo) error { From 710d0c9cd0a925d4ebf27a165121efd02b04f1c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 28 Nov 2021 22:19:06 +0100 Subject: [PATCH 618/876] gst extract appsink. --- internal/capture/gst/gst.c | 37 ++++++++++++++++------------------ internal/capture/gst/gst.go | 13 +++++++----- internal/capture/gst/gst.h | 9 +++++---- internal/capture/screencast.go | 3 ++- internal/capture/stream.go | 3 ++- 5 files changed, 34 insertions(+), 31 deletions(-) diff --git a/internal/capture/gst/gst.c b/internal/capture/gst/gst.c index a25f0123..1407d57f 100644 --- a/internal/capture/gst/gst.c +++ b/internal/capture/gst/gst.c @@ -8,14 +8,7 @@ void gstreamer_init(void) { gst_init(NULL, NULL); } -GMainLoop *gstreamer_send_main_loop = NULL; -void gstreamer_send_start_mainloop(void) { - gstreamer_send_main_loop = g_main_loop_new(NULL, FALSE); - - g_main_loop_run(gstreamer_send_main_loop); -} - -static gboolean gstreamer_send_bus_call(GstBus *bus, GstMessage *msg, gpointer data) { +static gboolean gstreamer_bus_call(GstBus *bus, GstMessage *msg, gpointer data) { switch (GST_MESSAGE_TYPE(msg)) { case GST_MESSAGE_EOS: @@ -41,7 +34,7 @@ static gboolean gstreamer_send_bus_call(GstBus *bus, GstMessage *msg, gpointer d return TRUE; } -GstFlowReturn gstreamer_send_new_sample_handler(GstElement *object, gpointer user_data) { +static GstFlowReturn gstreamer_send_new_sample_handler(GstElement *object, gpointer user_data) { GstSample *sample = NULL; GstBuffer *buffer = NULL; gpointer copy = NULL; @@ -61,27 +54,31 @@ GstFlowReturn gstreamer_send_new_sample_handler(GstElement *object, gpointer use return GST_FLOW_OK; } -void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId) { +void gstreamer_pipeline_attach_appsink(GstElement *pipeline, char *sinkName, int pipelineId) { SampleHandlerUserData *s = calloc(1, sizeof(SampleHandlerUserData)); s->pipelineId = pipelineId; - GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline)); - gst_bus_add_watch(bus, gstreamer_send_bus_call, NULL); - gst_object_unref(bus); - - GstElement *appsink = gst_bin_get_by_name(GST_BIN(pipeline), "appsink"); + GstElement *appsink = gst_bin_get_by_name(GST_BIN(pipeline), sinkName); g_object_set(appsink, "emit-signals", TRUE, NULL); g_signal_connect(appsink, "new-sample", G_CALLBACK(gstreamer_send_new_sample_handler), s); gst_object_unref(appsink); +} +GstElement *gstreamer_pipeline_create(char *pipelineStr, GError **error) { + GstElement *pipeline = gst_parse_launch(pipelineStr, error); + + GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline)); + gst_bus_add_watch(bus, gstreamer_bus_call, NULL); + gst_object_unref(bus); + + return pipeline; +} + +void gstreamer_pipeline_play(GstElement *pipeline) { gst_element_set_state(pipeline, GST_STATE_PLAYING); } -void gstreamer_send_play_pipeline(GstElement *pipeline) { - gst_element_set_state(pipeline, GST_STATE_PLAYING); -} - -void gstreamer_send_stop_pipeline(GstElement *pipeline) { +void gstreamer_pipeline_stop(GstElement *pipeline) { gst_element_set_state(pipeline, GST_STATE_NULL); gst_object_unref(pipeline); } diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index a7c0683b..5eb926f7 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -41,7 +41,7 @@ func CreatePipeline(pipelineStr string) (*Pipeline, error) { var gstPipeline *C.GstElement var gstError *C.GError - gstPipeline = C.gst_parse_launch(pipelineStrUnsafe, &gstError) + gstPipeline = C.gstreamer_pipeline_create(pipelineStrUnsafe, &gstError) if gstError != nil { defer C.g_error_free(gstError) @@ -59,16 +59,19 @@ func CreatePipeline(pipelineStr string) (*Pipeline, error) { return p, nil } -func (p *Pipeline) Start() { - C.gstreamer_send_start_pipeline(p.Pipeline, C.int(p.id)) +func (p *Pipeline) AttachAppsink(sinkName string) { + sinkNameUnsafe := C.CString(sinkName) + defer C.free(unsafe.Pointer(sinkNameUnsafe)) + + C.gstreamer_pipeline_attach_appsink(p.Pipeline, sinkNameUnsafe, C.int(p.id)) } func (p *Pipeline) Play() { - C.gstreamer_send_play_pipeline(p.Pipeline) + C.gstreamer_pipeline_play(p.Pipeline) } func (p *Pipeline) Stop() { - C.gstreamer_send_stop_pipeline(p.Pipeline) + C.gstreamer_pipeline_stop(p.Pipeline) } // gst-inspect-1.0 diff --git a/internal/capture/gst/gst.h b/internal/capture/gst/gst.h index 55037f18..87e4fa74 100644 --- a/internal/capture/gst/gst.h +++ b/internal/capture/gst/gst.h @@ -5,8 +5,9 @@ extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); -void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId); -void gstreamer_send_play_pipeline(GstElement *pipeline); -void gstreamer_send_stop_pipeline(GstElement *pipeline); -void gstreamer_send_start_mainloop(void); +void gstreamer_pipeline_attach_appsink(GstElement *pipeline, char *sinkName, int pipelineId); +GstElement *gstreamer_pipeline_create(char *pipelineStr, GError **error); +void gstreamer_pipeline_play(GstElement *pipeline); +void gstreamer_pipeline_stop(GstElement *pipeline); + void gstreamer_init(void); diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 4583c240..528ac83b 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -170,7 +170,8 @@ func (manager *ScreencastManagerCtx) createPipeline() error { return err } - manager.pipeline.Start() + manager.pipeline.AttachAppsink("appsink") + manager.pipeline.Play() manager.sample = manager.pipeline.Sample manager.sampleUpdate <- struct{}{} diff --git a/internal/capture/stream.go b/internal/capture/stream.go index a6450eed..3272abf1 100644 --- a/internal/capture/stream.go +++ b/internal/capture/stream.go @@ -247,7 +247,8 @@ func (manager *StreamManagerCtx) createPipeline() error { return err } - manager.pipeline.Start() + manager.pipeline.AttachAppsink("appsink") + manager.pipeline.Play() manager.sample = manager.pipeline.Sample manager.sampleUpdate <- struct{}{} From 7bc9a4067779ca5fdb78865a26d18b90c9242cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 28 Nov 2021 22:37:17 +0100 Subject: [PATCH 619/876] gst push function. --- internal/capture/gst/gst.c | 10 ++++++++++ internal/capture/gst/gst.go | 10 ++++++++++ internal/capture/gst/gst.h | 1 + 3 files changed, 21 insertions(+) diff --git a/internal/capture/gst/gst.c b/internal/capture/gst/gst.c index 1407d57f..24275fe2 100644 --- a/internal/capture/gst/gst.c +++ b/internal/capture/gst/gst.c @@ -82,3 +82,13 @@ void gstreamer_pipeline_stop(GstElement *pipeline) { gst_element_set_state(pipeline, GST_STATE_NULL); gst_object_unref(pipeline); } + +void gstreamer_pipeline_push(GstElement *pipeline, char *sinkName, void *buffer, int bufferLen) { + GstElement *src = gst_bin_get_by_name(GST_BIN(pipeline), sinkName); + if (src != NULL) { + gpointer p = g_memdup(buffer, bufferLen); + GstBuffer *buffer = gst_buffer_new_wrapped(p, bufferLen); + gst_app_src_push_buffer(GST_APP_SRC(src), buffer); + gst_object_unref(src); + } +} diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 5eb926f7..fdfd7952 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -74,6 +74,16 @@ func (p *Pipeline) Stop() { C.gstreamer_pipeline_stop(p.Pipeline) } +func (p *Pipeline) Push(sinkName string, buffer []byte) { + sinkNameUnsafe := C.CString(sinkName) + defer C.free(unsafe.Pointer(sinkNameUnsafe)) + + bytes := C.CBytes(buffer) + defer C.free(bytes) + + C.gstreamer_pipeline_push(p.Pipeline, sinkNameUnsafe, bytes, C.int(len(buffer))) +} + // gst-inspect-1.0 func CheckPlugins(plugins []string) error { var plugin *C.GstPlugin diff --git a/internal/capture/gst/gst.h b/internal/capture/gst/gst.h index 87e4fa74..4f7a674f 100644 --- a/internal/capture/gst/gst.h +++ b/internal/capture/gst/gst.h @@ -9,5 +9,6 @@ void gstreamer_pipeline_attach_appsink(GstElement *pipeline, char *sinkName, int GstElement *gstreamer_pipeline_create(char *pipelineStr, GError **error); void gstreamer_pipeline_play(GstElement *pipeline); void gstreamer_pipeline_stop(GstElement *pipeline); +void gstreamer_pipeline_push(GstElement *pipeline, char *sinkName, void *buffer, int bufferLen); void gstreamer_init(void); From 75b1e0887483595a35b3abdd75c71ebc51e142c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 28 Nov 2021 23:16:26 +0100 Subject: [PATCH 620/876] virtual microphone OnTrack. --- internal/webrtc/manager.go | 68 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 9a8da87e..db1a3570 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -5,10 +5,12 @@ import ( "strings" "time" + "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "demodesk/neko/internal/capture/gst" "demodesk/neko/internal/config" "demodesk/neko/internal/types" "demodesk/neko/internal/types/codec" @@ -155,8 +157,70 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin iceTrickle: manager.config.ICETrickle, } - connection.OnTrack(func(tr *webrtc.TrackRemote, r *webrtc.RTPReceiver) { - logger.Info().Interface("track", tr).Interface("receiver", r).Msg("got remote track") + connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) { + // if we did not get audio + if track.Kind() != webrtc.RTPCodecTypeAudio { + logger.Warn().Msg("got remote track, but not audio") + return + } + + codecName := strings.Split(track.Codec().RTPCodecCapability.MimeType, "/")[1] + + logger.Info(). + Str("stream-id", track.StreamID()). + Str("id", track.ID()). + Str("rid", track.RID()). + Str("codec", codecName). + Uint8("payload-type", uint8(track.PayloadType())). + Msgf("received new track") + + pipelineStr := "appsrc format=time is-live=true do-timestamp=true name=src" + + //add appropriate decoder + switch strings.ToLower(codecName) { + case "opus": + pipelineStr += fmt.Sprintf(" ! application/x-rtp, payload=%d, encoding-name=OPUS ! rtpopusdepay ! decodebin", track.PayloadType()) + case "g722": + pipelineStr += " ! application/x-rtp clock-rate=8000 ! rtpg722depay ! decodebin" + default: + logger.Panic().Msgf("Unhandled codec %s", codecName) + } + + pipelineStr += " ! pulsesink device=audio_input" + logger.Info().Str("pipeline", pipelineStr).Msg("create pipeline") + + pipeline, err := gst.CreatePipeline(pipelineStr) + if err != nil { + logger.Err(err).Str("pipeline", pipelineStr).Msg("unable to create pipeline") + return + } + + pipeline.Play() + defer pipeline.Stop() + + // Send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval + ticker := time.NewTicker(time.Second * 3) + defer ticker.Stop() + + go func() { + for range ticker.C { + rtcpSendErr := connection.WriteRTCP([]rtcp.Packet{&rtcp.PictureLossIndication{MediaSSRC: uint32(track.SSRC())}}) + if rtcpSendErr != nil { + fmt.Println(rtcpSendErr) + } + } + }() + + buf := make([]byte, 1400) + for { + i, _, err := track.Read(buf) + if err != nil { + logger.Warn().Err(err).Msg("failed read from pipeline") + break + } + + pipeline.Push("src", buf[:i]) + } }) connection.OnDataChannel(func(dc *webrtc.DataChannel) { From 065a7a2e84ba99cebf7fb948a045619ecd07b6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Dec 2021 19:55:57 +0100 Subject: [PATCH 621/876] gst minor changes. --- internal/capture/gst/gst.c | 43 ++++++++++++++++++++----------------- internal/capture/gst/gst.go | 8 +++---- internal/capture/gst/gst.h | 2 +- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/internal/capture/gst/gst.c b/internal/capture/gst/gst.c index 24275fe2..1e28e86d 100644 --- a/internal/capture/gst/gst.c +++ b/internal/capture/gst/gst.c @@ -10,25 +10,25 @@ void gstreamer_init(void) { static gboolean gstreamer_bus_call(GstBus *bus, GstMessage *msg, gpointer data) { switch (GST_MESSAGE_TYPE(msg)) { + case GST_MESSAGE_EOS: { + g_print("End of stream\n"); + exit(1); + } - case GST_MESSAGE_EOS: - g_print("End of stream\n"); - exit(1); - break; + case GST_MESSAGE_ERROR: { + gchar *debug; + GError *error; - case GST_MESSAGE_ERROR: { - gchar *debug; - GError *error; + gst_message_parse_error(msg, &error, &debug); + g_free(debug); - gst_message_parse_error(msg, &error, &debug); - g_free(debug); + g_printerr("Error: %s\n", error->message); + g_error_free(error); + exit(1); + } - g_printerr("Error: %s\n", error->message); - g_error_free(error); - exit(1); - } - default: - break; + default: + break; } return TRUE; @@ -67,9 +67,11 @@ void gstreamer_pipeline_attach_appsink(GstElement *pipeline, char *sinkName, int GstElement *gstreamer_pipeline_create(char *pipelineStr, GError **error) { GstElement *pipeline = gst_parse_launch(pipelineStr, error); - GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline)); - gst_bus_add_watch(bus, gstreamer_bus_call, NULL); - gst_object_unref(bus); + if (pipeline != NULL) { + GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline)); + gst_bus_add_watch(bus, gstreamer_bus_call, NULL); + gst_object_unref(bus); + } return pipeline; } @@ -83,8 +85,9 @@ void gstreamer_pipeline_stop(GstElement *pipeline) { gst_object_unref(pipeline); } -void gstreamer_pipeline_push(GstElement *pipeline, char *sinkName, void *buffer, int bufferLen) { - GstElement *src = gst_bin_get_by_name(GST_BIN(pipeline), sinkName); +void gstreamer_pipeline_push(GstElement *pipeline, char *srcName, void *buffer, int bufferLen) { + GstElement *src = gst_bin_get_by_name(GST_BIN(pipeline), srcName); + if (src != NULL) { gpointer p = g_memdup(buffer, bufferLen); GstBuffer *buffer = gst_buffer_new_wrapped(p, bufferLen); diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index fdfd7952..d0f5d05a 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -74,14 +74,14 @@ func (p *Pipeline) Stop() { C.gstreamer_pipeline_stop(p.Pipeline) } -func (p *Pipeline) Push(sinkName string, buffer []byte) { - sinkNameUnsafe := C.CString(sinkName) - defer C.free(unsafe.Pointer(sinkNameUnsafe)) +func (p *Pipeline) Push(srcName string, buffer []byte) { + srcNameUnsafe := C.CString(srcName) + defer C.free(unsafe.Pointer(srcNameUnsafe)) bytes := C.CBytes(buffer) defer C.free(bytes) - C.gstreamer_pipeline_push(p.Pipeline, sinkNameUnsafe, bytes, C.int(len(buffer))) + C.gstreamer_pipeline_push(p.Pipeline, srcNameUnsafe, bytes, C.int(len(buffer))) } // gst-inspect-1.0 diff --git a/internal/capture/gst/gst.h b/internal/capture/gst/gst.h index 4f7a674f..a51d7682 100644 --- a/internal/capture/gst/gst.h +++ b/internal/capture/gst/gst.h @@ -9,6 +9,6 @@ void gstreamer_pipeline_attach_appsink(GstElement *pipeline, char *sinkName, int GstElement *gstreamer_pipeline_create(char *pipelineStr, GError **error); void gstreamer_pipeline_play(GstElement *pipeline); void gstreamer_pipeline_stop(GstElement *pipeline); -void gstreamer_pipeline_push(GstElement *pipeline, char *sinkName, void *buffer, int bufferLen); +void gstreamer_pipeline_push(GstElement *pipeline, char *srcName, void *buffer, int bufferLen); void gstreamer_init(void); From 0a94191a5f35026094ed4dc91b9ffa92b670607d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Dec 2021 20:30:18 +0100 Subject: [PATCH 622/876] rename to StreamSink. --- internal/capture/manager.go | 14 +++--- internal/capture/{stream.go => streamsink.go} | 45 +++++++++---------- internal/types/capture.go | 8 ++-- internal/webrtc/peerstreamtrack.go | 6 +-- 4 files changed, 36 insertions(+), 37 deletions(-) rename internal/capture/{stream.go => streamsink.go} (78%) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index fb622e02..d7d41a35 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -18,8 +18,8 @@ type CaptureManagerCtx struct { broadcast *BroacastManagerCtx screencast *ScreencastManagerCtx - audio *StreamManagerCtx - videos map[string]*StreamManagerCtx + audio *StreamSinkManagerCtx + videos map[string]*StreamSinkManagerCtx videoIDs []string } @@ -57,7 +57,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt ) } - videos := map[string]*StreamManagerCtx{} + videos := map[string]*StreamSinkManagerCtx{} for video_id, cnf := range config.VideoPipelines { pipelineConf := cnf @@ -88,7 +88,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt Msg("syntax check for video stream pipeline passed") // append to videos - videos[video_id] = streamNew(config.VideoCodec, createPipeline, video_id) + videos[video_id] = streamSinkNew(config.VideoCodec, createPipeline, video_id) } return &CaptureManagerCtx{ @@ -97,7 +97,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt broadcast: broadcastNew(broadcastPipeline), screencast: screencastNew(config.ScreencastEnabled, screencastPipeline), - audio: streamNew(config.AudioCodec, func() string { + audio: streamSinkNew(config.AudioCodec, func() string { if config.AudioPipeline != "" { return config.AudioPipeline } @@ -188,11 +188,11 @@ func (manager *CaptureManagerCtx) Screencast() types.ScreencastManager { return manager.screencast } -func (manager *CaptureManagerCtx) Audio() types.StreamManager { +func (manager *CaptureManagerCtx) Audio() types.StreamSinkManager { return manager.audio } -func (manager *CaptureManagerCtx) Video(videoID string) (types.StreamManager, bool) { +func (manager *CaptureManagerCtx) Video(videoID string) (types.StreamSinkManager, bool) { video, ok := manager.videos[videoID] return video, ok } diff --git a/internal/capture/stream.go b/internal/capture/streamsink.go similarity index 78% rename from internal/capture/stream.go rename to internal/capture/streamsink.go index 3272abf1..dfb40152 100644 --- a/internal/capture/stream.go +++ b/internal/capture/streamsink.go @@ -13,9 +13,9 @@ import ( "demodesk/neko/internal/types/codec" ) -var moveListenerMu = sync.Mutex{} +var moveSinkListenerMu = sync.Mutex{} -type StreamManagerCtx struct { +type StreamSinkManagerCtx struct { logger zerolog.Logger mu sync.Mutex wg sync.WaitGroup @@ -33,13 +33,13 @@ type StreamManagerCtx struct { listenersMu sync.Mutex } -func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) *StreamManagerCtx { +func streamSinkNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) *StreamSinkManagerCtx { logger := log.With(). Str("module", "capture"). - Str("submodule", "stream"). + Str("submodule", "stream-sink"). Str("video_id", video_id).Logger() - manager := &StreamManagerCtx{ + manager := &StreamSinkManagerCtx{ logger: logger, codec: codec, pipelineStr: pipelineStr, @@ -74,7 +74,7 @@ func streamNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) return manager } -func (manager *StreamManagerCtx) shutdown() { +func (manager *StreamSinkManagerCtx) shutdown() { manager.logger.Info().Msgf("shutdown") manager.listenersMu.Lock() @@ -89,11 +89,11 @@ func (manager *StreamManagerCtx) shutdown() { manager.wg.Wait() } -func (manager *StreamManagerCtx) Codec() codec.RTPCodec { +func (manager *StreamSinkManagerCtx) Codec() codec.RTPCodec { return manager.codec } -func (manager *StreamManagerCtx) start() error { +func (manager *StreamSinkManagerCtx) start() error { if len(manager.listeners) == 0 { err := manager.createPipeline() if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { @@ -106,14 +106,14 @@ func (manager *StreamManagerCtx) start() error { return nil } -func (manager *StreamManagerCtx) stop() { +func (manager *StreamSinkManagerCtx) stop() { if len(manager.listeners) == 0 { manager.destroyPipeline() manager.logger.Info().Msgf("last listener, stopping") } } -func (manager *StreamManagerCtx) addListener(listener *func(sample types.Sample)) { +func (manager *StreamSinkManagerCtx) addListener(listener *func(sample types.Sample)) { ptr := reflect.ValueOf(listener).Pointer() manager.listenersMu.Lock() @@ -123,7 +123,7 @@ func (manager *StreamManagerCtx) addListener(listener *func(sample types.Sample) manager.logger.Debug().Interface("ptr", ptr).Msgf("adding listener") } -func (manager *StreamManagerCtx) removeListener(listener *func(sample types.Sample)) { +func (manager *StreamSinkManagerCtx) removeListener(listener *func(sample types.Sample)) { ptr := reflect.ValueOf(listener).Pointer() manager.listenersMu.Lock() @@ -133,7 +133,7 @@ func (manager *StreamManagerCtx) removeListener(listener *func(sample types.Samp manager.logger.Debug().Interface("ptr", ptr).Msgf("removing listener") } -func (manager *StreamManagerCtx) AddListener(listener *func(sample types.Sample)) error { +func (manager *StreamSinkManagerCtx) AddListener(listener *func(sample types.Sample)) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -152,7 +152,7 @@ func (manager *StreamManagerCtx) AddListener(listener *func(sample types.Sample) return nil } -func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Sample)) error { +func (manager *StreamSinkManagerCtx) RemoveListener(listener *func(sample types.Sample)) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -171,12 +171,12 @@ func (manager *StreamManagerCtx) RemoveListener(listener *func(sample types.Samp // moving listeners between streams ensures, that target pipeline is running // before listener is added, and stops source pipeline if there are 0 listeners -func (manager *StreamManagerCtx) MoveListenerTo(listener *func(sample types.Sample), stream types.StreamManager) error { +func (manager *StreamSinkManagerCtx) MoveListenerTo(listener *func(sample types.Sample), stream types.StreamSinkManager) error { if listener == nil { return errors.New("listener cannot be nil") } - targetStream, ok := stream.(*StreamManagerCtx) + targetStream, ok := stream.(*StreamSinkManagerCtx) if !ok { return errors.New("target stream manager does not support moving listeners") } @@ -186,7 +186,7 @@ func (manager *StreamManagerCtx) MoveListenerTo(listener *func(sample types.Samp // global mutex, that ensures atomic locking // lock global mutex - moveListenerMu.Lock() + moveSinkListenerMu.Lock() // lock source stream manager.mu.Lock() @@ -197,7 +197,7 @@ func (manager *StreamManagerCtx) MoveListenerTo(listener *func(sample types.Samp defer targetStream.mu.Unlock() // unlock global mutex - moveListenerMu.Unlock() + moveSinkListenerMu.Unlock() // start if stopped if err := targetStream.start(); err != nil { @@ -214,18 +214,18 @@ func (manager *StreamManagerCtx) MoveListenerTo(listener *func(sample types.Samp return nil } -func (manager *StreamManagerCtx) ListenersCount() int { +func (manager *StreamSinkManagerCtx) ListenersCount() int { manager.listenersMu.Lock() defer manager.listenersMu.Unlock() return len(manager.listeners) } -func (manager *StreamManagerCtx) Started() bool { +func (manager *StreamSinkManagerCtx) Started() bool { return manager.ListenersCount() > 0 } -func (manager *StreamManagerCtx) createPipeline() error { +func (manager *StreamSinkManagerCtx) createPipeline() error { manager.pipelineMu.Lock() defer manager.pipelineMu.Unlock() @@ -235,10 +235,9 @@ func (manager *StreamManagerCtx) createPipeline() error { var err error - codec := manager.Codec() pipelineStr := manager.pipelineStr() manager.logger.Info(). - Str("codec", codec.Name). + Str("codec", manager.codec.Name). Str("src", pipelineStr). Msgf("creating pipeline") @@ -255,7 +254,7 @@ func (manager *StreamManagerCtx) createPipeline() error { return nil } -func (manager *StreamManagerCtx) destroyPipeline() { +func (manager *StreamSinkManagerCtx) destroyPipeline() { manager.pipelineMu.Lock() defer manager.pipelineMu.Unlock() diff --git a/internal/types/capture.go b/internal/types/capture.go index ed00b999..3fcc63fe 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -32,12 +32,12 @@ type ScreencastManager interface { Image() ([]byte, error) } -type StreamManager interface { +type StreamSinkManager interface { Codec() codec.RTPCodec AddListener(listener *func(sample Sample)) error RemoveListener(listener *func(sample Sample)) error - MoveListenerTo(listener *func(sample Sample), targetStream StreamManager) error + MoveListenerTo(listener *func(sample Sample), targetStream StreamSinkManager) error ListenersCount() int Started() bool @@ -49,8 +49,8 @@ type CaptureManager interface { Broadcast() BroadcastManager Screencast() ScreencastManager - Audio() StreamManager - Video(videoID string) (StreamManager, bool) + Audio() StreamSinkManager + Video(videoID string) (StreamSinkManager, bool) VideoIDs() []string } diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go index 2e3251e6..e204243a 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog" ) -func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamManager, logger zerolog.Logger) (*PeerStreamTrack, error) { +func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamSinkManager, logger zerolog.Logger) (*PeerStreamTrack, error) { codec := stream.Codec() id := codec.Type.String() @@ -42,11 +42,11 @@ type PeerStreamTrack struct { track *webrtc.TrackLocalStaticSample listener func(sample types.Sample) - stream types.StreamManager + stream types.StreamSinkManager streamMu sync.Mutex } -func (peer *PeerStreamTrack) SetStream(stream types.StreamManager) error { +func (peer *PeerStreamTrack) SetStream(stream types.StreamSinkManager) error { peer.streamMu.Lock() defer peer.streamMu.Unlock() From a6eca45e7f688403e0edc6a5c561fd99868033c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Dec 2021 22:34:36 +0100 Subject: [PATCH 623/876] implement codec parse. --- internal/config/capture.go | 27 ++++++++----------------- internal/types/codec/codecs.go | 36 +++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 20 deletions(-) diff --git a/internal/config/capture.go b/internal/config/capture.go index 5b47635b..665355b1 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -3,6 +3,7 @@ package config import ( "os" + "github.com/pion/webrtc/v3" "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -113,19 +114,15 @@ func (Capture) Init(cmd *cobra.Command) error { } func (s *Capture) Set() { + var ok bool + // Display is provided by env variable s.Display = os.Getenv("DISPLAY") // video videoCodec := viper.GetString("capture.video.codec") - switch videoCodec { - case "vp8": - s.VideoCodec = codec.VP8() - case "vp9": - s.VideoCodec = codec.VP9() - case "h264": - s.VideoCodec = codec.H264() - default: + s.VideoCodec, ok = codec.ParseStr(videoCodec) + if !ok || s.VideoCodec.Type != webrtc.RTPCodecTypeVideo { log.Warn().Str("codec", videoCodec).Msgf("unknown video codec, using Vp8") s.VideoCodec = codec.VP8() } @@ -143,7 +140,7 @@ func (s *Capture) Set() { s.VideoCodec = codec.VP8() s.VideoPipelines = map[string]types.VideoConfig{ - "main": types.VideoConfig{ + "main": { GstPipeline: "ximagesrc display-name={display} show-pointer=false use-damage=false " + "! video/x-raw " + "! videoconvert " + @@ -160,16 +157,8 @@ func (s *Capture) Set() { s.AudioPipeline = viper.GetString("capture.audio.pipeline") audioCodec := viper.GetString("capture.audio.codec") - switch audioCodec { - case "opus": - s.AudioCodec = codec.Opus() - case "g722": - s.AudioCodec = codec.G722() - case "pcmu": - s.AudioCodec = codec.PCMU() - case "pcma": - s.AudioCodec = codec.PCMA() - default: + s.AudioCodec, ok = codec.ParseStr(audioCodec) + if !ok || s.AudioCodec.Type != webrtc.RTPCodecTypeAudio { log.Warn().Str("codec", audioCodec).Msgf("unknown audio codec, using Opus") s.AudioCodec = codec.Opus() } diff --git a/internal/types/codec/codecs.go b/internal/types/codec/codecs.go index f8c08c88..00071c04 100644 --- a/internal/types/codec/codecs.go +++ b/internal/types/codec/codecs.go @@ -1,6 +1,40 @@ package codec -import "github.com/pion/webrtc/v3" +import ( + "strings" + + "github.com/pion/webrtc/v3" +) + +func ParseRTC(codec webrtc.RTPCodecParameters) (RTPCodec, bool) { + codecName := strings.Split(codec.RTPCodecCapability.MimeType, "/")[1] + return ParseStr(codecName) +} + +func ParseStr(codecName string) (codec RTPCodec, ok bool) { + ok = true + + switch strings.ToLower(codecName) { + case VP8().Name: + codec = VP8() + case VP9().Name: + codec = VP9() + case H264().Name: + codec = H264() + case Opus().Name: + codec = Opus() + case G722().Name: + codec = G722() + case PCMU().Name: + codec = PCMU() + case PCMA().Name: + codec = PCMA() + default: + ok = false + } + + return +} type RTPCodec struct { Name string From 5643e7abbc44636841a8f4e90b3979746e9763f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 1 Dec 2021 22:36:45 +0100 Subject: [PATCH 624/876] add streamsrc to capture. --- internal/capture/manager.go | 33 ++++++++++ internal/capture/streamsrc.go | 111 ++++++++++++++++++++++++++++++++++ internal/types/capture.go | 13 ++++ internal/webrtc/manager.go | 33 ++++------ 4 files changed, 168 insertions(+), 22 deletions(-) create mode 100644 internal/capture/streamsrc.go diff --git a/internal/capture/manager.go b/internal/capture/manager.go index d7d41a35..89bb7630 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -10,17 +10,23 @@ import ( "demodesk/neko/internal/config" "demodesk/neko/internal/types" + "demodesk/neko/internal/types/codec" ) type CaptureManagerCtx struct { logger zerolog.Logger desktop types.DesktopManager + // sinks broadcast *BroacastManagerCtx screencast *ScreencastManagerCtx audio *StreamSinkManagerCtx videos map[string]*StreamSinkManagerCtx videoIDs []string + + // sources + webcam *StreamSrcManagerCtx + microphone *StreamSrcManagerCtx } func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { @@ -95,6 +101,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt logger: logger, desktop: desktop, + // sinks broadcast: broadcastNew(broadcastPipeline), screencast: screencastNew(config.ScreencastEnabled, screencastPipeline), audio: streamSinkNew(config.AudioCodec, func() string { @@ -113,6 +120,21 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt }, "audio"), videos: videos, videoIDs: config.VideoIDs, + + // sources + webcam: streamSrcNew(map[string]string{}, "webcam"), // TODO + microphone: streamSrcNew(map[string]string{ + codec.Opus().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + + "! application/x-rtp, payload=111, encoding-name=OPUS " + + "! rtpopusdepay " + + "! decodebin " + + "! pulsesink device=audio_input", + codec.G722().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + + "! application/x-rtp clock-rate=8000 " + + "! rtpg722depay " + + "! decodebin " + + "! pulsesink device=audio_input", + }, "microphone"), } } @@ -177,6 +199,9 @@ func (manager *CaptureManagerCtx) Shutdown() error { video.shutdown() } + manager.webcam.shutdown() + manager.microphone.shutdown() + return nil } @@ -200,3 +225,11 @@ func (manager *CaptureManagerCtx) Video(videoID string) (types.StreamSinkManager func (manager *CaptureManagerCtx) VideoIDs() []string { return manager.videoIDs } + +func (manager *CaptureManagerCtx) Webcam() types.StreamSrcManager { + return manager.webcam +} + +func (manager *CaptureManagerCtx) Microphone() types.StreamSrcManager { + return manager.microphone +} diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go new file mode 100644 index 00000000..7630b8da --- /dev/null +++ b/internal/capture/streamsrc.go @@ -0,0 +1,111 @@ +package capture + +import ( + "errors" + "sync" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "demodesk/neko/internal/capture/gst" + "demodesk/neko/internal/types" + "demodesk/neko/internal/types/codec" +) + +type StreamSrcManagerCtx struct { + logger zerolog.Logger + codecPipeline map[string]string // codec -> pipeline + + codec codec.RTPCodec + pipeline *gst.Pipeline + pipelineMu sync.Mutex + pipelineStr string +} + +func streamSrcNew(codecPipeline map[string]string, video_id string) *StreamSrcManagerCtx { + logger := log.With(). + Str("module", "capture"). + Str("submodule", "stream-src"). + Str("video_id", video_id).Logger() + + return &StreamSrcManagerCtx{ + logger: logger, + codecPipeline: codecPipeline, + } +} + +func (manager *StreamSrcManagerCtx) shutdown() { + manager.logger.Info().Msgf("shutdown") + + manager.Stop() +} + +func (manager *StreamSrcManagerCtx) Codec() codec.RTPCodec { + return manager.codec +} + +func (manager *StreamSrcManagerCtx) Start(codec codec.RTPCodec) error { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + + if manager.pipeline != nil { + return types.ErrCapturePipelineAlreadyExists + } + + found := false + for codecName, pipeline := range manager.codecPipeline { + if codecName == codec.Name { + manager.pipelineStr = pipeline + manager.codec = codec + found = true + break + } + } + + if !found { + return errors.New("no pipeline found for a codec") + } + + var err error + + manager.logger.Info(). + Str("codec", manager.codec.Name). + Str("src", manager.pipelineStr). + Msgf("creating pipeline") + + manager.pipeline, err = gst.CreatePipeline(manager.pipelineStr) + if err != nil { + return err + } + + manager.pipeline.Play() + return nil +} + +func (manager *StreamSrcManagerCtx) Stop() { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + + if manager.pipeline == nil { + return + } + + manager.pipeline.Stop() + manager.logger.Info().Msgf("destroying pipeline") + manager.pipeline = nil +} + +func (manager *StreamSrcManagerCtx) Push(bytes []byte) { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + + if manager.pipeline == nil { + return + } + + manager.pipeline.Push("src", bytes) +} + +func (manager *StreamSrcManagerCtx) Started() bool { + return manager.pipeline != nil +} diff --git a/internal/types/capture.go b/internal/types/capture.go index 3fcc63fe..35d19fe9 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -43,6 +43,16 @@ type StreamSinkManager interface { Started() bool } +type StreamSrcManager interface { + Codec() codec.RTPCodec + + Start(codec codec.RTPCodec) error + Stop() + Push(bytes []byte) + + Started() bool +} + type CaptureManager interface { Start() Shutdown() error @@ -52,6 +62,9 @@ type CaptureManager interface { Audio() StreamSinkManager Video(videoID string) (StreamSinkManager, bool) VideoIDs() []string + + Webcam() StreamSrcManager + Microphone() StreamSrcManager } type VideoConfig struct { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index db1a3570..b7cae274 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -10,7 +10,6 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/capture/gst" "demodesk/neko/internal/config" "demodesk/neko/internal/types" "demodesk/neko/internal/types/codec" @@ -174,29 +173,17 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin Uint8("payload-type", uint8(track.PayloadType())). Msgf("received new track") - pipelineStr := "appsrc format=time is-live=true do-timestamp=true name=src" - - //add appropriate decoder - switch strings.ToLower(codecName) { - case "opus": - pipelineStr += fmt.Sprintf(" ! application/x-rtp, payload=%d, encoding-name=OPUS ! rtpopusdepay ! decodebin", track.PayloadType()) - case "g722": - pipelineStr += " ! application/x-rtp clock-rate=8000 ! rtpg722depay ! decodebin" - default: - logger.Panic().Msgf("Unhandled codec %s", codecName) - } - - pipelineStr += " ! pulsesink device=audio_input" - logger.Info().Str("pipeline", pipelineStr).Msg("create pipeline") - - pipeline, err := gst.CreatePipeline(pipelineStr) - if err != nil { - logger.Err(err).Str("pipeline", pipelineStr).Msg("unable to create pipeline") + // parse codec + codec, ok := codec.ParseRTC(track.Codec()) + if !ok { + logger.Warn().Str("mime", track.Codec().RTPCodecCapability.MimeType).Msg("unknown codec") return } - pipeline.Play() - defer pipeline.Stop() + // add microphone + microphone := manager.capture.Microphone() + microphone.Start(codec) + defer microphone.Stop() // TODO: Ensure no new publisher took over. // Send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval ticker := time.NewTicker(time.Second * 3) @@ -219,8 +206,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin break } - pipeline.Push("src", buf[:i]) + microphone.Push(buf[:i]) } + + logger.Warn().Msg("microphone connection died") }) connection.OnDataChannel(func(dc *webrtc.DataChannel) { From 9f9956d047a9f8c9b79d08d0ba68a2fceb278de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Dec 2021 21:41:53 +0100 Subject: [PATCH 625/876] upgrade deps. --- go.mod | 33 ++++++----- go.sum | 173 +++++++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 148 insertions(+), 58 deletions(-) diff --git a/go.mod b/go.mod index bf882cf1..cc696c20 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,18 @@ module demodesk/neko go 1.17 require ( - github.com/PaesslerAG/gval v1.1.1 + github.com/PaesslerAG/gval v1.1.2 github.com/go-chi/chi v1.5.4 github.com/go-chi/cors v1.2.0 github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 - github.com/pion/interceptor v0.0.18 + github.com/pion/interceptor v0.1.2 github.com/pion/logging v0.2.2 - github.com/pion/webrtc/v3 v3.0.32 - github.com/rs/zerolog v1.25.0 + github.com/pion/rtcp v1.2.9 + github.com/pion/webrtc/v3 v3.1.11 + github.com/rs/zerolog v1.26.0 github.com/spf13/cobra v1.2.1 - github.com/spf13/viper v1.8.1 + github.com/spf13/viper v1.9.0 ) require ( @@ -22,33 +23,31 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/magiconair/properties v1.8.5 // indirect - github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/pelletier/go-toml v1.9.4 // indirect - github.com/pion/datachannel v1.4.21 // indirect - github.com/pion/dtls/v2 v2.0.9 // indirect - github.com/pion/ice/v2 v2.1.12 // indirect + github.com/pion/datachannel v1.5.2 // indirect + github.com/pion/dtls/v2 v2.0.10 // indirect + github.com/pion/ice/v2 v2.1.14 // indirect github.com/pion/mdns v0.0.5 // indirect github.com/pion/randutil v0.1.0 // indirect - github.com/pion/rtcp v1.2.6 // indirect - github.com/pion/rtp v1.7.2 // indirect - github.com/pion/sctp v1.7.12 // indirect + github.com/pion/rtp v1.7.4 // indirect + github.com/pion/sctp v1.8.0 // indirect github.com/pion/sdp/v3 v3.0.4 // indirect github.com/pion/srtp/v2 v2.0.5 // indirect github.com/pion/stun v0.3.5 // indirect github.com/pion/transport v0.12.3 // indirect github.com/pion/turn/v2 v2.0.5 // indirect github.com/pion/udp v0.1.1 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.2.0 // indirect - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect - golang.org/x/net v0.0.0-20210908191846-a5e095526f91 // indirect - golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 // indirect + golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect + golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c // indirect + golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - gopkg.in/ini.v1 v1.63.0 // indirect + gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index b3763c0c..e77033fe 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,11 @@ cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmW cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -27,6 +32,7 @@ cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM7 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -39,17 +45,20 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/PaesslerAG/gval v1.1.1 h1:4d7pprU9876+m3rc08X33UjGip8oV1kkm8Gh5GBuTss= -github.com/PaesslerAG/gval v1.1.1/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PaesslerAG/gval v1.1.2 h1:EROKxV4/fAKWb0Qoj7NOxmHZA7gcpjOV9XgiRZMRCUU= +github.com/PaesslerAG/gval v1.1.2/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -57,6 +66,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -69,8 +79,10 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= @@ -98,6 +110,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -115,6 +128,7 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -128,10 +142,12 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -143,26 +159,33 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -174,8 +197,11 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -184,32 +210,43 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= +github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -225,35 +262,31 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0= -github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= -github.com/pion/dtls/v2 v2.0.9 h1:7Ow+V++YSZQMYzggI0P9vLJz/hUFcffsfGMfT/Qy+u8= +github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= +github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho= -github.com/pion/ice/v2 v2.1.10/go.mod h1:kV4EODVD5ux2z8XncbLHIOtcXKtYXVgLVCeVqnpoeP0= -github.com/pion/ice/v2 v2.1.12 h1:ZDBuZz+fEI7iDifZCYFVzI4p0Foy0YhdSSZ87ZtRcRE= -github.com/pion/ice/v2 v2.1.12/go.mod h1:ovgYHUmwYLlRvcCLI67PnQ5YGe+upXZbGgllBDG/ktU= -github.com/pion/interceptor v0.0.13/go.mod h1:svsW2QoLHLoGLUr4pDoSopGBEWk8FZwlfxId/OKRKzo= -github.com/pion/interceptor v0.0.18 h1:4I4JUcvD4Efrs39AI+MEkoQ6V3RldIjh4Gqu8rcUzho= -github.com/pion/interceptor v0.0.18/go.mod h1:LNvW3RHxHSGDCXWlofLo0eEtnWinHANEDMl4xKdjfjY= +github.com/pion/dtls/v2 v2.0.10 h1:wgys7gPR1NMbWjmjJ3CW7lkUGaun8djgH8nahpNLnxI= +github.com/pion/dtls/v2 v2.0.10/go.mod h1:00OxfeCRWHShcqT9jx8pKKmBWuTt0NCZoVPCaC4VKvU= +github.com/pion/ice/v2 v2.1.14 h1:nD9GZs3MiR1/dPa5EiMRMe8hLBG3/qqCdx/hTS2g8VE= +github.com/pion/ice/v2 v2.1.14/go.mod h1:ovgYHUmwYLlRvcCLI67PnQ5YGe+upXZbGgllBDG/ktU= +github.com/pion/interceptor v0.1.2 h1:1IfrJ+AQ0HhwxNl4hqh9hMvl1hBKiNhAAr7DrUHsC6s= +github.com/pion/interceptor v0.1.2/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo= github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= -github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.6.5/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U= +github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo= github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.7.2 h1:HCDKDCixh7PVjkQTsqHAbk1lg+bx059EHxcnyl42dYs= -github.com/pion/rtp v1.7.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= -github.com/pion/sctp v1.7.12 h1:GsatLufywVruXbZZT1CKg+Jr8ZTkwiPnmUC/oO9+uuY= -github.com/pion/sctp v1.7.12/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= +github.com/pion/rtp v1.7.4 h1:4dMbjb1SuynU5OpA3kz1zHK+u+eOCQjW3MAeVHf1ODA= +github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/sctp v1.8.0 h1:6erMF2qmQwXr+0iB1lm0AUSmDr9LdmpaBzgSVAEgehw= +github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8= github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= -github.com/pion/srtp/v2 v2.0.2/go.mod h1:VEyLv4CuxrwGY8cxM+Ng3bmVy8ckz/1t6A0q/msKOw0= github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ= github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A= github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= @@ -266,30 +299,30 @@ github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/webrtc/v3 v3.0.32 h1:5J+zNep9am8Swh6kEMp+LaGXNvn6qQWpGkLBnVW44L4= -github.com/pion/webrtc/v3 v3.0.32/go.mod h1:wX3V5dQQUGCifhT1mYftC2kCrDQX6ZJ3B7Yad0R9JK0= +github.com/pion/webrtc/v3 v3.1.11 h1:8Q5BEsxvlDn3botM8U8n/Haln745FBa5TWgm8v2c2FA= +github.com/pion/webrtc/v3 v3.1.11/go.mod h1:h9pbP+CADYb/99s5rfjflEcBLgdVKm55Rm7heQ/gIvY= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.25.0 h1:Rj7XygbUHKUlDPcVdoLyR91fJBsduXj5fRxyqIQj/II= -github.com/rs/zerolog v1.25.0/go.mod h1:7KHcEGe0QZPOm2IE4Kpb5rTh6n1h2hIgS5OOnu1rUaI= +github.com/rs/zerolog v1.26.0 h1:ORM4ibhEZeTeQlCojCK2kPz1ogAY4bGs4tD+SaAdGaE= +github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -301,8 +334,9 @@ github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmq github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= +github.com/spf13/viper v1.9.0 h1:yR6EXjTp0y0cLN8OZg1CRZmOBdI88UcGkhgyJhu6nZk= +github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -318,6 +352,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= @@ -328,6 +363,7 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= @@ -336,11 +372,14 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211202192323-5770296d904e h1:MUP6MR3rJ7Gk9LEia0LP2ytiH6MuCfs7qYz+47jGdD8= +golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -391,6 +430,7 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -417,10 +457,13 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210908191846-a5e095526f91 h1:E8wdt+zBjoxD3MA65wEc3pl25BsTi7tbkpwc4ANThjc= -golang.org/x/net v0.0.0-20210908191846-a5e095526f91/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c h1:WtYZ93XtWSO5KlOMgPZu7hXY9WhMZpprvlm5VwvAl8c= +golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -433,6 +476,10 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -449,6 +496,7 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -457,13 +505,19 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -490,10 +544,17 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 h1:6wSTsvPddg9gc/mVEEyk9oOAoxn+bT4Z9q1zx+4RwA4= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -522,6 +583,7 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -559,8 +621,12 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -588,6 +654,12 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -635,7 +707,18 @@ google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -655,7 +738,13 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -668,6 +757,7 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= @@ -675,8 +765,9 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.63.0 h1:2t0h8NA59dpVQpa5Yh8cIcR6nHAeBIEk0zlLVqfw4N4= -gopkg.in/ini.v1 v1.63.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= +gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From d70ae4410fe63a061dbc63e8a4c865307308cb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Dec 2021 23:06:21 +0100 Subject: [PATCH 626/876] implement webcam. --- internal/capture/manager.go | 20 ++++++++++++++++++-- internal/webrtc/manager.go | 29 ++++++++++++++--------------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 89bb7630..4b6a27de 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -122,10 +122,26 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt videoIDs: config.VideoIDs, // sources - webcam: streamSrcNew(map[string]string{}, "webcam"), // TODO + webcam: streamSrcNew(map[string]string{ + codec.VP8().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + + fmt.Sprintf("! application/x-rtp, payload=%d, encoding-name=VP8-DRAFT-IETF-01 ", codec.VP8().PayloadType) + + "! rtpvp8depay " + + "! decodebin " + + "! v4l2sink device=/dev/video0", + codec.VP9().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + + "! application/x-rtp " + + "! rtpvp9depay " + + "! decodebin " + + "! v4l2sink device=/dev/video0", + codec.H264().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + + "! application/x-rtp " + + "! rtph264depay " + + "! decodebin " + + "! v4l2sink device=/dev/video0", + }, "webcam"), microphone: streamSrcNew(map[string]string{ codec.Opus().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + - "! application/x-rtp, payload=111, encoding-name=OPUS " + + fmt.Sprintf("! application/x-rtp, payload=%d, encoding-name=OPUS ", codec.Opus().PayloadType) + "! rtpopusdepay " + "! decodebin " + "! pulsesink device=audio_input", diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index b7cae274..c462081f 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -157,19 +157,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) { - // if we did not get audio - if track.Kind() != webrtc.RTPCodecTypeAudio { - logger.Warn().Msg("got remote track, but not audio") - return - } - - codecName := strings.Split(track.Codec().RTPCodecCapability.MimeType, "/")[1] - logger.Info(). Str("stream-id", track.StreamID()). Str("id", track.ID()). Str("rid", track.RID()). - Str("codec", codecName). + Str("mime", track.Codec().RTPCodecCapability.MimeType). Uint8("payload-type", uint8(track.PayloadType())). Msgf("received new track") @@ -180,10 +172,17 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return } - // add microphone - microphone := manager.capture.Microphone() - microphone.Start(codec) - defer microphone.Stop() // TODO: Ensure no new publisher took over. + var srcManager types.StreamSrcManager + if track.Kind() == webrtc.RTPCodecTypeAudio { + // audio -> microphone + srcManager = manager.capture.Microphone() + } else if track.Kind() == webrtc.RTPCodecTypeVideo { + // video -> webcam + srcManager = manager.capture.Webcam() + } + + srcManager.Start(codec) + defer srcManager.Stop() // TODO: Ensure no new publisher took over. // Send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval ticker := time.NewTicker(time.Second * 3) @@ -206,10 +205,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin break } - microphone.Push(buf[:i]) + srcManager.Push(buf[:i]) } - logger.Warn().Msg("microphone connection died") + logger.Warn().Msg("src manager stream connection died") }) connection.OnDataChannel(func(dc *webrtc.DataChannel) { From 64c3449322bfbabec8d0b18c5985d987a25cb5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 2 Dec 2021 23:35:38 +0100 Subject: [PATCH 627/876] pipeline error handling. --- internal/webrtc/manager.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index c462081f..5ef23318 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -181,7 +181,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin srcManager = manager.capture.Webcam() } - srcManager.Start(codec) + err := srcManager.Start(codec) + if err != nil { + logger.Err(err).Msg("failed to start pipeline") + return + } defer srcManager.Stop() // TODO: Ensure no new publisher took over. // Send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval From 09cb1e9c6aee20b1f8f546f85dfb1a0a488f67fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 5 Dec 2021 16:35:04 +0100 Subject: [PATCH 628/876] webcam add videoconvert. --- internal/capture/manager.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 4b6a27de..8837319f 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -127,16 +127,19 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt fmt.Sprintf("! application/x-rtp, payload=%d, encoding-name=VP8-DRAFT-IETF-01 ", codec.VP8().PayloadType) + "! rtpvp8depay " + "! decodebin " + + "! videoconvert " + "! v4l2sink device=/dev/video0", codec.VP9().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + "! application/x-rtp " + "! rtpvp9depay " + "! decodebin " + + "! videoconvert " + "! v4l2sink device=/dev/video0", codec.H264().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + "! application/x-rtp " + "! rtph264depay " + "! decodebin " + + "! videoconvert " + "! v4l2sink device=/dev/video0", }, "webcam"), microphone: streamSrcNew(map[string]string{ From 7c3a24a613174d20fe8fc8f51631415cc05fa35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 5 Dec 2021 17:52:25 +0100 Subject: [PATCH 629/876] add zerolog to gst. --- internal/capture/gst/gst.c | 61 ++++++++++++++++++++++++++++++++----- internal/capture/gst/gst.go | 22 ++++++++++++- internal/capture/gst/gst.h | 3 ++ 3 files changed, 77 insertions(+), 9 deletions(-) diff --git a/internal/capture/gst/gst.c b/internal/capture/gst/gst.c index 1e28e86d..49aa3700 100644 --- a/internal/capture/gst/gst.c +++ b/internal/capture/gst/gst.c @@ -8,26 +8,71 @@ void gstreamer_init(void) { gst_init(NULL, NULL); } +GMainLoop *gstreamer_main_loop = NULL; +void gstreamer_loop(void) { + gstreamer_main_loop = g_main_loop_new (NULL, FALSE); + g_main_loop_run(gstreamer_main_loop); +} + +static void gstreamer_pipeline_log(char* level, const char* format, ...) { + va_list argptr; + va_start(argptr, format); + char buffer[100]; + vsprintf(buffer, format, argptr); + va_end(argptr); + goPipelineLog(level, buffer); +} + static gboolean gstreamer_bus_call(GstBus *bus, GstMessage *msg, gpointer data) { switch (GST_MESSAGE_TYPE(msg)) { case GST_MESSAGE_EOS: { - g_print("End of stream\n"); + gstreamer_pipeline_log("panic", "end of stream"); exit(1); } + case GST_MESSAGE_STATE_CHANGED: { + GstState old_state, new_state; + gst_message_parse_state_changed(msg, &old_state, &new_state, NULL); + + gstreamer_pipeline_log("debug", + "element %s changed state from %s to %s", + GST_OBJECT_NAME(msg->src), + gst_element_state_get_name(old_state), + gst_element_state_get_name(new_state)); + break; + } + + case GST_MESSAGE_TAG: { + GstTagList *tags = NULL; + gst_message_parse_tag(msg, &tags); + + gstreamer_pipeline_log("debug", + "got tags from element %s", + GST_OBJECT_NAME(msg->src)); + + gst_tag_list_unref(tags); + break; + } + case GST_MESSAGE_ERROR: { - gchar *debug; - GError *error; + GError *err = NULL; + gchar *dbg_info = NULL; + gst_message_parse_error(msg, &err, &dbg_info); - gst_message_parse_error(msg, &error, &debug); - g_free(debug); + gstreamer_pipeline_log("error", + "error from element %s: %s", + GST_OBJECT_NAME(msg->src), err->message); + gstreamer_pipeline_log("warn", + "debugging info: %s", + (dbg_info) ? dbg_info : "none"); - g_printerr("Error: %s\n", error->message); - g_error_free(error); - exit(1); + g_error_free(err); + g_free(dbg_info); + break; } default: + gstreamer_pipeline_log("trace", "unknown message"); break; } diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index d0f5d05a..2a92d691 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -13,6 +13,9 @@ import ( "unsafe" "demodesk/neko/internal/types" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" ) type Pipeline struct { @@ -28,6 +31,8 @@ var registry *C.GstRegistry func init() { C.gstreamer_init() + go C.gstreamer_loop() + registry = C.gst_registry_get() } @@ -113,6 +118,21 @@ func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.i Duration: time.Duration(duration), } } else { - fmt.Printf("discarding buffer, no pipeline with id %d", int(pipelineID)) + log.Warn(). + Str("module", "capture"). + Str("submodule", "gstreamer"). + Msgf("discarding buffer, no pipeline with id %d", int(pipelineID)) } } + +//export goPipelineLog +func goPipelineLog(levelUnsafe *C.char, msgUnsafe *C.char) { + levelStr := C.GoString(levelUnsafe) + msg := C.GoString(msgUnsafe) + + level, _ := zerolog.ParseLevel(levelStr) + log.WithLevel(level). + Str("module", "capture"). + Str("submodule", "gstreamer"). + Msg(msg) +} diff --git a/internal/capture/gst/gst.h b/internal/capture/gst/gst.h index a51d7682..fc72c4a0 100644 --- a/internal/capture/gst/gst.h +++ b/internal/capture/gst/gst.h @@ -1,9 +1,11 @@ #pragma once +#include #include #include extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); +extern void goPipelineLog(char *level, char *msg); void gstreamer_pipeline_attach_appsink(GstElement *pipeline, char *sinkName, int pipelineId); GstElement *gstreamer_pipeline_create(char *pipelineStr, GError **error); @@ -12,3 +14,4 @@ void gstreamer_pipeline_stop(GstElement *pipeline); void gstreamer_pipeline_push(GstElement *pipeline, char *srcName, void *buffer, int bufferLen); void gstreamer_init(void); +void gstreamer_loop(void); From b932e94f772e25f29fa37404a2993cd50fc75e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 5 Dec 2021 18:16:26 +0100 Subject: [PATCH 630/876] gst refactor to use ctx. --- internal/capture/broadcast.go | 2 +- internal/capture/gst/gst.c | 82 ++++++++++++++++++---------------- internal/capture/gst/gst.go | 60 ++++++++++++++++--------- internal/capture/gst/gst.h | 20 ++++++--- internal/capture/screencast.go | 2 +- internal/capture/streamsink.go | 2 +- internal/capture/streamsrc.go | 2 +- 7 files changed, 99 insertions(+), 71 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index d5510ca0..22dfe2f2 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -113,7 +113,7 @@ func (manager *BroacastManagerCtx) destroyPipeline() { return } - manager.pipeline.Stop() + manager.pipeline.Destroy() manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil } diff --git a/internal/capture/gst/gst.c b/internal/capture/gst/gst.c index 49aa3700..60e675c1 100644 --- a/internal/capture/gst/gst.c +++ b/internal/capture/gst/gst.c @@ -1,9 +1,5 @@ #include "gst.h" -typedef struct SampleHandlerUserData { - int pipelineId; -} SampleHandlerUserData; - void gstreamer_init(void) { gst_init(NULL, NULL); } @@ -14,27 +10,29 @@ void gstreamer_loop(void) { g_main_loop_run(gstreamer_main_loop); } -static void gstreamer_pipeline_log(char* level, const char* format, ...) { +static void gstreamer_pipeline_log(GstPipelineCtx *ctx, char* level, const char* format, ...) { va_list argptr; va_start(argptr, format); char buffer[100]; vsprintf(buffer, format, argptr); va_end(argptr); - goPipelineLog(level, buffer); + goPipelineLog(level, buffer, ctx->pipelineId); } -static gboolean gstreamer_bus_call(GstBus *bus, GstMessage *msg, gpointer data) { +static gboolean gstreamer_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data) { + GstPipelineCtx *ctx = (GstPipelineCtx *)user_data; + switch (GST_MESSAGE_TYPE(msg)) { case GST_MESSAGE_EOS: { - gstreamer_pipeline_log("panic", "end of stream"); - exit(1); + gstreamer_pipeline_log(ctx, "fatal", "end of stream"); + break; } case GST_MESSAGE_STATE_CHANGED: { GstState old_state, new_state; gst_message_parse_state_changed(msg, &old_state, &new_state, NULL); - gstreamer_pipeline_log("debug", + gstreamer_pipeline_log(ctx, "debug", "element %s changed state from %s to %s", GST_OBJECT_NAME(msg->src), gst_element_state_get_name(old_state), @@ -46,7 +44,7 @@ static gboolean gstreamer_bus_call(GstBus *bus, GstMessage *msg, gpointer data) GstTagList *tags = NULL; gst_message_parse_tag(msg, &tags); - gstreamer_pipeline_log("debug", + gstreamer_pipeline_log(ctx, "debug", "got tags from element %s", GST_OBJECT_NAME(msg->src)); @@ -59,10 +57,10 @@ static gboolean gstreamer_bus_call(GstBus *bus, GstMessage *msg, gpointer data) gchar *dbg_info = NULL; gst_message_parse_error(msg, &err, &dbg_info); - gstreamer_pipeline_log("error", + gstreamer_pipeline_log(ctx, "error", "error from element %s: %s", GST_OBJECT_NAME(msg->src), err->message); - gstreamer_pipeline_log("warn", + gstreamer_pipeline_log(ctx, "warn", "debugging info: %s", (dbg_info) ? dbg_info : "none"); @@ -72,26 +70,42 @@ static gboolean gstreamer_bus_call(GstBus *bus, GstMessage *msg, gpointer data) } default: - gstreamer_pipeline_log("trace", "unknown message"); + gstreamer_pipeline_log(ctx, "trace", "unknown message"); break; } return TRUE; } +GstPipelineCtx *gstreamer_pipeline_create(char *pipelineStr, int pipelineId, GError **error) { + GstElement *pipeline = gst_parse_launch(pipelineStr, error); + if (pipeline == NULL) return NULL; + + // create gstreamer pipeline context + GstPipelineCtx *ctx = calloc(1, sizeof(GstPipelineCtx)); + ctx->pipelineId = pipelineId; + ctx->pipeline = pipeline; + + GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline)); + gst_bus_add_watch(bus, gstreamer_bus_call, ctx); + gst_object_unref(bus); + + return ctx; +} + static GstFlowReturn gstreamer_send_new_sample_handler(GstElement *object, gpointer user_data) { + GstPipelineCtx *ctx = (GstPipelineCtx *)user_data; GstSample *sample = NULL; GstBuffer *buffer = NULL; gpointer copy = NULL; gsize copy_size = 0; - SampleHandlerUserData *s = (SampleHandlerUserData *)user_data; g_signal_emit_by_name(object, "pull-sample", &sample); if (sample) { buffer = gst_sample_get_buffer(sample); if (buffer) { gst_buffer_extract_dup(buffer, 0, gst_buffer_get_size(buffer), ©, ©_size); - goHandlePipelineBuffer(copy, copy_size, GST_BUFFER_DURATION(buffer), s->pipelineId); + goHandlePipelineBuffer(copy, copy_size, GST_BUFFER_DURATION(buffer), ctx->pipelineId); } gst_sample_unref(sample); } @@ -99,39 +113,29 @@ static GstFlowReturn gstreamer_send_new_sample_handler(GstElement *object, gpoin return GST_FLOW_OK; } -void gstreamer_pipeline_attach_appsink(GstElement *pipeline, char *sinkName, int pipelineId) { - SampleHandlerUserData *s = calloc(1, sizeof(SampleHandlerUserData)); - s->pipelineId = pipelineId; - - GstElement *appsink = gst_bin_get_by_name(GST_BIN(pipeline), sinkName); +void gstreamer_pipeline_attach_appsink(GstPipelineCtx *ctx, char *sinkName) { + GstElement *appsink = gst_bin_get_by_name(GST_BIN(ctx->pipeline), sinkName); g_object_set(appsink, "emit-signals", TRUE, NULL); - g_signal_connect(appsink, "new-sample", G_CALLBACK(gstreamer_send_new_sample_handler), s); + g_signal_connect(appsink, "new-sample", G_CALLBACK(gstreamer_send_new_sample_handler), ctx); gst_object_unref(appsink); } -GstElement *gstreamer_pipeline_create(char *pipelineStr, GError **error) { - GstElement *pipeline = gst_parse_launch(pipelineStr, error); - - if (pipeline != NULL) { - GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline)); - gst_bus_add_watch(bus, gstreamer_bus_call, NULL); - gst_object_unref(bus); - } - - return pipeline; +void gstreamer_pipeline_play(GstPipelineCtx *ctx) { + gst_element_set_state(GST_ELEMENT(ctx->pipeline), GST_STATE_PLAYING); } -void gstreamer_pipeline_play(GstElement *pipeline) { - gst_element_set_state(pipeline, GST_STATE_PLAYING); +void gstreamer_pipeline_pause(GstPipelineCtx *ctx) { + gst_element_set_state(GST_ELEMENT(ctx->pipeline), GST_STATE_PAUSED); } -void gstreamer_pipeline_stop(GstElement *pipeline) { - gst_element_set_state(pipeline, GST_STATE_NULL); - gst_object_unref(pipeline); +void gstreamer_pipeline_destory(GstPipelineCtx *ctx) { + gst_element_set_state(GST_ELEMENT(ctx->pipeline), GST_STATE_NULL); + gst_object_unref(ctx->pipeline); + free(ctx); } -void gstreamer_pipeline_push(GstElement *pipeline, char *srcName, void *buffer, int bufferLen) { - GstElement *src = gst_bin_get_by_name(GST_BIN(pipeline), srcName); +void gstreamer_pipeline_push(GstPipelineCtx *ctx, char *srcName, void *buffer, int bufferLen) { + GstElement *src = gst_bin_get_by_name(GST_BIN(ctx->pipeline), srcName); if (src != NULL) { gpointer p = g_memdup(buffer, bufferLen); diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 2a92d691..158fa458 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -19,10 +19,10 @@ import ( ) type Pipeline struct { - Pipeline *C.GstElement - Sample chan types.Sample - Src string - id int + id int + Src string + Ctx *C.GstPipelineCtx + Sample chan types.Sample } var pipelines = make(map[int]*Pipeline) @@ -43,10 +43,10 @@ func CreatePipeline(pipelineStr string) (*Pipeline, error) { pipelinesLock.Lock() defer pipelinesLock.Unlock() - var gstPipeline *C.GstElement - var gstError *C.GError + id := len(pipelines) - gstPipeline = C.gstreamer_pipeline_create(pipelineStrUnsafe, &gstError) + var gstError *C.GError + ctx := C.gstreamer_pipeline_create(pipelineStrUnsafe, C.int(id), &gstError) if gstError != nil { defer C.g_error_free(gstError) @@ -54,10 +54,10 @@ func CreatePipeline(pipelineStr string) (*Pipeline, error) { } p := &Pipeline{ - Pipeline: gstPipeline, - Sample: make(chan types.Sample), - Src: pipelineStr, - id: len(pipelines), + id: id, + Src: pipelineStr, + Ctx: ctx, + Sample: make(chan types.Sample), } pipelines[p.id] = p @@ -68,15 +68,21 @@ func (p *Pipeline) AttachAppsink(sinkName string) { sinkNameUnsafe := C.CString(sinkName) defer C.free(unsafe.Pointer(sinkNameUnsafe)) - C.gstreamer_pipeline_attach_appsink(p.Pipeline, sinkNameUnsafe, C.int(p.id)) + C.gstreamer_pipeline_attach_appsink(p.Ctx, sinkNameUnsafe) } func (p *Pipeline) Play() { - C.gstreamer_pipeline_play(p.Pipeline) + C.gstreamer_pipeline_play(p.Ctx) } -func (p *Pipeline) Stop() { - C.gstreamer_pipeline_stop(p.Pipeline) +func (p *Pipeline) Pause() { + C.gstreamer_pipeline_pause(p.Ctx) +} + +func (p *Pipeline) Destroy() { + C.gstreamer_pipeline_destory(p.Ctx) + p.Ctx = nil + close(p.Sample) } func (p *Pipeline) Push(srcName string, buffer []byte) { @@ -86,7 +92,7 @@ func (p *Pipeline) Push(srcName string, buffer []byte) { bytes := C.CBytes(buffer) defer C.free(bytes) - C.gstreamer_pipeline_push(p.Pipeline, srcNameUnsafe, bytes, C.int(len(buffer))) + C.gstreamer_pipeline_push(p.Ctx, srcNameUnsafe, bytes, C.int(len(buffer))) } // gst-inspect-1.0 @@ -121,18 +127,30 @@ func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.i log.Warn(). Str("module", "capture"). Str("submodule", "gstreamer"). - Msgf("discarding buffer, no pipeline with id %d", int(pipelineID)) + Msgf("discarding sample, no pipeline with id %d", int(pipelineID)) } } //export goPipelineLog -func goPipelineLog(levelUnsafe *C.char, msgUnsafe *C.char) { +func goPipelineLog(levelUnsafe *C.char, msgUnsafe *C.char, pipelineID C.int) { levelStr := C.GoString(levelUnsafe) msg := C.GoString(msgUnsafe) - level, _ := zerolog.ParseLevel(levelStr) - log.WithLevel(level). + logger := log.With(). Str("module", "capture"). Str("submodule", "gstreamer"). - Msg(msg) + Logger() + + pipelinesLock.Lock() + pipeline, ok := pipelines[int(pipelineID)] + pipelinesLock.Unlock() + + if ok { + logger = logger.With(). + Int("id", pipeline.id). + Logger() + } + + level, _ := zerolog.ParseLevel(levelStr) + logger.WithLevel(level).Msg(msg) } diff --git a/internal/capture/gst/gst.h b/internal/capture/gst/gst.h index fc72c4a0..7475290e 100644 --- a/internal/capture/gst/gst.h +++ b/internal/capture/gst/gst.h @@ -4,14 +4,20 @@ #include #include -extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); -extern void goPipelineLog(char *level, char *msg); +typedef struct GstPipelineCtx { + int pipelineId; + GstElement *pipeline; +} GstPipelineCtx; -void gstreamer_pipeline_attach_appsink(GstElement *pipeline, char *sinkName, int pipelineId); -GstElement *gstreamer_pipeline_create(char *pipelineStr, GError **error); -void gstreamer_pipeline_play(GstElement *pipeline); -void gstreamer_pipeline_stop(GstElement *pipeline); -void gstreamer_pipeline_push(GstElement *pipeline, char *srcName, void *buffer, int bufferLen); +extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); +extern void goPipelineLog(char *level, char *msg, int pipelineId); + +GstPipelineCtx *gstreamer_pipeline_create(char *pipelineStr, int pipelineId, GError **error); +void gstreamer_pipeline_attach_appsink(GstPipelineCtx *ctx, char *sinkName); +void gstreamer_pipeline_play(GstPipelineCtx *ctx); +void gstreamer_pipeline_pause(GstPipelineCtx *ctx); +void gstreamer_pipeline_destory(GstPipelineCtx *ctx); +void gstreamer_pipeline_push(GstPipelineCtx *ctx, char *srcName, void *buffer, int bufferLen); void gstreamer_init(void); void gstreamer_loop(void); diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 528ac83b..8a78f35f 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -186,7 +186,7 @@ func (manager *ScreencastManagerCtx) destroyPipeline() { return } - manager.pipeline.Stop() + manager.pipeline.Destroy() manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil } diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index dfb40152..39b164a6 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -262,7 +262,7 @@ func (manager *StreamSinkManagerCtx) destroyPipeline() { return } - manager.pipeline.Stop() + manager.pipeline.Destroy() manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil } diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index 7630b8da..871bf6c9 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -90,7 +90,7 @@ func (manager *StreamSrcManagerCtx) Stop() { return } - manager.pipeline.Stop() + manager.pipeline.Destroy() manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil } From f9fe303b50bb10510aa96b241c95455e2aa08866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 5 Dec 2021 21:31:40 +0100 Subject: [PATCH 631/876] gst destroy remove. --- internal/capture/gst/gst.c | 1 - internal/capture/gst/gst.go | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/internal/capture/gst/gst.c b/internal/capture/gst/gst.c index 60e675c1..22cf1f97 100644 --- a/internal/capture/gst/gst.c +++ b/internal/capture/gst/gst.c @@ -131,7 +131,6 @@ void gstreamer_pipeline_pause(GstPipelineCtx *ctx) { void gstreamer_pipeline_destory(GstPipelineCtx *ctx) { gst_element_set_state(GST_ELEMENT(ctx->pipeline), GST_STATE_NULL); gst_object_unref(ctx->pipeline); - free(ctx); } void gstreamer_pipeline_push(GstPipelineCtx *ctx, char *srcName, void *buffer, int bufferLen) { diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 158fa458..6d534e54 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -9,6 +9,7 @@ import "C" import ( "fmt" "sync" + "sync/atomic" "time" "unsafe" @@ -25,6 +26,7 @@ type Pipeline struct { Sample chan types.Sample } +var pSerial int32 var pipelines = make(map[int]*Pipeline) var pipelinesLock sync.Mutex var registry *C.GstRegistry @@ -37,14 +39,14 @@ func init() { } func CreatePipeline(pipelineStr string) (*Pipeline, error) { + id := atomic.AddInt32(&pSerial, 1) + pipelineStrUnsafe := C.CString(pipelineStr) defer C.free(unsafe.Pointer(pipelineStrUnsafe)) pipelinesLock.Lock() defer pipelinesLock.Unlock() - id := len(pipelines) - var gstError *C.GError ctx := C.gstreamer_pipeline_create(pipelineStrUnsafe, C.int(id), &gstError) @@ -54,7 +56,7 @@ func CreatePipeline(pipelineStr string) (*Pipeline, error) { } p := &Pipeline{ - id: id, + id: int(id), Src: pipelineStr, Ctx: ctx, Sample: make(chan types.Sample), @@ -81,8 +83,14 @@ func (p *Pipeline) Pause() { func (p *Pipeline) Destroy() { C.gstreamer_pipeline_destory(p.Ctx) - p.Ctx = nil + + pipelinesLock.Lock() + delete(pipelines, p.id) + pipelinesLock.Unlock() + close(p.Sample) + C.free(unsafe.Pointer(p.Ctx)) + p = nil } func (p *Pipeline) Push(srcName string, buffer []byte) { From 8de5cb2f4a0ea05eac89524c6aed138fd42a5cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 5 Dec 2021 21:33:30 +0100 Subject: [PATCH 632/876] fix gst log. --- internal/capture/gst/gst.go | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index 6d534e54..b4b0238e 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -135,7 +135,8 @@ func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.i log.Warn(). Str("module", "capture"). Str("submodule", "gstreamer"). - Msgf("discarding sample, no pipeline with id %d", int(pipelineID)) + Int("pipeline-id", int(pipelineID)). + Msgf("discarding sample, pipeline not found") } } @@ -144,21 +145,10 @@ func goPipelineLog(levelUnsafe *C.char, msgUnsafe *C.char, pipelineID C.int) { levelStr := C.GoString(levelUnsafe) msg := C.GoString(msgUnsafe) - logger := log.With(). + level, _ := zerolog.ParseLevel(levelStr) + log.WithLevel(level). Str("module", "capture"). Str("submodule", "gstreamer"). - Logger() - - pipelinesLock.Lock() - pipeline, ok := pipelines[int(pipelineID)] - pipelinesLock.Unlock() - - if ok { - logger = logger.With(). - Int("id", pipeline.id). - Logger() - } - - level, _ := zerolog.ParseLevel(levelStr) - logger.WithLevel(level).Msg(msg) + Int("pipeline-id", int(pipelineID)). + Msg(msg) } From 9a6eb942a4ec163a44cc18600376f3fef0ae96c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 5 Dec 2021 22:06:42 +0100 Subject: [PATCH 633/876] keep appsrc / appsink in ctx. --- internal/capture/gst/gst.c | 40 ++++++++++++++++++++++++++--------- internal/capture/gst/gst.go | 14 +++++++----- internal/capture/gst/gst.h | 5 ++++- internal/capture/manager.go | 10 ++++----- internal/capture/streamsrc.go | 3 ++- 5 files changed, 50 insertions(+), 22 deletions(-) diff --git a/internal/capture/gst/gst.c b/internal/capture/gst/gst.c index 22cf1f97..1bc9cab8 100644 --- a/internal/capture/gst/gst.c +++ b/internal/capture/gst/gst.c @@ -114,10 +114,13 @@ static GstFlowReturn gstreamer_send_new_sample_handler(GstElement *object, gpoin } void gstreamer_pipeline_attach_appsink(GstPipelineCtx *ctx, char *sinkName) { - GstElement *appsink = gst_bin_get_by_name(GST_BIN(ctx->pipeline), sinkName); - g_object_set(appsink, "emit-signals", TRUE, NULL); - g_signal_connect(appsink, "new-sample", G_CALLBACK(gstreamer_send_new_sample_handler), ctx); - gst_object_unref(appsink); + ctx->appsink = gst_bin_get_by_name(GST_BIN(ctx->pipeline), sinkName); + g_object_set(ctx->appsink, "emit-signals", TRUE, NULL); + g_signal_connect(ctx->appsink, "new-sample", G_CALLBACK(gstreamer_send_new_sample_handler), ctx); +} + +void gstreamer_pipeline_attach_appsrc(GstPipelineCtx *ctx, char *srcName) { + ctx->appsrc = gst_bin_get_by_name(GST_BIN(ctx->pipeline), srcName); } void gstreamer_pipeline_play(GstPipelineCtx *ctx) { @@ -129,17 +132,34 @@ void gstreamer_pipeline_pause(GstPipelineCtx *ctx) { } void gstreamer_pipeline_destory(GstPipelineCtx *ctx) { + // end appsrc, if exists + if (ctx->appsrc) { + gst_app_src_end_of_stream(GST_APP_SRC(ctx->appsrc)); + } + + // send pipeline eos + gst_element_send_event(GST_ELEMENT(ctx->pipeline), gst_event_new_eos()); + + // set null state gst_element_set_state(GST_ELEMENT(ctx->pipeline), GST_STATE_NULL); + + if (ctx->appsink) { + gst_object_unref(ctx->appsink); + ctx->appsink = NULL; + } + + if (ctx->appsrc) { + gst_object_unref(ctx->appsrc); + ctx->appsrc = NULL; + } + gst_object_unref(ctx->pipeline); } -void gstreamer_pipeline_push(GstPipelineCtx *ctx, char *srcName, void *buffer, int bufferLen) { - GstElement *src = gst_bin_get_by_name(GST_BIN(ctx->pipeline), srcName); - - if (src != NULL) { +void gstreamer_pipeline_push(GstPipelineCtx *ctx, void *buffer, int bufferLen) { + if (ctx->appsrc != NULL) { gpointer p = g_memdup(buffer, bufferLen); GstBuffer *buffer = gst_buffer_new_wrapped(p, bufferLen); - gst_app_src_push_buffer(GST_APP_SRC(src), buffer); - gst_object_unref(src); + gst_app_src_push_buffer(GST_APP_SRC(ctx->appsrc), buffer); } } diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index b4b0238e..e0a50ae9 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -73,6 +73,13 @@ func (p *Pipeline) AttachAppsink(sinkName string) { C.gstreamer_pipeline_attach_appsink(p.Ctx, sinkNameUnsafe) } +func (p *Pipeline) AttachAppsrc(srcName string) { + srcNameUnsafe := C.CString(srcName) + defer C.free(unsafe.Pointer(srcNameUnsafe)) + + C.gstreamer_pipeline_attach_appsrc(p.Ctx, srcNameUnsafe) +} + func (p *Pipeline) Play() { C.gstreamer_pipeline_play(p.Ctx) } @@ -93,14 +100,11 @@ func (p *Pipeline) Destroy() { p = nil } -func (p *Pipeline) Push(srcName string, buffer []byte) { - srcNameUnsafe := C.CString(srcName) - defer C.free(unsafe.Pointer(srcNameUnsafe)) - +func (p *Pipeline) Push(buffer []byte) { bytes := C.CBytes(buffer) defer C.free(bytes) - C.gstreamer_pipeline_push(p.Ctx, srcNameUnsafe, bytes, C.int(len(buffer))) + C.gstreamer_pipeline_push(p.Ctx, bytes, C.int(len(buffer))) } // gst-inspect-1.0 diff --git a/internal/capture/gst/gst.h b/internal/capture/gst/gst.h index 7475290e..f2af6a2e 100644 --- a/internal/capture/gst/gst.h +++ b/internal/capture/gst/gst.h @@ -7,6 +7,8 @@ typedef struct GstPipelineCtx { int pipelineId; GstElement *pipeline; + GstElement *appsink; + GstElement *appsrc; } GstPipelineCtx; extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); @@ -14,10 +16,11 @@ extern void goPipelineLog(char *level, char *msg, int pipelineId); GstPipelineCtx *gstreamer_pipeline_create(char *pipelineStr, int pipelineId, GError **error); void gstreamer_pipeline_attach_appsink(GstPipelineCtx *ctx, char *sinkName); +void gstreamer_pipeline_attach_appsrc(GstPipelineCtx *ctx, char *srcName); void gstreamer_pipeline_play(GstPipelineCtx *ctx); void gstreamer_pipeline_pause(GstPipelineCtx *ctx); void gstreamer_pipeline_destory(GstPipelineCtx *ctx); -void gstreamer_pipeline_push(GstPipelineCtx *ctx, char *srcName, void *buffer, int bufferLen); +void gstreamer_pipeline_push(GstPipelineCtx *ctx, void *buffer, int bufferLen); void gstreamer_init(void); void gstreamer_loop(void); diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 8837319f..19b078d8 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -123,19 +123,19 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt // sources webcam: streamSrcNew(map[string]string{ - codec.VP8().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + + codec.VP8().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + fmt.Sprintf("! application/x-rtp, payload=%d, encoding-name=VP8-DRAFT-IETF-01 ", codec.VP8().PayloadType) + "! rtpvp8depay " + "! decodebin " + "! videoconvert " + "! v4l2sink device=/dev/video0", - codec.VP9().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + + codec.VP9().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + "! application/x-rtp " + "! rtpvp9depay " + "! decodebin " + "! videoconvert " + "! v4l2sink device=/dev/video0", - codec.H264().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + + codec.H264().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + "! application/x-rtp " + "! rtph264depay " + "! decodebin " + @@ -143,12 +143,12 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! v4l2sink device=/dev/video0", }, "webcam"), microphone: streamSrcNew(map[string]string{ - codec.Opus().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + + codec.Opus().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + fmt.Sprintf("! application/x-rtp, payload=%d, encoding-name=OPUS ", codec.Opus().PayloadType) + "! rtpopusdepay " + "! decodebin " + "! pulsesink device=audio_input", - codec.G722().Name: "appsrc format=time is-live=true do-timestamp=true name=src " + + codec.G722().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + "! application/x-rtp clock-rate=8000 " + "! rtpg722depay " + "! decodebin " + diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index 871bf6c9..bbb5ce30 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -78,6 +78,7 @@ func (manager *StreamSrcManagerCtx) Start(codec codec.RTPCodec) error { return err } + manager.pipeline.AttachAppsrc("appsrc") manager.pipeline.Play() return nil } @@ -103,7 +104,7 @@ func (manager *StreamSrcManagerCtx) Push(bytes []byte) { return } - manager.pipeline.Push("src", bytes) + manager.pipeline.Push(bytes) } func (manager *StreamSrcManagerCtx) Started() bool { From 6431f63da7c49676d6e369ac777b2ec810bbb458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 5 Dec 2021 22:11:52 +0100 Subject: [PATCH 634/876] v4l2 drop-allocation. --- internal/capture/manager.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 19b078d8..be14252a 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -128,18 +128,21 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! rtpvp8depay " + "! decodebin " + "! videoconvert " + + "! identity drop-allocation=true " + "! v4l2sink device=/dev/video0", codec.VP9().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + "! application/x-rtp " + "! rtpvp9depay " + "! decodebin " + "! videoconvert " + + "! identity drop-allocation=true " + "! v4l2sink device=/dev/video0", codec.H264().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + "! application/x-rtp " + "! rtph264depay " + "! decodebin " + "! videoconvert " + + "! identity drop-allocation=true " + "! v4l2sink device=/dev/video0", }, "webcam"), microphone: streamSrcNew(map[string]string{ From b65385699404128ba6ce76955a4b7dcb8d90dbcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 5 Dec 2021 22:25:35 +0100 Subject: [PATCH 635/876] fix v4l2sink sync. --- internal/capture/manager.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index be14252a..b5404f53 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -128,22 +128,25 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! rtpvp8depay " + "! decodebin " + "! videoconvert " + + "! videorate " + "! identity drop-allocation=true " + - "! v4l2sink device=/dev/video0", + "! v4l2sink sync=false device=/dev/video0", codec.VP9().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + "! application/x-rtp " + "! rtpvp9depay " + "! decodebin " + "! videoconvert " + + "! videorate " + "! identity drop-allocation=true " + - "! v4l2sink device=/dev/video0", + "! v4l2sink sync=false device=/dev/video0", codec.H264().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + "! application/x-rtp " + "! rtph264depay " + "! decodebin " + "! videoconvert " + + "! videorate " + "! identity drop-allocation=true " + - "! v4l2sink device=/dev/video0", + "! v4l2sink sync=false device=/dev/video0", }, "webcam"), microphone: streamSrcNew(map[string]string{ codec.Opus().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + From 670e0ee17d11d296d430483a0ac7989292c160ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Dec 2021 21:48:02 +0100 Subject: [PATCH 636/876] member profile can share media. --- internal/api/members/controler.go | 1 + internal/member/dummy/provider.go | 1 + internal/member/object/provider.go | 2 ++ internal/types/member.go | 1 + internal/webrtc/manager.go | 19 +++++++++++++------ 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index e5de26b0..6b85f3a7 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -62,6 +62,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) e CanConnect: true, CanWatch: true, CanHost: true, + CanShareMedia: true, CanAccessClipboard: true, SendsInactiveCursor: true, CanSeeInactiveCursors: true, diff --git a/internal/member/dummy/provider.go b/internal/member/dummy/provider.go index 073d8327..88bef7ca 100644 --- a/internal/member/dummy/provider.go +++ b/internal/member/dummy/provider.go @@ -14,6 +14,7 @@ func New() types.MemberProvider { CanConnect: true, CanWatch: true, CanHost: true, + CanShareMedia: true, CanAccessClipboard: true, SendsInactiveCursor: true, CanSeeInactiveCursors: true, diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index 1bcb5c49..80b68b00 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -28,6 +28,7 @@ func (provider *MemberProviderCtx) Connect() error { CanConnect: true, CanWatch: true, CanHost: true, + CanShareMedia: true, CanAccessClipboard: true, SendsInactiveCursor: true, CanSeeInactiveCursors: true, @@ -43,6 +44,7 @@ func (provider *MemberProviderCtx) Connect() error { CanConnect: true, CanWatch: true, CanHost: true, + CanShareMedia: true, CanAccessClipboard: true, SendsInactiveCursor: true, CanSeeInactiveCursors: false, diff --git a/internal/types/member.go b/internal/types/member.go index c220b856..116c1684 100644 --- a/internal/types/member.go +++ b/internal/types/member.go @@ -15,6 +15,7 @@ type MemberProfile struct { CanConnect bool `json:"can_connect"` CanWatch bool `json:"can_watch"` CanHost bool `json:"can_host"` + CanShareMedia bool `json:"can_share_media"` CanAccessClipboard bool `json:"can_access_clipboard"` SendsInactiveCursor bool `json:"sends_inactive_cursor"` CanSeeInactiveCursors bool `json:"can_see_inactive_cursors"` diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 5ef23318..299a7506 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -157,12 +157,18 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) { + if !session.Profile().CanShareMedia { + logger.Warn(). + Str("kind", track.Kind().String()). + Msgf("got track but share media is disabled for this session") + + receiver.Stop() + return + } + logger.Info(). - Str("stream-id", track.StreamID()). - Str("id", track.ID()). - Str("rid", track.RID()). + Str("kind", track.Kind().String()). Str("mime", track.Codec().RTPCodecCapability.MimeType). - Uint8("payload-type", uint8(track.PayloadType())). Msgf("received new track") // parse codec @@ -186,7 +192,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin logger.Err(err).Msg("failed to start pipeline") return } - defer srcManager.Stop() // TODO: Ensure no new publisher took over. // Send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval ticker := time.NewTicker(time.Second * 3) @@ -212,7 +217,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin srcManager.Push(buf[:i]) } - logger.Warn().Msg("src manager stream connection died") + logger.Warn().Msg("src manager stream connection died, stopping") + srcManager.Stop() + logger.Warn().Msg("src manager stream stopped!!!!!!!!!!!!!!!") }) connection.OnDataChannel(func(dc *webrtc.DataChannel) { From 21140d3dd3dc50b623f85e8352bdadb8106b4bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Dec 2021 22:58:12 +0100 Subject: [PATCH 637/876] fix broadcast config. --- internal/config/capture.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/config/capture.go b/internal/config/capture.go index 665355b1..d7d9b908 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -69,18 +69,18 @@ func (Capture) Init(cmd *cobra.Command) error { } // broadcast - cmd.PersistentFlags().Int("capture.screencast.audio_bitrate", 128, "broadcast audio bitrate in KB/s") - if err := viper.BindPFlag("capture.screencast.audio_bitrate", cmd.PersistentFlags().Lookup("capture.screencast.audio_bitrate")); err != nil { + cmd.PersistentFlags().Int("capture.broadcast.audio_bitrate", 128, "broadcast audio bitrate in KB/s") + if err := viper.BindPFlag("capture.broadcast.audio_bitrate", cmd.PersistentFlags().Lookup("capture.broadcast.audio_bitrate")); err != nil { return err } - cmd.PersistentFlags().Int("capture.screencast.video_bitrate", 4096, "broadcast video bitrate in KB/s") - if err := viper.BindPFlag("capture.screencast.video_bitrate", cmd.PersistentFlags().Lookup("capture.screencast.video_bitrate")); err != nil { + cmd.PersistentFlags().Int("capture.broadcast.video_bitrate", 4096, "broadcast video bitrate in KB/s") + if err := viper.BindPFlag("capture.broadcast.video_bitrate", cmd.PersistentFlags().Lookup("capture.broadcast.video_bitrate")); err != nil { return err } - cmd.PersistentFlags().String("capture.screencast.preset", "veryfast", "broadcast speed preset for h264 encoding") - if err := viper.BindPFlag("capture.screencast.preset", cmd.PersistentFlags().Lookup("capture.screencast.preset")); err != nil { + cmd.PersistentFlags().String("capture.broadcast.preset", "veryfast", "broadcast speed preset for h264 encoding") + if err := viper.BindPFlag("capture.broadcast.preset", cmd.PersistentFlags().Lookup("capture.broadcast.preset")); err != nil { return err } From 6b14e014153f0409b81743c9dc6dc149af1aeaa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Dec 2021 23:22:24 +0100 Subject: [PATCH 638/876] add media to capture config. --- internal/capture/manager.go | 17 ++++++++------- internal/capture/screencast.go | 2 +- internal/capture/streamsrc.go | 8 ++++++- internal/config/capture.go | 38 +++++++++++++++++++++++++++++++++- internal/webrtc/manager.go | 35 +++++++++++++++---------------- 5 files changed, 72 insertions(+), 28 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index b5404f53..94c57184 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -122,7 +122,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt videoIDs: config.VideoIDs, // sources - webcam: streamSrcNew(map[string]string{ + webcam: streamSrcNew(config.WebcamEnabled, map[string]string{ codec.VP8().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + fmt.Sprintf("! application/x-rtp, payload=%d, encoding-name=VP8-DRAFT-IETF-01 ", codec.VP8().PayloadType) + "! rtpvp8depay " + @@ -130,7 +130,8 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! videoconvert " + "! videorate " + "! identity drop-allocation=true " + - "! v4l2sink sync=false device=/dev/video0", + fmt.Sprintf("! v4l2sink sync=false device=%s", config.WebcamDevice), + // TODO: Test this pipeline. codec.VP9().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + "! application/x-rtp " + "! rtpvp9depay " + @@ -138,7 +139,8 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! videoconvert " + "! videorate " + "! identity drop-allocation=true " + - "! v4l2sink sync=false device=/dev/video0", + fmt.Sprintf("! v4l2sink sync=false device=%s", config.WebcamDevice), + // TODO: Test this pipeline. codec.H264().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + "! application/x-rtp " + "! rtph264depay " + @@ -146,19 +148,20 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! videoconvert " + "! videorate " + "! identity drop-allocation=true " + - "! v4l2sink sync=false device=/dev/video0", + fmt.Sprintf("! v4l2sink sync=false device=%s", config.WebcamDevice), }, "webcam"), - microphone: streamSrcNew(map[string]string{ + microphone: streamSrcNew(config.MicrophoneEnabled, map[string]string{ codec.Opus().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + fmt.Sprintf("! application/x-rtp, payload=%d, encoding-name=OPUS ", codec.Opus().PayloadType) + "! rtpopusdepay " + "! decodebin " + - "! pulsesink device=audio_input", + fmt.Sprintf("! pulsesink device=%s", config.MicrophoneDevice), + // TODO: Test this pipeline. codec.G722().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " + "! application/x-rtp clock-rate=8000 " + "! rtpg722depay " + "! decodebin " + - "! pulsesink device=audio_input", + fmt.Sprintf("! pulsesink device=%s", config.MicrophoneDevice), }, "microphone"), } } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 8a78f35f..aa8d44ba 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -131,7 +131,7 @@ func (manager *ScreencastManagerCtx) start() error { defer manager.mu.Unlock() if !manager.enabled { - return errors.New("screenshot pipeline not enabled") + return errors.New("screencast not enabled") } err := manager.createPipeline() diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index bbb5ce30..1c4b76bf 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -14,6 +14,7 @@ import ( type StreamSrcManagerCtx struct { logger zerolog.Logger + enabled bool codecPipeline map[string]string // codec -> pipeline codec codec.RTPCodec @@ -22,7 +23,7 @@ type StreamSrcManagerCtx struct { pipelineStr string } -func streamSrcNew(codecPipeline map[string]string, video_id string) *StreamSrcManagerCtx { +func streamSrcNew(enabled bool, codecPipeline map[string]string, video_id string) *StreamSrcManagerCtx { logger := log.With(). Str("module", "capture"). Str("submodule", "stream-src"). @@ -30,6 +31,7 @@ func streamSrcNew(codecPipeline map[string]string, video_id string) *StreamSrcMa return &StreamSrcManagerCtx{ logger: logger, + enabled: enabled, codecPipeline: codecPipeline, } } @@ -52,6 +54,10 @@ func (manager *StreamSrcManagerCtx) Start(codec codec.RTPCodec) error { return types.ErrCapturePipelineAlreadyExists } + if !manager.enabled { + return errors.New("stream-src not enabled") + } + found := false for codecName, pipeline := range manager.codecPipeline { if codecName == codec.Name { diff --git a/internal/config/capture.go b/internal/config/capture.go index d7d9b908..b7825054 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -33,11 +33,17 @@ type Capture struct { ScreencastRate string ScreencastQuality string ScreencastPipeline string + + WebcamEnabled bool + WebcamDevice string + + MicrophoneEnabled bool + MicrophoneDevice string } func (Capture) Init(cmd *cobra.Command) error { // audio - cmd.PersistentFlags().String("capture.audio.device", "audio_output.monitor", "audio device to capture") + cmd.PersistentFlags().String("capture.audio.device", "audio_output.monitor", "pulseaudio device to capture") if err := viper.BindPFlag("capture.audio.device", cmd.PersistentFlags().Lookup("capture.audio.device")); err != nil { return err } @@ -110,6 +116,28 @@ func (Capture) Init(cmd *cobra.Command) error { return err } + // webcam + cmd.PersistentFlags().Bool("capture.webcam.enabled", false, "enable webcam stream") + if err := viper.BindPFlag("capture.webcam.enabled", cmd.PersistentFlags().Lookup("capture.webcam.enabled")); err != nil { + return err + } + + cmd.PersistentFlags().String("capture.webcam.device", "/dev/video0", "v4l2sink device used for webcam") + if err := viper.BindPFlag("capture.webcam.device", cmd.PersistentFlags().Lookup("capture.webcam.device")); err != nil { + return err + } + + // microphone + cmd.PersistentFlags().Bool("capture.microphone.enabled", true, "enable microphone stream") + if err := viper.BindPFlag("capture.microphone.enabled", cmd.PersistentFlags().Lookup("capture.microphone.enabled")); err != nil { + return err + } + + cmd.PersistentFlags().String("capture.microphone.device", "audio_input", "pulseaudio device used for microphone") + if err := viper.BindPFlag("capture.microphone.device", cmd.PersistentFlags().Lookup("capture.microphone.device")); err != nil { + return err + } + return nil } @@ -174,4 +202,12 @@ func (s *Capture) Set() { s.ScreencastRate = viper.GetString("capture.screencast.rate") s.ScreencastQuality = viper.GetString("capture.screencast.quality") s.ScreencastPipeline = viper.GetString("capture.screencast.pipeline") + + // webcam + s.WebcamEnabled = viper.GetBool("capture.webcam.enabled") + s.WebcamDevice = viper.GetString("capture.webcam.device") + + // microphone + s.MicrophoneEnabled = viper.GetBool("capture.microphone.enabled") + s.MicrophoneDevice = viper.GetString("capture.microphone.device") } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 299a7506..8829b028 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -157,24 +157,24 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) { - if !session.Profile().CanShareMedia { - logger.Warn(). - Str("kind", track.Kind().String()). - Msgf("got track but share media is disabled for this session") + defer receiver.Stop() - receiver.Stop() - return - } - - logger.Info(). + logger := logger.With(). Str("kind", track.Kind().String()). Str("mime", track.Codec().RTPCodecCapability.MimeType). - Msgf("received new track") + Logger() + + logger.Info().Msgf("received new track") + + if !session.Profile().CanShareMedia { + logger.Warn().Msg("share media is disabled for this session") + return + } // parse codec codec, ok := codec.ParseRTC(track.Codec()) if !ok { - logger.Warn().Str("mime", track.Codec().RTPCodecCapability.MimeType).Msg("unknown codec") + logger.Warn().Msg("unknown codec") return } @@ -192,6 +192,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin logger.Err(err).Msg("failed to start pipeline") return } + defer srcManager.Stop() // Send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval ticker := time.NewTicker(time.Second * 3) @@ -199,9 +200,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin go func() { for range ticker.C { - rtcpSendErr := connection.WriteRTCP([]rtcp.Packet{&rtcp.PictureLossIndication{MediaSSRC: uint32(track.SSRC())}}) - if rtcpSendErr != nil { - fmt.Println(rtcpSendErr) + err := connection.WriteRTCP([]rtcp.Packet{&rtcp.PictureLossIndication{MediaSSRC: uint32(track.SSRC())}}) + if err != nil { + logger.Err(err).Msg("rtcp send err") } } }() @@ -210,16 +211,14 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin for { i, _, err := track.Read(buf) if err != nil { - logger.Warn().Err(err).Msg("failed read from pipeline") + logger.Warn().Err(err).Msg("failed read from track") break } srcManager.Push(buf[:i]) } - logger.Warn().Msg("src manager stream connection died, stopping") - srcManager.Stop() - logger.Warn().Msg("src manager stream stopped!!!!!!!!!!!!!!!") + logger.Info().Msg("track data finished") }) connection.OnDataChannel(func(dc *webrtc.DataChannel) { From 0f9f9a376ce0a6810ff0563ca753825792709eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 6 Jan 2022 20:41:44 +0100 Subject: [PATCH 639/876] fix remote track logging. --- internal/webrtc/manager.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 8829b028..0a538b8a 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -27,6 +27,9 @@ const failedTimeout = 6 * time.Second // how often the ICE Agent sends extra traffic if there is no activity, if media is flowing no traffic will be sent. Default is 2 seconds const keepAliveInterval = 2 * time.Second +// send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval +const rtcpPLIInterval = 3 * time.Second + func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ logger: log.With().Str("module", "webrtc").Logger(), @@ -164,17 +167,17 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin Str("mime", track.Codec().RTPCodecCapability.MimeType). Logger() - logger.Info().Msgf("received new track") + logger.Info().Msgf("received new remote track") if !session.Profile().CanShareMedia { - logger.Warn().Msg("share media is disabled for this session") + logger.Warn().Msg("media sharing is disabled for this session") return } - // parse codec + // parse codec from remote track codec, ok := codec.ParseRTC(track.Codec()) if !ok { - logger.Warn().Msg("unknown codec") + logger.Warn().Msg("remote track with unknown codec") return } @@ -194,15 +197,14 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } defer srcManager.Stop() - // Send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval - ticker := time.NewTicker(time.Second * 3) + ticker := time.NewTicker(rtcpPLIInterval) defer ticker.Stop() go func() { for range ticker.C { err := connection.WriteRTCP([]rtcp.Packet{&rtcp.PictureLossIndication{MediaSSRC: uint32(track.SSRC())}}) if err != nil { - logger.Err(err).Msg("rtcp send err") + logger.Err(err).Msg("remote track rtcp send err") } } }() @@ -211,14 +213,14 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin for { i, _, err := track.Read(buf) if err != nil { - logger.Warn().Err(err).Msg("failed read from track") + logger.Warn().Err(err).Msg("failed read from remote track") break } srcManager.Push(buf[:i]) } - logger.Info().Msg("track data finished") + logger.Info().Msg("remote track data finished") }) connection.OnDataChannel(func(dc *webrtc.DataChannel) { From 14a2e698acc69673f8b1defd26b31680e8259057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 6 Jan 2022 22:28:34 +0100 Subject: [PATCH 640/876] add stop fn to remote track. --- internal/webrtc/manager.go | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 0a538b8a..49a982a6 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -50,6 +50,8 @@ type WebRTCManagerCtx struct { capture types.CaptureManager curImage *cursor.ImageCtx curPosition *cursor.PositionCtx + + camStop, micStop *func() } func (manager *WebRTCManagerCtx) Start() { @@ -160,8 +162,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin } connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) { - defer receiver.Stop() - logger := logger.With(). Str("kind", track.Kind().String()). Str("mime", track.Codec().RTPCodecCapability.MimeType). @@ -171,6 +171,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin if !session.Profile().CanShareMedia { logger.Warn().Msg("media sharing is disabled for this session") + receiver.Stop() return } @@ -178,16 +179,46 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin codec, ok := codec.ParseRTC(track.Codec()) if !ok { logger.Warn().Msg("remote track with unknown codec") + receiver.Stop() return } var srcManager types.StreamSrcManager + + stopped := false + stopFn := func() { + if stopped { + return + } + + stopped = true + receiver.Stop() + srcManager.Stop() + logger.Info().Msg("remote track stopped") + } + if track.Kind() == webrtc.RTPCodecTypeAudio { // audio -> microphone srcManager = manager.capture.Microphone() + defer stopFn() + + if manager.micStop != nil { + (*manager.micStop)() + } + manager.micStop = &stopFn } else if track.Kind() == webrtc.RTPCodecTypeVideo { // video -> webcam srcManager = manager.capture.Webcam() + defer stopFn() + + if manager.camStop != nil { + (*manager.camStop)() + } + manager.camStop = &stopFn + } else { + logger.Warn().Msg("remote track with unsupported codec type") + receiver.Stop() + return } err := srcManager.Start(codec) @@ -195,7 +226,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin logger.Err(err).Msg("failed to start pipeline") return } - defer srcManager.Stop() ticker := time.NewTicker(rtcpPLIInterval) defer ticker.Stop() From dc33aa37bca55e82250012783658c7c9dbb6937f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 6 Jan 2022 22:35:12 +0100 Subject: [PATCH 641/876] add v4l2loopback to comments. --- internal/config/capture.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/config/capture.go b/internal/config/capture.go index b7825054..ce01c7de 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -122,6 +122,9 @@ func (Capture) Init(cmd *cobra.Command) error { return err } + // sudo apt install v4l2loopback-dkms v4l2loopback-utils + // sudo apt-get install linux-headers-`uname -r` linux-modules-extra-`uname -r` + // sudo modprobe v4l2loopback exclusive_caps=1 cmd.PersistentFlags().String("capture.webcam.device", "/dev/video0", "v4l2sink device used for webcam") if err := viper.BindPFlag("capture.webcam.device", cmd.PersistentFlags().Lookup("capture.webcam.device")); err != nil { return err From 8b6a2ed6d64afdae68893d23004da078f4028a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 8 Jan 2022 23:53:45 +0100 Subject: [PATCH 642/876] add webcam resolution + to config. --- internal/capture/manager.go | 6 ++++++ internal/config/capture.go | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 94c57184..95bde947 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -129,6 +129,8 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! decodebin " + "! videoconvert " + "! videorate " + + "! videoscale " + + fmt.Sprintf("! video/x-raw,width=%d,height=%d ", config.WebcamWidth, config.WebcamHeight) + "! identity drop-allocation=true " + fmt.Sprintf("! v4l2sink sync=false device=%s", config.WebcamDevice), // TODO: Test this pipeline. @@ -138,6 +140,8 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! decodebin " + "! videoconvert " + "! videorate " + + "! videoscale " + + fmt.Sprintf("! video/x-raw,width=%d,height=%d ", config.WebcamWidth, config.WebcamHeight) + "! identity drop-allocation=true " + fmt.Sprintf("! v4l2sink sync=false device=%s", config.WebcamDevice), // TODO: Test this pipeline. @@ -147,6 +151,8 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! decodebin " + "! videoconvert " + "! videorate " + + "! videoscale " + + fmt.Sprintf("! video/x-raw,width=%d,height=%d ", config.WebcamWidth, config.WebcamHeight) + "! identity drop-allocation=true " + fmt.Sprintf("! v4l2sink sync=false device=%s", config.WebcamDevice), }, "webcam"), diff --git a/internal/config/capture.go b/internal/config/capture.go index ce01c7de..0b4289c9 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -36,6 +36,8 @@ type Capture struct { WebcamEnabled bool WebcamDevice string + WebcamWidth int + WebcamHeight int MicrophoneEnabled bool MicrophoneDevice string @@ -130,6 +132,16 @@ func (Capture) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Int("capture.webcam.width", 1280, "webcam stream width") + if err := viper.BindPFlag("capture.webcam.width", cmd.PersistentFlags().Lookup("capture.webcam.width")); err != nil { + return err + } + + cmd.PersistentFlags().Int("capture.webcam.height", 720, "webcam stream height") + if err := viper.BindPFlag("capture.webcam.height", cmd.PersistentFlags().Lookup("capture.webcam.height")); err != nil { + return err + } + // microphone cmd.PersistentFlags().Bool("capture.microphone.enabled", true, "enable microphone stream") if err := viper.BindPFlag("capture.microphone.enabled", cmd.PersistentFlags().Lookup("capture.microphone.enabled")); err != nil { @@ -209,6 +221,8 @@ func (s *Capture) Set() { // webcam s.WebcamEnabled = viper.GetBool("capture.webcam.enabled") s.WebcamDevice = viper.GetString("capture.webcam.device") + s.WebcamWidth = viper.GetInt("capture.webcam.width") + s.WebcamHeight = viper.GetInt("capture.webcam.height") // microphone s.MicrophoneEnabled = viper.GetBool("capture.microphone.enabled") From 552c4e37bcb87ea98bb9295b08b3cd215599debb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 8 Jan 2022 23:56:10 +0100 Subject: [PATCH 643/876] change pulseaudio log level. --- runtime/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf index fbfac9c9..0acbaec4 100644 --- a/runtime/supervisord.conf +++ b/runtime/supervisord.conf @@ -33,7 +33,7 @@ redirect_stderr=true [program:pulseaudio] environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/pulseaudio --disallow-module-loading -vvvv --disallow-exit --exit-idle-time=-1 +command=/usr/bin/pulseaudio --log-level=info --disallow-module-loading --disallow-exit --exit-idle-time=-1 autorestart=true priority=300 user=%(ENV_USER)s From 62353c776d271b1d198455522bc5b86715ac4dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 14 Jan 2022 00:21:56 +0100 Subject: [PATCH 644/876] move logic to serve. --- cmd/serve.go | 161 +++++++++++++++++++++++++++++++++++++++++------ neko.go | 172 +++++++++++++-------------------------------------- 2 files changed, 184 insertions(+), 149 deletions(-) diff --git a/cmd/serve.go b/cmd/serve.go index d1cc3c6e..916054e7 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -1,43 +1,166 @@ package cmd import ( + "os" + "os/signal" + + "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/spf13/cobra" "demodesk/neko" - "demodesk/neko/internal/config" + "demodesk/neko/internal/api" + "demodesk/neko/internal/capture" + "demodesk/neko/internal/desktop" + "demodesk/neko/internal/http" + "demodesk/neko/internal/member" + "demodesk/neko/internal/session" + "demodesk/neko/internal/webrtc" + "demodesk/neko/internal/websocket" "demodesk/neko/modules" ) func init() { + service := Serve{ + Version: neko.Service.Version, + Configs: neko.Service.Configs, + } + command := &cobra.Command{ Use: "serve", Short: "serve neko streaming server", Long: `serve neko streaming server`, - Run: neko.Service.ServeCommand, + Run: service.ServeCommand, } - configs := append([]config.Config{ - neko.Service.Configs.Desktop, - neko.Service.Configs.Capture, - neko.Service.Configs.WebRTC, - neko.Service.Configs.Member, - neko.Service.Configs.Session, - neko.Service.Configs.Server, - }, modules.Configs()...) - cobra.OnInitialize(func() { - for _, cfg := range configs { - cfg.Set() - } - neko.Service.Preflight() + service.Configs.Set() + service.Preflight() }) - for _, cfg := range configs { - if err := cfg.Init(command); err != nil { - log.Panic().Err(err).Msg("unable to run serve command") - } + if err := service.Configs.Init(command); err != nil { + log.Panic().Err(err).Msg("unable to run serve command") } root.AddCommand(command) } + +type Serve struct { + Version *neko.Version + Configs *neko.Configs + + logger zerolog.Logger + desktopManager *desktop.DesktopManagerCtx + captureManager *capture.CaptureManagerCtx + webRTCManager *webrtc.WebRTCManagerCtx + memberManager *member.MemberManagerCtx + sessionManager *session.SessionManagerCtx + webSocketManager *websocket.WebSocketManagerCtx + apiManager *api.ApiManagerCtx + httpManager *http.HttpManagerCtx +} + +func (neko *Serve) Preflight() { + neko.logger = log.With().Str("service", "neko").Logger() +} + +func (neko *Serve) Start() { + neko.sessionManager = session.New( + neko.Configs.Session, + ) + + neko.memberManager = member.New( + neko.sessionManager, + neko.Configs.Member, + ) + + if err := neko.memberManager.Connect(); err != nil { + neko.logger.Panic().Err(err).Msg("unable to connect to member manager") + } + + neko.desktopManager = desktop.New( + neko.Configs.Desktop, + ) + neko.desktopManager.Start() + + neko.captureManager = capture.New( + neko.desktopManager, + neko.Configs.Capture, + ) + neko.captureManager.Start() + + neko.webRTCManager = webrtc.New( + neko.desktopManager, + neko.captureManager, + neko.Configs.WebRTC, + ) + neko.webRTCManager.Start() + + neko.webSocketManager = websocket.New( + neko.sessionManager, + neko.desktopManager, + neko.captureManager, + neko.webRTCManager, + ) + neko.webSocketManager.Start() + + neko.apiManager = api.New( + neko.sessionManager, + neko.memberManager, + neko.desktopManager, + neko.captureManager, + neko.Configs.Server, + ) + + modules.Start( + neko.sessionManager, + neko.webSocketManager, + neko.apiManager, + ) + + neko.httpManager = http.New( + neko.webSocketManager, + neko.apiManager, + neko.Configs.Server, + ) + neko.httpManager.Start() +} + +func (neko *Serve) Shutdown() { + var err error + + err = neko.memberManager.Disconnect() + neko.logger.Err(err).Msg("member manager disconnect") + + err = neko.desktopManager.Shutdown() + neko.logger.Err(err).Msg("desktop manager shutdown") + + err = neko.captureManager.Shutdown() + neko.logger.Err(err).Msg("capture manager shutdown") + + err = neko.webRTCManager.Shutdown() + neko.logger.Err(err).Msg("webrtc manager shutdown") + + err = neko.webSocketManager.Shutdown() + neko.logger.Err(err).Msg("websocket manager shutdown") + + err = modules.Shutdown() + neko.logger.Err(err).Msg("modules shutdown") + + err = neko.httpManager.Shutdown() + neko.logger.Err(err).Msg("http manager shutdown") +} + +func (neko *Serve) ServeCommand(cmd *cobra.Command, args []string) { + neko.logger.Info().Msg("starting neko server") + neko.Start() + neko.logger.Info().Msg("neko ready") + + quit := make(chan os.Signal, 1) + signal.Notify(quit, os.Interrupt) + sig := <-quit + + neko.logger.Warn().Msgf("received %s, attempting graceful shutdown", sig) + neko.Shutdown() + neko.logger.Info().Msg("shutdown complete") +} diff --git a/neko.go b/neko.go index af1ce98b..d176e559 100644 --- a/neko.go +++ b/neko.go @@ -2,24 +2,12 @@ package neko import ( "fmt" - "os" - "os/signal" "runtime" - "demodesk/neko/internal/api" - "demodesk/neko/internal/capture" - "demodesk/neko/internal/config" - "demodesk/neko/internal/desktop" - "demodesk/neko/internal/http" - "demodesk/neko/internal/member" - "demodesk/neko/internal/session" - "demodesk/neko/internal/webrtc" - "demodesk/neko/internal/websocket" - "demodesk/neko/modules" - - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" "github.com/spf13/cobra" + + "demodesk/neko/internal/config" + "demodesk/neko/modules" ) const Header = `&34 @@ -113,122 +101,46 @@ type Configs struct { Server *config.Server } +func (i *Configs) Set() { + i.Root.Set() + i.Desktop.Set() + i.Capture.Set() + i.WebRTC.Set() + i.Member.Set() + i.Session.Set() + i.Server.Set() + modules.SetConfigs() +} + +func (i *Configs) Init(cmd *cobra.Command) error { + if err := i.Root.Init(cmd); err != nil { + return err + } + if err := i.Desktop.Init(cmd); err != nil { + return err + } + if err := i.Capture.Init(cmd); err != nil { + return err + } + if err := i.WebRTC.Init(cmd); err != nil { + return err + } + if err := i.Member.Init(cmd); err != nil { + return err + } + if err := i.Session.Init(cmd); err != nil { + return err + } + if err := i.Server.Init(cmd); err != nil { + return err + } + if err := modules.InitConfigs(cmd); err != nil { + return err + } + return nil +} + type Neko struct { Version *Version Configs *Configs - - logger zerolog.Logger - desktopManager *desktop.DesktopManagerCtx - captureManager *capture.CaptureManagerCtx - webRTCManager *webrtc.WebRTCManagerCtx - memberManager *member.MemberManagerCtx - sessionManager *session.SessionManagerCtx - webSocketManager *websocket.WebSocketManagerCtx - apiManager *api.ApiManagerCtx - httpManager *http.HttpManagerCtx -} - -func (neko *Neko) Preflight() { - neko.logger = log.With().Str("service", "neko").Logger() -} - -func (neko *Neko) Start() { - neko.sessionManager = session.New( - neko.Configs.Session, - ) - - neko.memberManager = member.New( - neko.sessionManager, - neko.Configs.Member, - ) - - if err := neko.memberManager.Connect(); err != nil { - neko.logger.Panic().Err(err).Msg("unable to connect to member manager") - } - - neko.desktopManager = desktop.New( - neko.Configs.Desktop, - ) - neko.desktopManager.Start() - - neko.captureManager = capture.New( - neko.desktopManager, - neko.Configs.Capture, - ) - neko.captureManager.Start() - - neko.webRTCManager = webrtc.New( - neko.desktopManager, - neko.captureManager, - neko.Configs.WebRTC, - ) - neko.webRTCManager.Start() - - neko.webSocketManager = websocket.New( - neko.sessionManager, - neko.desktopManager, - neko.captureManager, - neko.webRTCManager, - ) - neko.webSocketManager.Start() - - neko.apiManager = api.New( - neko.sessionManager, - neko.memberManager, - neko.desktopManager, - neko.captureManager, - neko.Configs.Server, - ) - - modules.Start( - neko.sessionManager, - neko.webSocketManager, - neko.apiManager, - ) - - neko.httpManager = http.New( - neko.webSocketManager, - neko.apiManager, - neko.Configs.Server, - ) - neko.httpManager.Start() -} - -func (neko *Neko) Shutdown() { - var err error - - err = neko.memberManager.Disconnect() - neko.logger.Err(err).Msg("member manager disconnect") - - err = neko.desktopManager.Shutdown() - neko.logger.Err(err).Msg("desktop manager shutdown") - - err = neko.captureManager.Shutdown() - neko.logger.Err(err).Msg("capture manager shutdown") - - err = neko.webRTCManager.Shutdown() - neko.logger.Err(err).Msg("webrtc manager shutdown") - - err = neko.webSocketManager.Shutdown() - neko.logger.Err(err).Msg("websocket manager shutdown") - - err = modules.Shutdown() - neko.logger.Err(err).Msg("modules shutdown") - - err = neko.httpManager.Shutdown() - neko.logger.Err(err).Msg("http manager shutdown") -} - -func (neko *Neko) ServeCommand(cmd *cobra.Command, args []string) { - neko.logger.Info().Msg("starting neko server") - neko.Start() - neko.logger.Info().Msg("neko ready") - - quit := make(chan os.Signal, 1) - signal.Notify(quit, os.Interrupt) - sig := <-quit - - neko.logger.Warn().Msgf("received %s, attempting graceful shutdown", sig) - neko.Shutdown() - neko.logger.Info().Msg("shutdown complete") } From 66d22dede4cc2d2ec2fbead5e30a35b813b6e945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 14 Jan 2022 00:22:23 +0100 Subject: [PATCH 645/876] configs to root. --- cmd/root.go | 22 +++++++++++++++++++--- cmd/serve.go | 9 +-------- neko.go | 42 ------------------------------------------ 3 files changed, 20 insertions(+), 53 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index aee8c983..fd510bf5 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -16,6 +16,8 @@ import ( "github.com/spf13/viper" "demodesk/neko" + "demodesk/neko/internal/config" + "demodesk/neko/modules" ) func Execute() error { @@ -30,6 +32,16 @@ var root = &cobra.Command{ } func init() { + configs := append([]config.Config{ + neko.Service.Configs.Root, + neko.Service.Configs.Desktop, + neko.Service.Configs.Capture, + neko.Service.Configs.WebRTC, + neko.Service.Configs.Member, + neko.Service.Configs.Session, + neko.Service.Configs.Server, + }, modules.Configs()...) + cobra.OnInitialize(func() { ////// // logs @@ -126,11 +138,15 @@ func init() { } } - neko.Service.Configs.Root.Set() + for _, cfg := range configs { + cfg.Set() + } }) - if err := neko.Service.Configs.Root.Init(root); err != nil { - log.Panic().Err(err).Msg("unable to run root command") + for _, cfg := range configs { + if err := cfg.Init(root); err != nil { + log.Panic().Err(err).Msg("unable to initialize configuration") + } } root.SetVersionTemplate(neko.Service.Version.Details()) diff --git a/cmd/serve.go b/cmd/serve.go index 916054e7..22e700a0 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -33,14 +33,7 @@ func init() { Run: service.ServeCommand, } - cobra.OnInitialize(func() { - service.Configs.Set() - service.Preflight() - }) - - if err := service.Configs.Init(command); err != nil { - log.Panic().Err(err).Msg("unable to run serve command") - } + cobra.OnInitialize(service.Preflight) root.AddCommand(command) } diff --git a/neko.go b/neko.go index d176e559..179048a5 100644 --- a/neko.go +++ b/neko.go @@ -4,10 +4,7 @@ import ( "fmt" "runtime" - "github.com/spf13/cobra" - "demodesk/neko/internal/config" - "demodesk/neko/modules" ) const Header = `&34 @@ -101,45 +98,6 @@ type Configs struct { Server *config.Server } -func (i *Configs) Set() { - i.Root.Set() - i.Desktop.Set() - i.Capture.Set() - i.WebRTC.Set() - i.Member.Set() - i.Session.Set() - i.Server.Set() - modules.SetConfigs() -} - -func (i *Configs) Init(cmd *cobra.Command) error { - if err := i.Root.Init(cmd); err != nil { - return err - } - if err := i.Desktop.Init(cmd); err != nil { - return err - } - if err := i.Capture.Init(cmd); err != nil { - return err - } - if err := i.WebRTC.Init(cmd); err != nil { - return err - } - if err := i.Member.Init(cmd); err != nil { - return err - } - if err := i.Session.Init(cmd); err != nil { - return err - } - if err := i.Server.Init(cmd); err != nil { - return err - } - if err := modules.InitConfigs(cmd); err != nil { - return err - } - return nil -} - type Neko struct { Version *Version Configs *Configs From 0dd11fc1b7e8a700a5a413106719ac5ac485c086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 16 Jan 2022 20:35:57 +0100 Subject: [PATCH 646/876] move configs to serve. --- cmd/neko/main.go | 2 +- cmd/root.go | 25 ++--- cmd/serve.go | 237 ++++++++++++++++++++++++++++------------------- neko.go | 58 +++--------- 4 files changed, 164 insertions(+), 158 deletions(-) diff --git a/cmd/neko/main.go b/cmd/neko/main.go index 1af5be07..88018a1a 100644 --- a/cmd/neko/main.go +++ b/cmd/neko/main.go @@ -11,7 +11,7 @@ import ( ) func main() { - fmt.Print(utils.Colorf(neko.Header, "server", neko.Service.Version)) + fmt.Print(utils.Colorf(neko.Header, "server", neko.Version)) if err := cmd.Execute(); err != nil { log.Panic().Err(err).Msg("failed to execute command") } diff --git a/cmd/root.go b/cmd/root.go index fd510bf5..79bc4096 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -17,7 +17,6 @@ import ( "demodesk/neko" "demodesk/neko/internal/config" - "demodesk/neko/modules" ) func Execute() error { @@ -28,19 +27,11 @@ var root = &cobra.Command{ Use: "neko", Short: "neko streaming server", Long: `neko streaming server`, - Version: neko.Service.Version.String(), + Version: neko.Version.String(), } func init() { - configs := append([]config.Config{ - neko.Service.Configs.Root, - neko.Service.Configs.Desktop, - neko.Service.Configs.Capture, - neko.Service.Configs.WebRTC, - neko.Service.Configs.Member, - neko.Service.Configs.Session, - neko.Service.Configs.Server, - }, modules.Configs()...) + rootConfig := config.Root{} cobra.OnInitialize(func() { ////// @@ -138,16 +129,12 @@ func init() { } } - for _, cfg := range configs { - cfg.Set() - } + rootConfig.Set() }) - for _, cfg := range configs { - if err := cfg.Init(root); err != nil { - log.Panic().Err(err).Msg("unable to initialize configuration") - } + if err := rootConfig.Init(root); err != nil { + log.Panic().Err(err).Msg("unable to run root command") } - root.SetVersionTemplate(neko.Service.Version.Details()) + root.SetVersionTemplate(neko.Version.Details()) } diff --git a/cmd/serve.go b/cmd/serve.go index 22e700a0..fe645719 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "demodesk/neko" "demodesk/neko/internal/api" "demodesk/neko/internal/capture" + "demodesk/neko/internal/config" "demodesk/neko/internal/desktop" "demodesk/neko/internal/http" "demodesk/neko/internal/member" @@ -21,139 +21,190 @@ import ( ) func init() { - service := Serve{ - Version: neko.Service.Version, - Configs: neko.Service.Configs, - } + service := serve{} command := &cobra.Command{ Use: "serve", Short: "serve neko streaming server", Long: `serve neko streaming server`, - Run: service.ServeCommand, + Run: service.Command, } cobra.OnInitialize(service.Preflight) + if err := service.Init(command); err != nil { + log.Panic().Err(err).Msg("unable to initialize configuration") + } + root.AddCommand(command) } -type Serve struct { - Version *neko.Version - Configs *neko.Configs +type serve struct { + logger zerolog.Logger - logger zerolog.Logger - desktopManager *desktop.DesktopManagerCtx - captureManager *capture.CaptureManagerCtx - webRTCManager *webrtc.WebRTCManagerCtx - memberManager *member.MemberManagerCtx - sessionManager *session.SessionManagerCtx - webSocketManager *websocket.WebSocketManagerCtx - apiManager *api.ApiManagerCtx - httpManager *http.HttpManagerCtx -} - -func (neko *Serve) Preflight() { - neko.logger = log.With().Str("service", "neko").Logger() -} - -func (neko *Serve) Start() { - neko.sessionManager = session.New( - neko.Configs.Session, - ) - - neko.memberManager = member.New( - neko.sessionManager, - neko.Configs.Member, - ) - - if err := neko.memberManager.Connect(); err != nil { - neko.logger.Panic().Err(err).Msg("unable to connect to member manager") + configs struct { + Root config.Root + Desktop config.Desktop + Capture config.Capture + WebRTC config.WebRTC + Member config.Member + Session config.Session + Server config.Server } - neko.desktopManager = desktop.New( - neko.Configs.Desktop, - ) - neko.desktopManager.Start() + managers struct { + desktop *desktop.DesktopManagerCtx + capture *capture.CaptureManagerCtx + webRTC *webrtc.WebRTCManagerCtx + member *member.MemberManagerCtx + session *session.SessionManagerCtx + webSocket *websocket.WebSocketManagerCtx + api *api.ApiManagerCtx + http *http.HttpManagerCtx + } +} - neko.captureManager = capture.New( - neko.desktopManager, - neko.Configs.Capture, - ) - neko.captureManager.Start() +func (c *serve) Init(cmd *cobra.Command) error { + if err := c.configs.Desktop.Init(cmd); err != nil { + return err + } + if err := c.configs.Capture.Init(cmd); err != nil { + return err + } + if err := c.configs.WebRTC.Init(cmd); err != nil { + return err + } + if err := c.configs.Member.Init(cmd); err != nil { + return err + } + if err := c.configs.Session.Init(cmd); err != nil { + return err + } + if err := c.configs.Server.Init(cmd); err != nil { + return err + } - neko.webRTCManager = webrtc.New( - neko.desktopManager, - neko.captureManager, - neko.Configs.WebRTC, - ) - neko.webRTCManager.Start() + for _, cfg := range modules.Configs() { + if err := cfg.Init(root); err != nil { + log.Panic().Err(err).Msg("unable to initialize configuration") + } + } - neko.webSocketManager = websocket.New( - neko.sessionManager, - neko.desktopManager, - neko.captureManager, - neko.webRTCManager, - ) - neko.webSocketManager.Start() + return nil +} - neko.apiManager = api.New( - neko.sessionManager, - neko.memberManager, - neko.desktopManager, - neko.captureManager, - neko.Configs.Server, +func (c *serve) Preflight() { + c.logger = log.With().Str("service", "neko").Logger() + + c.configs.Desktop.Set() + c.configs.Capture.Set() + c.configs.WebRTC.Set() + c.configs.Member.Set() + c.configs.Session.Set() + c.configs.Server.Set() + + for _, cfg := range modules.Configs() { + cfg.Set() + } +} + +func (c *serve) Start() { + c.managers.session = session.New( + &c.configs.Session, + ) + + c.managers.member = member.New( + c.managers.session, + &c.configs.Member, + ) + + if err := c.managers.member.Connect(); err != nil { + c.logger.Panic().Err(err).Msg("unable to connect to member manager") + } + + c.managers.desktop = desktop.New( + &c.configs.Desktop, + ) + c.managers.desktop.Start() + + c.managers.capture = capture.New( + c.managers.desktop, + &c.configs.Capture, + ) + c.managers.capture.Start() + + c.managers.webRTC = webrtc.New( + c.managers.desktop, + c.managers.capture, + &c.configs.WebRTC, + ) + c.managers.webRTC.Start() + + c.managers.webSocket = websocket.New( + c.managers.session, + c.managers.desktop, + c.managers.capture, + c.managers.webRTC, + ) + c.managers.webSocket.Start() + + c.managers.api = api.New( + c.managers.session, + c.managers.member, + c.managers.desktop, + c.managers.capture, + &c.configs.Server, ) modules.Start( - neko.sessionManager, - neko.webSocketManager, - neko.apiManager, + c.managers.session, + c.managers.webSocket, + c.managers.api, ) - neko.httpManager = http.New( - neko.webSocketManager, - neko.apiManager, - neko.Configs.Server, + c.managers.http = http.New( + c.managers.webSocket, + c.managers.api, + &c.configs.Server, ) - neko.httpManager.Start() + c.managers.http.Start() } -func (neko *Serve) Shutdown() { +func (c *serve) Shutdown() { var err error - err = neko.memberManager.Disconnect() - neko.logger.Err(err).Msg("member manager disconnect") + err = c.managers.member.Disconnect() + c.logger.Err(err).Msg("member manager disconnect") - err = neko.desktopManager.Shutdown() - neko.logger.Err(err).Msg("desktop manager shutdown") + err = c.managers.desktop.Shutdown() + c.logger.Err(err).Msg("desktop manager shutdown") - err = neko.captureManager.Shutdown() - neko.logger.Err(err).Msg("capture manager shutdown") + err = c.managers.capture.Shutdown() + c.logger.Err(err).Msg("capture manager shutdown") - err = neko.webRTCManager.Shutdown() - neko.logger.Err(err).Msg("webrtc manager shutdown") + err = c.managers.webRTC.Shutdown() + c.logger.Err(err).Msg("webrtc manager shutdown") - err = neko.webSocketManager.Shutdown() - neko.logger.Err(err).Msg("websocket manager shutdown") + err = c.managers.webSocket.Shutdown() + c.logger.Err(err).Msg("websocket manager shutdown") err = modules.Shutdown() - neko.logger.Err(err).Msg("modules shutdown") + c.logger.Err(err).Msg("modules shutdown") - err = neko.httpManager.Shutdown() - neko.logger.Err(err).Msg("http manager shutdown") + err = c.managers.http.Shutdown() + c.logger.Err(err).Msg("http manager shutdown") } -func (neko *Serve) ServeCommand(cmd *cobra.Command, args []string) { - neko.logger.Info().Msg("starting neko server") - neko.Start() - neko.logger.Info().Msg("neko ready") +func (c *serve) Command(cmd *cobra.Command, args []string) { + c.logger.Info().Msg("starting neko server") + c.Start() + c.logger.Info().Msg("neko ready") quit := make(chan os.Signal, 1) signal.Notify(quit, os.Interrupt) sig := <-quit - neko.logger.Warn().Msgf("received %s, attempting graceful shutdown", sig) - neko.Shutdown() - neko.logger.Info().Msg("shutdown complete") + c.logger.Warn().Msgf("received %s, attempting graceful shutdown", sig) + c.Shutdown() + c.logger.Info().Msg("shutdown complete") } diff --git a/neko.go b/neko.go index 179048a5..1770ccef 100644 --- a/neko.go +++ b/neko.go @@ -3,8 +3,6 @@ package neko import ( "fmt" "runtime" - - "demodesk/neko/internal/config" ) const Header = `&34 @@ -32,34 +30,19 @@ var ( patch = "dev" ) -var Service *Neko - -func init() { - Service = &Neko{ - Version: &Version{ - Major: major, - Minor: minor, - Patch: patch, - GitCommit: gitCommit, - GitBranch: gitBranch, - BuildDate: buildDate, - GoVersion: runtime.Version(), - Compiler: runtime.Compiler, - Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), - }, - Configs: &Configs{ - Root: &config.Root{}, - Desktop: &config.Desktop{}, - Capture: &config.Capture{}, - WebRTC: &config.WebRTC{}, - Member: &config.Member{}, - Session: &config.Session{}, - Server: &config.Server{}, - }, - } +var Version = &version{ + Major: major, + Minor: minor, + Patch: patch, + GitCommit: gitCommit, + GitBranch: gitBranch, + BuildDate: buildDate, + GoVersion: runtime.Version(), + Compiler: runtime.Compiler, + Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), } -type Version struct { +type version struct { Major string Minor string Patch string @@ -71,11 +54,11 @@ type Version struct { Platform string } -func (i *Version) String() string { +func (i *version) String() string { return fmt.Sprintf("%s.%s.%s %s", i.Major, i.Minor, i.Patch, i.GitCommit) } -func (i *Version) Details() string { +func (i *version) Details() string { return fmt.Sprintf( "%s\n%s\n%s\n%s\n%s\n%s\n%s\n", fmt.Sprintf("Version %s.%s.%s", i.Major, i.Minor, i.Patch), @@ -87,18 +70,3 @@ func (i *Version) Details() string { fmt.Sprintf("Platform %s", i.Platform), ) } - -type Configs struct { - Root *config.Root - Desktop *config.Desktop - Capture *config.Capture - WebRTC *config.WebRTC - Member *config.Member - Session *config.Session - Server *config.Server -} - -type Neko struct { - Version *Version - Configs *Configs -} From 646b6ecaff54555ec83f7937d0699085b1533d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 16 Jan 2022 21:03:25 +0100 Subject: [PATCH 647/876] cookie expiration as time duration. --- internal/config/session.go | 4 ++-- internal/session/auth.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/config/session.go b/internal/config/session.go index 0b3454fa..990ca129 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -15,7 +15,7 @@ type Session struct { CookieEnabled bool CookieName string - CookieExpiration time.Time + CookieExpiration time.Duration CookieSecure bool } @@ -72,6 +72,6 @@ func (s *Session) Set() { s.CookieEnabled = viper.GetBool("session.cookie.enabled") s.CookieName = viper.GetString("session.cookie.name") - s.CookieExpiration = time.Now().Add(time.Duration(viper.GetInt("session.cookie.expiration")) * time.Hour) + s.CookieExpiration = time.Duration(viper.GetInt("session.cookie.expiration")) * time.Hour s.CookieSecure = viper.GetBool("session.cookie.secure") } diff --git a/internal/session/auth.go b/internal/session/auth.go index 06c40d6d..cc3be871 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -18,7 +18,7 @@ func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token st http.SetCookie(w, &http.Cookie{ Name: manager.config.CookieName, Value: token, - Expires: manager.config.CookieExpiration, + Expires: time.Now().Add(manager.config.CookieExpiration), Secure: manager.config.CookieSecure, SameSite: sameSite, HttpOnly: true, From 499256492a0b763757734eba2e267d6bdddcb7d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 16 Jan 2022 21:03:37 +0100 Subject: [PATCH 648/876] config flag with -c. --- internal/config/root.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/config/root.go b/internal/config/root.go index 0223d7b2..b08534af 100644 --- a/internal/config/root.go +++ b/internal/config/root.go @@ -6,9 +6,9 @@ import ( ) type Root struct { - Debug bool - Logs bool - CfgFile string + Debug bool + Logs bool + Config string } func (Root) Init(cmd *cobra.Command) error { @@ -22,7 +22,7 @@ func (Root) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().String("config", "", "configuration file path") + cmd.PersistentFlags().StringP("config", "c", "", "configuration file path") if err := viper.BindPFlag("config", cmd.PersistentFlags().Lookup("config")); err != nil { return err } @@ -33,5 +33,5 @@ func (Root) Init(cmd *cobra.Command) error { func (s *Root) Set() { s.Logs = viper.GetBool("logs") s.Debug = viper.GetBool("debug") - s.CfgFile = viper.GetString("config") + s.Config = viper.GetString("config") } From 9475e917a33a9b02c72562c882546db740c0f01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 17 Jan 2022 19:39:15 +0100 Subject: [PATCH 649/876] upgrade deps. --- go.mod | 28 ++++----- go.sum | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 192 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index cc696c20..97f48083 100644 --- a/go.mod +++ b/go.mod @@ -8,13 +8,13 @@ require ( github.com/go-chi/cors v1.2.0 github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 - github.com/pion/interceptor v0.1.2 + github.com/pion/interceptor v0.1.5 github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.9 - github.com/pion/webrtc/v3 v3.1.11 - github.com/rs/zerolog v1.26.0 - github.com/spf13/cobra v1.2.1 - github.com/spf13/viper v1.9.0 + github.com/pion/webrtc/v3 v3.1.15 + github.com/rs/zerolog v1.26.1 + github.com/spf13/cobra v1.3.0 + github.com/spf13/viper v1.10.1 ) require ( @@ -26,26 +26,26 @@ require ( github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pion/datachannel v1.5.2 // indirect - github.com/pion/dtls/v2 v2.0.10 // indirect - github.com/pion/ice/v2 v2.1.14 // indirect + github.com/pion/dtls/v2 v2.1.0 // indirect + github.com/pion/ice/v2 v2.1.18 // indirect github.com/pion/mdns v0.0.5 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtp v1.7.4 // indirect - github.com/pion/sctp v1.8.0 // indirect + github.com/pion/sctp v1.8.2 // indirect github.com/pion/sdp/v3 v3.0.4 // indirect github.com/pion/srtp/v2 v2.0.5 // indirect github.com/pion/stun v0.3.5 // indirect - github.com/pion/transport v0.12.3 // indirect - github.com/pion/turn/v2 v2.0.5 // indirect + github.com/pion/transport v0.13.0 // indirect + github.com/pion/turn/v2 v2.0.6 // indirect github.com/pion/udp v0.1.1 // indirect - github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/afero v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.2.0 // indirect - golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect - golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c // indirect - golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect + golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect + golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect + golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gopkg.in/ini.v1 v1.66.2 // indirect diff --git a/go.sum b/go.sum index e77033fe..69638b57 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -15,6 +16,7 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= @@ -23,6 +25,10 @@ cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSU cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -33,6 +39,7 @@ cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -42,34 +49,56 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PaesslerAG/gval v1.1.2 h1:EROKxV4/fAKWb0Qoj7NOxmHZA7gcpjOV9XgiRZMRCUU= github.com/PaesslerAG/gval v1.1.2/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -80,9 +109,13 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= @@ -95,13 +128,20 @@ github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vz github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -157,6 +197,7 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -169,21 +210,29 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= +github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= @@ -193,47 +242,64 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -248,17 +314,24 @@ github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= @@ -267,10 +340,18 @@ github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5y github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho= github.com/pion/dtls/v2 v2.0.10 h1:wgys7gPR1NMbWjmjJ3CW7lkUGaun8djgH8nahpNLnxI= github.com/pion/dtls/v2 v2.0.10/go.mod h1:00OxfeCRWHShcqT9jx8pKKmBWuTt0NCZoVPCaC4VKvU= +github.com/pion/dtls/v2 v2.0.13/go.mod h1:OaE7eTM+ppaUhJ99OTO4aHl9uY6vPrT1gPY27uNTxRY= +github.com/pion/dtls/v2 v2.1.0 h1:g6gtKVNLp6URDkv9OijFJl16kqGHzVzZG+Fa4A38GTY= +github.com/pion/dtls/v2 v2.1.0/go.mod h1:qG3gA7ZPZemBqpEFqRKyURYdKEwFZQCGb7gv9T3ON3Y= github.com/pion/ice/v2 v2.1.14 h1:nD9GZs3MiR1/dPa5EiMRMe8hLBG3/qqCdx/hTS2g8VE= github.com/pion/ice/v2 v2.1.14/go.mod h1:ovgYHUmwYLlRvcCLI67PnQ5YGe+upXZbGgllBDG/ktU= +github.com/pion/ice/v2 v2.1.18 h1:mDzd+iPKJmU30p4Kb+RPjK9olORLqJmQdiTUnVba50g= +github.com/pion/ice/v2 v2.1.18/go.mod h1:9jDr0iIUg8P6+0Jq8QJ/eFSkX3JnsPd293TjCdkfpTs= github.com/pion/interceptor v0.1.2 h1:1IfrJ+AQ0HhwxNl4hqh9hMvl1hBKiNhAAr7DrUHsC6s= github.com/pion/interceptor v0.1.2/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= +github.com/pion/interceptor v0.1.4/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= +github.com/pion/interceptor v0.1.5 h1:DnuwpHQqfmeKMAkFdMBd57J8oYvxm5tnojEfGTLJ3sg= +github.com/pion/interceptor v0.1.5/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= @@ -285,6 +366,8 @@ github.com/pion/rtp v1.7.4 h1:4dMbjb1SuynU5OpA3kz1zHK+u+eOCQjW3MAeVHf1ODA= github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.8.0 h1:6erMF2qmQwXr+0iB1lm0AUSmDr9LdmpaBzgSVAEgehw= github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= +github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA= +github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8= github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ= @@ -295,41 +378,71 @@ github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+D github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/transport v0.12.3 h1:vdBfvfU/0Wq8kd2yhUMSDB/x+O4Z9MYVl2fJ5BT4JZw= github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= +github.com/pion/transport v0.13.0 h1:KWTA5ZrQogizzYwPEciGtHPLwpAjE91FgXnyu+Hv2uY= +github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g= github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= +github.com/pion/turn/v2 v2.0.6 h1:AsXjSPR6Im15DMTB39NlfdTY9BQfieANPBjdg/aVNwY= +github.com/pion/turn/v2 v2.0.6/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= github.com/pion/webrtc/v3 v3.1.11 h1:8Q5BEsxvlDn3botM8U8n/Haln745FBa5TWgm8v2c2FA= github.com/pion/webrtc/v3 v3.1.11/go.mod h1:h9pbP+CADYb/99s5rfjflEcBLgdVKm55Rm7heQ/gIvY= +github.com/pion/webrtc/v3 v3.1.15 h1:JUNR95xdhcRliAaUQjnuttFPdxGxW/ixcwnHRjQFWOU= +github.com/pion/webrtc/v3 v3.1.15/go.mod h1:2brQHPJl93QVgbcVElY5syrrEzx5PXCxjrQ5g7Hwky8= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.26.0 h1:ORM4ibhEZeTeQlCojCK2kPz1ogAY4bGs4tD+SaAdGaE= github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo= +github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= +github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE= +github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60= +github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= +github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -337,7 +450,11 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/spf13/viper v1.9.0 h1:yR6EXjTp0y0cLN8OZg1CRZmOBdI88UcGkhgyJhu6nZk= github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= +github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= +github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= +github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -347,6 +464,7 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -354,8 +472,11 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -367,6 +488,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -376,10 +498,17 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e h1:MUP6MR3rJ7Gk9LEia0LP2ytiH6MuCfs7qYz+47jGdD8= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI= +golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -415,10 +544,12 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -427,6 +558,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -452,18 +584,25 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c h1:WtYZ93XtWSO5KlOMgPZu7hXY9WhMZpprvlm5VwvAl8c= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d h1:1n1fc535VhN8SYtD4cDUyNlfpAF2ROMM9+11equK3hs= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -480,6 +619,8 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -493,12 +634,15 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -537,12 +681,15 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -551,10 +698,17 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -620,6 +774,7 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= @@ -659,7 +814,12 @@ google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtuk google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -702,7 +862,9 @@ google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -719,6 +881,17 @@ google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKr google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -744,6 +917,8 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -758,6 +933,7 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= @@ -769,9 +945,11 @@ gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= From c129c99a363d61a046b50ed130183ea65811f141 Mon Sep 17 00:00:00 2001 From: Maksim Dorokhin Date: Fri, 21 Jan 2022 09:43:38 +0100 Subject: [PATCH 650/876] add zip and curl to container. --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 26390e79..295208d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,6 +55,9 @@ RUN set -eux; \ pulseaudio dbus-x11 xserver-xorg-video-dummy \ libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ # + # needed for profile upload preStop hook + zip curl \ + # # file chooser handler, clipboard xdotool xclip \ # From 5c05d1009b1df151af973a4547a1ff58f511d81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 30 Jan 2022 01:20:26 +0100 Subject: [PATCH 651/876] add keysymdef generator. --- internal/desktop/xorg/keysymdef.go | 2498 ++++++++++++++++++++++++++++ internal/desktop/xorg/keysymdef.sh | 6 + internal/desktop/xorg/xorg.go | 2 + 3 files changed, 2506 insertions(+) create mode 100644 internal/desktop/xorg/keysymdef.go create mode 100755 internal/desktop/xorg/keysymdef.sh diff --git a/internal/desktop/xorg/keysymdef.go b/internal/desktop/xorg/keysymdef.go new file mode 100644 index 00000000..76358769 --- /dev/null +++ b/internal/desktop/xorg/keysymdef.go @@ -0,0 +1,2498 @@ +package xorg +/*********************************************************** +Copyright 1987, 1994, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from The Open Group. + + +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + +******************************************************************/ + +/* + * The "X11 Window System Protocol" standard defines in Appendix A the + * keysym codes. These 29-bit integer values identify characters or + * functions associated with each key (e.g., via the visible + * engraving) of a keyboard layout. This file assigns mnemonic macro + * names for these keysyms. + * + * This file is also compiled (by src/util/makekeys.c in libX11) into + * hash tables that can be accessed with X11 library functions such as + * XStringToKeysym() and XKeysymToString(). + * + * Where a keysym corresponds one-to-one to an ISO 10646 / Unicode + * character, this is noted in a comment that provides both the U+xxxx + * Unicode position, as well as the official Unicode name of the + * character. + * + * Where the correspondence is either not one-to-one or semantically + * unclear, the Unicode position and name are enclosed in + * parentheses. Such legacy keysyms should be considered deprecated + * and are not recommended for use in future keyboard mappings. + * + * For any future extension of the keysyms with characters already + * found in ISO 10646 / Unicode, the following algorithm shall be + * used. The new keysym code position will simply be the character's + * Unicode number plus 0x01000000. The keysym values in the range + * 0x01000100 to 0x0110ffff are reserved to represent Unicode + * characters in the range U+0100 to U+10FFFF. + * + * While most newer Unicode-based X11 clients do already accept + * Unicode-mapped keysyms in the range 0x01000100 to 0x0110ffff, it + * will remain necessary for clients -- in the interest of + * compatibility with existing servers -- to also understand the + * existing legacy keysym values in the range 0x0100 to 0x20ff. + * + * Where several mnemonic names are defined for the same keysym in this + * file, all but the first one listed should be considered deprecated. + * + * Mnemonic names for keysyms are defined in this file with lines + * that match one of these Perl regular expressions: + * + * /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\* U+([0-9A-F]{4,6}) (.*) \*\/\s*$/ + * /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\*\(U+([0-9A-F]{4,6}) (.*)\)\*\/\s*$/ + * /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*(\/\*\s*(.*)\s*\*\/)?\s*$/ + * + * Before adding new keysyms, please do consider the following: In + * addition to the keysym names defined in this file, the + * XStringToKeysym() and XKeysymToString() functions will also handle + * any keysym string of the form "U0020" to "U007E" and "U00A0" to + * "U10FFFF" for all possible Unicode characters. In other words, + * every possible Unicode character has already a keysym string + * defined algorithmically, even if it is not listed here. Therefore, + * defining an additional keysym macro is only necessary where a + * non-hexadecimal mnemonic name is needed, or where the new keysym + * does not represent any existing Unicode character. + * + * When adding new keysyms to this file, do not forget to also update the + * following as needed: + * + * - the mappings in src/KeyBind.c in the repo + * git://anongit.freedesktop.org/xorg/lib/libX11.git + * + * - the protocol specification in specs/keysyms.xml + * in the repo git://anongit.freedesktop.org/xorg/proto/x11proto.git + * + */ + +const XK_VoidSymbol = 0xffffff /* Void symbol */ + +//ifdef XK_MISCELLANY +/* + * TTY function keys, cleverly chosen to map to ASCII, for convenience of + * programming, but could have been arbitrary (at the cost of lookup + * tables in client code). + */ + +const XK_BackSpace = 0xff08 /* Back space, back char */ +const XK_Tab = 0xff09 +const XK_Linefeed = 0xff0a /* Linefeed, LF */ +const XK_Clear = 0xff0b +const XK_Return = 0xff0d /* Return, enter */ +const XK_Pause = 0xff13 /* Pause, hold */ +const XK_Scroll_Lock = 0xff14 +const XK_Sys_Req = 0xff15 +const XK_Escape = 0xff1b +const XK_Delete = 0xffff /* Delete, rubout */ + + + +/* International & multi-key character composition */ + +const XK_Multi_key = 0xff20 /* Multi-key character compose */ +const XK_Codeinput = 0xff37 +const XK_SingleCandidate = 0xff3c +const XK_MultipleCandidate = 0xff3d +const XK_PreviousCandidate = 0xff3e + +/* Japanese keyboard support */ + +const XK_Kanji = 0xff21 /* Kanji, Kanji convert */ +const XK_Muhenkan = 0xff22 /* Cancel Conversion */ +const XK_Henkan_Mode = 0xff23 /* Start/Stop Conversion */ +const XK_Henkan = 0xff23 /* Alias for Henkan_Mode */ +const XK_Romaji = 0xff24 /* to Romaji */ +const XK_Hiragana = 0xff25 /* to Hiragana */ +const XK_Katakana = 0xff26 /* to Katakana */ +const XK_Hiragana_Katakana = 0xff27 /* Hiragana/Katakana toggle */ +const XK_Zenkaku = 0xff28 /* to Zenkaku */ +const XK_Hankaku = 0xff29 /* to Hankaku */ +const XK_Zenkaku_Hankaku = 0xff2a /* Zenkaku/Hankaku toggle */ +const XK_Touroku = 0xff2b /* Add to Dictionary */ +const XK_Massyo = 0xff2c /* Delete from Dictionary */ +const XK_Kana_Lock = 0xff2d /* Kana Lock */ +const XK_Kana_Shift = 0xff2e /* Kana Shift */ +const XK_Eisu_Shift = 0xff2f /* Alphanumeric Shift */ +const XK_Eisu_toggle = 0xff30 /* Alphanumeric toggle */ +const XK_Kanji_Bangou = 0xff37 /* Codeinput */ +const XK_Zen_Koho = 0xff3d /* Multiple/All Candidate(s) */ +const XK_Mae_Koho = 0xff3e /* Previous Candidate */ + +/* 0xff31 thru 0xff3f are under XK_KOREAN */ + +/* Cursor control & motion */ + +const XK_Home = 0xff50 +const XK_Left = 0xff51 /* Move left, left arrow */ +const XK_Up = 0xff52 /* Move up, up arrow */ +const XK_Right = 0xff53 /* Move right, right arrow */ +const XK_Down = 0xff54 /* Move down, down arrow */ +const XK_Prior = 0xff55 /* Prior, previous */ +const XK_Page_Up = 0xff55 +const XK_Next = 0xff56 /* Next */ +const XK_Page_Down = 0xff56 +const XK_End = 0xff57 /* EOL */ +const XK_Begin = 0xff58 /* BOL */ + + +/* Misc functions */ + +const XK_Select = 0xff60 /* Select, mark */ +const XK_Print = 0xff61 +const XK_Execute = 0xff62 /* Execute, run, do */ +const XK_Insert = 0xff63 /* Insert, insert here */ +const XK_Undo = 0xff65 +const XK_Redo = 0xff66 /* Redo, again */ +const XK_Menu = 0xff67 +const XK_Find = 0xff68 /* Find, search */ +const XK_Cancel = 0xff69 /* Cancel, stop, abort, exit */ +const XK_Help = 0xff6a /* Help */ +const XK_Break = 0xff6b +const XK_Mode_switch = 0xff7e /* Character set switch */ +const XK_script_switch = 0xff7e /* Alias for mode_switch */ +const XK_Num_Lock = 0xff7f + +/* Keypad functions, keypad numbers cleverly chosen to map to ASCII */ + +const XK_KP_Space = 0xff80 /* Space */ +const XK_KP_Tab = 0xff89 +const XK_KP_Enter = 0xff8d /* Enter */ +const XK_KP_F1 = 0xff91 /* PF1, KP_A, ... */ +const XK_KP_F2 = 0xff92 +const XK_KP_F3 = 0xff93 +const XK_KP_F4 = 0xff94 +const XK_KP_Home = 0xff95 +const XK_KP_Left = 0xff96 +const XK_KP_Up = 0xff97 +const XK_KP_Right = 0xff98 +const XK_KP_Down = 0xff99 +const XK_KP_Prior = 0xff9a +const XK_KP_Page_Up = 0xff9a +const XK_KP_Next = 0xff9b +const XK_KP_Page_Down = 0xff9b +const XK_KP_End = 0xff9c +const XK_KP_Begin = 0xff9d +const XK_KP_Insert = 0xff9e +const XK_KP_Delete = 0xff9f +const XK_KP_Equal = 0xffbd /* Equals */ +const XK_KP_Multiply = 0xffaa +const XK_KP_Add = 0xffab +const XK_KP_Separator = 0xffac /* Separator, often comma */ +const XK_KP_Subtract = 0xffad +const XK_KP_Decimal = 0xffae +const XK_KP_Divide = 0xffaf + +const XK_KP_0 = 0xffb0 +const XK_KP_1 = 0xffb1 +const XK_KP_2 = 0xffb2 +const XK_KP_3 = 0xffb3 +const XK_KP_4 = 0xffb4 +const XK_KP_5 = 0xffb5 +const XK_KP_6 = 0xffb6 +const XK_KP_7 = 0xffb7 +const XK_KP_8 = 0xffb8 +const XK_KP_9 = 0xffb9 + + + +/* + * Auxiliary functions; note the duplicate definitions for left and right + * function keys; Sun keyboards and a few other manufacturers have such + * function key groups on the left and/or right sides of the keyboard. + * We've not found a keyboard with more than 35 function keys total. + */ + +const XK_F1 = 0xffbe +const XK_F2 = 0xffbf +const XK_F3 = 0xffc0 +const XK_F4 = 0xffc1 +const XK_F5 = 0xffc2 +const XK_F6 = 0xffc3 +const XK_F7 = 0xffc4 +const XK_F8 = 0xffc5 +const XK_F9 = 0xffc6 +const XK_F10 = 0xffc7 +const XK_F11 = 0xffc8 +const XK_L1 = 0xffc8 +const XK_F12 = 0xffc9 +const XK_L2 = 0xffc9 +const XK_F13 = 0xffca +const XK_L3 = 0xffca +const XK_F14 = 0xffcb +const XK_L4 = 0xffcb +const XK_F15 = 0xffcc +const XK_L5 = 0xffcc +const XK_F16 = 0xffcd +const XK_L6 = 0xffcd +const XK_F17 = 0xffce +const XK_L7 = 0xffce +const XK_F18 = 0xffcf +const XK_L8 = 0xffcf +const XK_F19 = 0xffd0 +const XK_L9 = 0xffd0 +const XK_F20 = 0xffd1 +const XK_L10 = 0xffd1 +const XK_F21 = 0xffd2 +const XK_R1 = 0xffd2 +const XK_F22 = 0xffd3 +const XK_R2 = 0xffd3 +const XK_F23 = 0xffd4 +const XK_R3 = 0xffd4 +const XK_F24 = 0xffd5 +const XK_R4 = 0xffd5 +const XK_F25 = 0xffd6 +const XK_R5 = 0xffd6 +const XK_F26 = 0xffd7 +const XK_R6 = 0xffd7 +const XK_F27 = 0xffd8 +const XK_R7 = 0xffd8 +const XK_F28 = 0xffd9 +const XK_R8 = 0xffd9 +const XK_F29 = 0xffda +const XK_R9 = 0xffda +const XK_F30 = 0xffdb +const XK_R10 = 0xffdb +const XK_F31 = 0xffdc +const XK_R11 = 0xffdc +const XK_F32 = 0xffdd +const XK_R12 = 0xffdd +const XK_F33 = 0xffde +const XK_R13 = 0xffde +const XK_F34 = 0xffdf +const XK_R14 = 0xffdf +const XK_F35 = 0xffe0 +const XK_R15 = 0xffe0 + +/* Modifiers */ + +const XK_Shift_L = 0xffe1 /* Left shift */ +const XK_Shift_R = 0xffe2 /* Right shift */ +const XK_Control_L = 0xffe3 /* Left control */ +const XK_Control_R = 0xffe4 /* Right control */ +const XK_Caps_Lock = 0xffe5 /* Caps lock */ +const XK_Shift_Lock = 0xffe6 /* Shift lock */ + +const XK_Meta_L = 0xffe7 /* Left meta */ +const XK_Meta_R = 0xffe8 /* Right meta */ +const XK_Alt_L = 0xffe9 /* Left alt */ +const XK_Alt_R = 0xffea /* Right alt */ +const XK_Super_L = 0xffeb /* Left super */ +const XK_Super_R = 0xffec /* Right super */ +const XK_Hyper_L = 0xffed /* Left hyper */ +const XK_Hyper_R = 0xffee /* Right hyper */ +//endif /* XK_MISCELLANY */ + +/* + * Keyboard (XKB) Extension function and modifier keys + * (from Appendix C of "The X Keyboard Extension: Protocol Specification") + * Byte 3 = 0xfe + */ + +//ifdef XK_XKB_KEYS +const XK_ISO_Lock = 0xfe01 +const XK_ISO_Level2_Latch = 0xfe02 +const XK_ISO_Level3_Shift = 0xfe03 +const XK_ISO_Level3_Latch = 0xfe04 +const XK_ISO_Level3_Lock = 0xfe05 +const XK_ISO_Level5_Shift = 0xfe11 +const XK_ISO_Level5_Latch = 0xfe12 +const XK_ISO_Level5_Lock = 0xfe13 +const XK_ISO_Group_Shift = 0xff7e /* Alias for mode_switch */ +const XK_ISO_Group_Latch = 0xfe06 +const XK_ISO_Group_Lock = 0xfe07 +const XK_ISO_Next_Group = 0xfe08 +const XK_ISO_Next_Group_Lock = 0xfe09 +const XK_ISO_Prev_Group = 0xfe0a +const XK_ISO_Prev_Group_Lock = 0xfe0b +const XK_ISO_First_Group = 0xfe0c +const XK_ISO_First_Group_Lock = 0xfe0d +const XK_ISO_Last_Group = 0xfe0e +const XK_ISO_Last_Group_Lock = 0xfe0f + +const XK_ISO_Left_Tab = 0xfe20 +const XK_ISO_Move_Line_Up = 0xfe21 +const XK_ISO_Move_Line_Down = 0xfe22 +const XK_ISO_Partial_Line_Up = 0xfe23 +const XK_ISO_Partial_Line_Down = 0xfe24 +const XK_ISO_Partial_Space_Left = 0xfe25 +const XK_ISO_Partial_Space_Right = 0xfe26 +const XK_ISO_Set_Margin_Left = 0xfe27 +const XK_ISO_Set_Margin_Right = 0xfe28 +const XK_ISO_Release_Margin_Left = 0xfe29 +const XK_ISO_Release_Margin_Right = 0xfe2a +const XK_ISO_Release_Both_Margins = 0xfe2b +const XK_ISO_Fast_Cursor_Left = 0xfe2c +const XK_ISO_Fast_Cursor_Right = 0xfe2d +const XK_ISO_Fast_Cursor_Up = 0xfe2e +const XK_ISO_Fast_Cursor_Down = 0xfe2f +const XK_ISO_Continuous_Underline = 0xfe30 +const XK_ISO_Discontinuous_Underline = 0xfe31 +const XK_ISO_Emphasize = 0xfe32 +const XK_ISO_Center_Object = 0xfe33 +const XK_ISO_Enter = 0xfe34 + +const XK_dead_grave = 0xfe50 +const XK_dead_acute = 0xfe51 +const XK_dead_circumflex = 0xfe52 +const XK_dead_tilde = 0xfe53 +const XK_dead_perispomeni = 0xfe53 /* alias for dead_tilde */ +const XK_dead_macron = 0xfe54 +const XK_dead_breve = 0xfe55 +const XK_dead_abovedot = 0xfe56 +const XK_dead_diaeresis = 0xfe57 +const XK_dead_abovering = 0xfe58 +const XK_dead_doubleacute = 0xfe59 +const XK_dead_caron = 0xfe5a +const XK_dead_cedilla = 0xfe5b +const XK_dead_ogonek = 0xfe5c +const XK_dead_iota = 0xfe5d +const XK_dead_voiced_sound = 0xfe5e +const XK_dead_semivoiced_sound = 0xfe5f +const XK_dead_belowdot = 0xfe60 +const XK_dead_hook = 0xfe61 +const XK_dead_horn = 0xfe62 +const XK_dead_stroke = 0xfe63 +const XK_dead_abovecomma = 0xfe64 +const XK_dead_psili = 0xfe64 /* alias for dead_abovecomma */ +const XK_dead_abovereversedcomma = 0xfe65 +const XK_dead_dasia = 0xfe65 /* alias for dead_abovereversedcomma */ +const XK_dead_doublegrave = 0xfe66 +const XK_dead_belowring = 0xfe67 +const XK_dead_belowmacron = 0xfe68 +const XK_dead_belowcircumflex = 0xfe69 +const XK_dead_belowtilde = 0xfe6a +const XK_dead_belowbreve = 0xfe6b +const XK_dead_belowdiaeresis = 0xfe6c +const XK_dead_invertedbreve = 0xfe6d +const XK_dead_belowcomma = 0xfe6e +const XK_dead_currency = 0xfe6f + +/* extra dead elements for German T3 layout */ +const XK_dead_lowline = 0xfe90 +const XK_dead_aboveverticalline = 0xfe91 +const XK_dead_belowverticalline = 0xfe92 +const XK_dead_longsolidusoverlay = 0xfe93 + +/* dead vowels for universal syllable entry */ +const XK_dead_a = 0xfe80 +const XK_dead_A = 0xfe81 +const XK_dead_e = 0xfe82 +const XK_dead_E = 0xfe83 +const XK_dead_i = 0xfe84 +const XK_dead_I = 0xfe85 +const XK_dead_o = 0xfe86 +const XK_dead_O = 0xfe87 +const XK_dead_u = 0xfe88 +const XK_dead_U = 0xfe89 +const XK_dead_small_schwa = 0xfe8a +const XK_dead_capital_schwa = 0xfe8b + +const XK_dead_greek = 0xfe8c + +const XK_First_Virtual_Screen = 0xfed0 +const XK_Prev_Virtual_Screen = 0xfed1 +const XK_Next_Virtual_Screen = 0xfed2 +const XK_Last_Virtual_Screen = 0xfed4 +const XK_Terminate_Server = 0xfed5 + +const XK_AccessX_Enable = 0xfe70 +const XK_AccessX_Feedback_Enable = 0xfe71 +const XK_RepeatKeys_Enable = 0xfe72 +const XK_SlowKeys_Enable = 0xfe73 +const XK_BounceKeys_Enable = 0xfe74 +const XK_StickyKeys_Enable = 0xfe75 +const XK_MouseKeys_Enable = 0xfe76 +const XK_MouseKeys_Accel_Enable = 0xfe77 +const XK_Overlay1_Enable = 0xfe78 +const XK_Overlay2_Enable = 0xfe79 +const XK_AudibleBell_Enable = 0xfe7a + +const XK_Pointer_Left = 0xfee0 +const XK_Pointer_Right = 0xfee1 +const XK_Pointer_Up = 0xfee2 +const XK_Pointer_Down = 0xfee3 +const XK_Pointer_UpLeft = 0xfee4 +const XK_Pointer_UpRight = 0xfee5 +const XK_Pointer_DownLeft = 0xfee6 +const XK_Pointer_DownRight = 0xfee7 +const XK_Pointer_Button_Dflt = 0xfee8 +const XK_Pointer_Button1 = 0xfee9 +const XK_Pointer_Button2 = 0xfeea +const XK_Pointer_Button3 = 0xfeeb +const XK_Pointer_Button4 = 0xfeec +const XK_Pointer_Button5 = 0xfeed +const XK_Pointer_DblClick_Dflt = 0xfeee +const XK_Pointer_DblClick1 = 0xfeef +const XK_Pointer_DblClick2 = 0xfef0 +const XK_Pointer_DblClick3 = 0xfef1 +const XK_Pointer_DblClick4 = 0xfef2 +const XK_Pointer_DblClick5 = 0xfef3 +const XK_Pointer_Drag_Dflt = 0xfef4 +const XK_Pointer_Drag1 = 0xfef5 +const XK_Pointer_Drag2 = 0xfef6 +const XK_Pointer_Drag3 = 0xfef7 +const XK_Pointer_Drag4 = 0xfef8 +const XK_Pointer_Drag5 = 0xfefd + +const XK_Pointer_EnableKeys = 0xfef9 +const XK_Pointer_Accelerate = 0xfefa +const XK_Pointer_DfltBtnNext = 0xfefb +const XK_Pointer_DfltBtnPrev = 0xfefc + +/* Single-Stroke Multiple-Character N-Graph Keysyms For The X Input Method */ + +const XK_ch = 0xfea0 +const XK_Ch = 0xfea1 +const XK_CH = 0xfea2 +const XK_c_h = 0xfea3 +const XK_C_h = 0xfea4 +const XK_C_H = 0xfea5 + +//endif /* XK_XKB_KEYS */ + +/* + * 3270 Terminal Keys + * Byte 3 = 0xfd + */ + +//ifdef XK_3270 +const XK_3270_Duplicate = 0xfd01 +const XK_3270_FieldMark = 0xfd02 +const XK_3270_Right2 = 0xfd03 +const XK_3270_Left2 = 0xfd04 +const XK_3270_BackTab = 0xfd05 +const XK_3270_EraseEOF = 0xfd06 +const XK_3270_EraseInput = 0xfd07 +const XK_3270_Reset = 0xfd08 +const XK_3270_Quit = 0xfd09 +const XK_3270_PA1 = 0xfd0a +const XK_3270_PA2 = 0xfd0b +const XK_3270_PA3 = 0xfd0c +const XK_3270_Test = 0xfd0d +const XK_3270_Attn = 0xfd0e +const XK_3270_CursorBlink = 0xfd0f +const XK_3270_AltCursor = 0xfd10 +const XK_3270_KeyClick = 0xfd11 +const XK_3270_Jump = 0xfd12 +const XK_3270_Ident = 0xfd13 +const XK_3270_Rule = 0xfd14 +const XK_3270_Copy = 0xfd15 +const XK_3270_Play = 0xfd16 +const XK_3270_Setup = 0xfd17 +const XK_3270_Record = 0xfd18 +const XK_3270_ChangeScreen = 0xfd19 +const XK_3270_DeleteWord = 0xfd1a +const XK_3270_ExSelect = 0xfd1b +const XK_3270_CursorSelect = 0xfd1c +const XK_3270_PrintScreen = 0xfd1d +const XK_3270_Enter = 0xfd1e +//endif /* XK_3270 */ + +/* + * Latin 1 + * (ISO/IEC 8859-1 = Unicode U+0020..U+00FF) + * Byte 3 = 0 + */ +//ifdef XK_LATIN1 +const XK_space = 0x0020 /* U+0020 SPACE */ +const XK_exclam = 0x0021 /* U+0021 EXCLAMATION MARK */ +const XK_quotedbl = 0x0022 /* U+0022 QUOTATION MARK */ +const XK_numbersign = 0x0023 /* U+0023 NUMBER SIGN */ +const XK_dollar = 0x0024 /* U+0024 DOLLAR SIGN */ +const XK_percent = 0x0025 /* U+0025 PERCENT SIGN */ +const XK_ampersand = 0x0026 /* U+0026 AMPERSAND */ +const XK_apostrophe = 0x0027 /* U+0027 APOSTROPHE */ +const XK_quoteright = 0x0027 /* deprecated */ +const XK_parenleft = 0x0028 /* U+0028 LEFT PARENTHESIS */ +const XK_parenright = 0x0029 /* U+0029 RIGHT PARENTHESIS */ +const XK_asterisk = 0x002a /* U+002A ASTERISK */ +const XK_plus = 0x002b /* U+002B PLUS SIGN */ +const XK_comma = 0x002c /* U+002C COMMA */ +const XK_minus = 0x002d /* U+002D HYPHEN-MINUS */ +const XK_period = 0x002e /* U+002E FULL STOP */ +const XK_slash = 0x002f /* U+002F SOLIDUS */ +const XK_0 = 0x0030 /* U+0030 DIGIT ZERO */ +const XK_1 = 0x0031 /* U+0031 DIGIT ONE */ +const XK_2 = 0x0032 /* U+0032 DIGIT TWO */ +const XK_3 = 0x0033 /* U+0033 DIGIT THREE */ +const XK_4 = 0x0034 /* U+0034 DIGIT FOUR */ +const XK_5 = 0x0035 /* U+0035 DIGIT FIVE */ +const XK_6 = 0x0036 /* U+0036 DIGIT SIX */ +const XK_7 = 0x0037 /* U+0037 DIGIT SEVEN */ +const XK_8 = 0x0038 /* U+0038 DIGIT EIGHT */ +const XK_9 = 0x0039 /* U+0039 DIGIT NINE */ +const XK_colon = 0x003a /* U+003A COLON */ +const XK_semicolon = 0x003b /* U+003B SEMICOLON */ +const XK_less = 0x003c /* U+003C LESS-THAN SIGN */ +const XK_equal = 0x003d /* U+003D EQUALS SIGN */ +const XK_greater = 0x003e /* U+003E GREATER-THAN SIGN */ +const XK_question = 0x003f /* U+003F QUESTION MARK */ +const XK_at = 0x0040 /* U+0040 COMMERCIAL AT */ +const XK_A = 0x0041 /* U+0041 LATIN CAPITAL LETTER A */ +const XK_B = 0x0042 /* U+0042 LATIN CAPITAL LETTER B */ +const XK_C = 0x0043 /* U+0043 LATIN CAPITAL LETTER C */ +const XK_D = 0x0044 /* U+0044 LATIN CAPITAL LETTER D */ +const XK_E = 0x0045 /* U+0045 LATIN CAPITAL LETTER E */ +const XK_F = 0x0046 /* U+0046 LATIN CAPITAL LETTER F */ +const XK_G = 0x0047 /* U+0047 LATIN CAPITAL LETTER G */ +const XK_H = 0x0048 /* U+0048 LATIN CAPITAL LETTER H */ +const XK_I = 0x0049 /* U+0049 LATIN CAPITAL LETTER I */ +const XK_J = 0x004a /* U+004A LATIN CAPITAL LETTER J */ +const XK_K = 0x004b /* U+004B LATIN CAPITAL LETTER K */ +const XK_L = 0x004c /* U+004C LATIN CAPITAL LETTER L */ +const XK_M = 0x004d /* U+004D LATIN CAPITAL LETTER M */ +const XK_N = 0x004e /* U+004E LATIN CAPITAL LETTER N */ +const XK_O = 0x004f /* U+004F LATIN CAPITAL LETTER O */ +const XK_P = 0x0050 /* U+0050 LATIN CAPITAL LETTER P */ +const XK_Q = 0x0051 /* U+0051 LATIN CAPITAL LETTER Q */ +const XK_R = 0x0052 /* U+0052 LATIN CAPITAL LETTER R */ +const XK_S = 0x0053 /* U+0053 LATIN CAPITAL LETTER S */ +const XK_T = 0x0054 /* U+0054 LATIN CAPITAL LETTER T */ +const XK_U = 0x0055 /* U+0055 LATIN CAPITAL LETTER U */ +const XK_V = 0x0056 /* U+0056 LATIN CAPITAL LETTER V */ +const XK_W = 0x0057 /* U+0057 LATIN CAPITAL LETTER W */ +const XK_X = 0x0058 /* U+0058 LATIN CAPITAL LETTER X */ +const XK_Y = 0x0059 /* U+0059 LATIN CAPITAL LETTER Y */ +const XK_Z = 0x005a /* U+005A LATIN CAPITAL LETTER Z */ +const XK_bracketleft = 0x005b /* U+005B LEFT SQUARE BRACKET */ +const XK_backslash = 0x005c /* U+005C REVERSE SOLIDUS */ +const XK_bracketright = 0x005d /* U+005D RIGHT SQUARE BRACKET */ +const XK_asciicircum = 0x005e /* U+005E CIRCUMFLEX ACCENT */ +const XK_underscore = 0x005f /* U+005F LOW LINE */ +const XK_grave = 0x0060 /* U+0060 GRAVE ACCENT */ +const XK_quoteleft = 0x0060 /* deprecated */ +const XK_a = 0x0061 /* U+0061 LATIN SMALL LETTER A */ +const XK_b = 0x0062 /* U+0062 LATIN SMALL LETTER B */ +const XK_c = 0x0063 /* U+0063 LATIN SMALL LETTER C */ +const XK_d = 0x0064 /* U+0064 LATIN SMALL LETTER D */ +const XK_e = 0x0065 /* U+0065 LATIN SMALL LETTER E */ +const XK_f = 0x0066 /* U+0066 LATIN SMALL LETTER F */ +const XK_g = 0x0067 /* U+0067 LATIN SMALL LETTER G */ +const XK_h = 0x0068 /* U+0068 LATIN SMALL LETTER H */ +const XK_i = 0x0069 /* U+0069 LATIN SMALL LETTER I */ +const XK_j = 0x006a /* U+006A LATIN SMALL LETTER J */ +const XK_k = 0x006b /* U+006B LATIN SMALL LETTER K */ +const XK_l = 0x006c /* U+006C LATIN SMALL LETTER L */ +const XK_m = 0x006d /* U+006D LATIN SMALL LETTER M */ +const XK_n = 0x006e /* U+006E LATIN SMALL LETTER N */ +const XK_o = 0x006f /* U+006F LATIN SMALL LETTER O */ +const XK_p = 0x0070 /* U+0070 LATIN SMALL LETTER P */ +const XK_q = 0x0071 /* U+0071 LATIN SMALL LETTER Q */ +const XK_r = 0x0072 /* U+0072 LATIN SMALL LETTER R */ +const XK_s = 0x0073 /* U+0073 LATIN SMALL LETTER S */ +const XK_t = 0x0074 /* U+0074 LATIN SMALL LETTER T */ +const XK_u = 0x0075 /* U+0075 LATIN SMALL LETTER U */ +const XK_v = 0x0076 /* U+0076 LATIN SMALL LETTER V */ +const XK_w = 0x0077 /* U+0077 LATIN SMALL LETTER W */ +const XK_x = 0x0078 /* U+0078 LATIN SMALL LETTER X */ +const XK_y = 0x0079 /* U+0079 LATIN SMALL LETTER Y */ +const XK_z = 0x007a /* U+007A LATIN SMALL LETTER Z */ +const XK_braceleft = 0x007b /* U+007B LEFT CURLY BRACKET */ +const XK_bar = 0x007c /* U+007C VERTICAL LINE */ +const XK_braceright = 0x007d /* U+007D RIGHT CURLY BRACKET */ +const XK_asciitilde = 0x007e /* U+007E TILDE */ + +const XK_nobreakspace = 0x00a0 /* U+00A0 NO-BREAK SPACE */ +const XK_exclamdown = 0x00a1 /* U+00A1 INVERTED EXCLAMATION MARK */ +const XK_cent = 0x00a2 /* U+00A2 CENT SIGN */ +const XK_sterling = 0x00a3 /* U+00A3 POUND SIGN */ +const XK_currency = 0x00a4 /* U+00A4 CURRENCY SIGN */ +const XK_yen = 0x00a5 /* U+00A5 YEN SIGN */ +const XK_brokenbar = 0x00a6 /* U+00A6 BROKEN BAR */ +const XK_section = 0x00a7 /* U+00A7 SECTION SIGN */ +const XK_diaeresis = 0x00a8 /* U+00A8 DIAERESIS */ +const XK_copyright = 0x00a9 /* U+00A9 COPYRIGHT SIGN */ +const XK_ordfeminine = 0x00aa /* U+00AA FEMININE ORDINAL INDICATOR */ +const XK_guillemotleft = 0x00ab /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ +const XK_notsign = 0x00ac /* U+00AC NOT SIGN */ +const XK_hyphen = 0x00ad /* U+00AD SOFT HYPHEN */ +const XK_registered = 0x00ae /* U+00AE REGISTERED SIGN */ +const XK_macron = 0x00af /* U+00AF MACRON */ +const XK_degree = 0x00b0 /* U+00B0 DEGREE SIGN */ +const XK_plusminus = 0x00b1 /* U+00B1 PLUS-MINUS SIGN */ +const XK_twosuperior = 0x00b2 /* U+00B2 SUPERSCRIPT TWO */ +const XK_threesuperior = 0x00b3 /* U+00B3 SUPERSCRIPT THREE */ +const XK_acute = 0x00b4 /* U+00B4 ACUTE ACCENT */ +const XK_mu = 0x00b5 /* U+00B5 MICRO SIGN */ +const XK_paragraph = 0x00b6 /* U+00B6 PILCROW SIGN */ +const XK_periodcentered = 0x00b7 /* U+00B7 MIDDLE DOT */ +const XK_cedilla = 0x00b8 /* U+00B8 CEDILLA */ +const XK_onesuperior = 0x00b9 /* U+00B9 SUPERSCRIPT ONE */ +const XK_masculine = 0x00ba /* U+00BA MASCULINE ORDINAL INDICATOR */ +const XK_guillemotright = 0x00bb /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ +const XK_onequarter = 0x00bc /* U+00BC VULGAR FRACTION ONE QUARTER */ +const XK_onehalf = 0x00bd /* U+00BD VULGAR FRACTION ONE HALF */ +const XK_threequarters = 0x00be /* U+00BE VULGAR FRACTION THREE QUARTERS */ +const XK_questiondown = 0x00bf /* U+00BF INVERTED QUESTION MARK */ +const XK_Agrave = 0x00c0 /* U+00C0 LATIN CAPITAL LETTER A WITH GRAVE */ +const XK_Aacute = 0x00c1 /* U+00C1 LATIN CAPITAL LETTER A WITH ACUTE */ +const XK_Acircumflex = 0x00c2 /* U+00C2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ +const XK_Atilde = 0x00c3 /* U+00C3 LATIN CAPITAL LETTER A WITH TILDE */ +const XK_Adiaeresis = 0x00c4 /* U+00C4 LATIN CAPITAL LETTER A WITH DIAERESIS */ +const XK_Aring = 0x00c5 /* U+00C5 LATIN CAPITAL LETTER A WITH RING ABOVE */ +const XK_AE = 0x00c6 /* U+00C6 LATIN CAPITAL LETTER AE */ +const XK_Ccedilla = 0x00c7 /* U+00C7 LATIN CAPITAL LETTER C WITH CEDILLA */ +const XK_Egrave = 0x00c8 /* U+00C8 LATIN CAPITAL LETTER E WITH GRAVE */ +const XK_Eacute = 0x00c9 /* U+00C9 LATIN CAPITAL LETTER E WITH ACUTE */ +const XK_Ecircumflex = 0x00ca /* U+00CA LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ +const XK_Ediaeresis = 0x00cb /* U+00CB LATIN CAPITAL LETTER E WITH DIAERESIS */ +const XK_Igrave = 0x00cc /* U+00CC LATIN CAPITAL LETTER I WITH GRAVE */ +const XK_Iacute = 0x00cd /* U+00CD LATIN CAPITAL LETTER I WITH ACUTE */ +const XK_Icircumflex = 0x00ce /* U+00CE LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ +const XK_Idiaeresis = 0x00cf /* U+00CF LATIN CAPITAL LETTER I WITH DIAERESIS */ +const XK_ETH = 0x00d0 /* U+00D0 LATIN CAPITAL LETTER ETH */ +const XK_Eth = 0x00d0 /* deprecated */ +const XK_Ntilde = 0x00d1 /* U+00D1 LATIN CAPITAL LETTER N WITH TILDE */ +const XK_Ograve = 0x00d2 /* U+00D2 LATIN CAPITAL LETTER O WITH GRAVE */ +const XK_Oacute = 0x00d3 /* U+00D3 LATIN CAPITAL LETTER O WITH ACUTE */ +const XK_Ocircumflex = 0x00d4 /* U+00D4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ +const XK_Otilde = 0x00d5 /* U+00D5 LATIN CAPITAL LETTER O WITH TILDE */ +const XK_Odiaeresis = 0x00d6 /* U+00D6 LATIN CAPITAL LETTER O WITH DIAERESIS */ +const XK_multiply = 0x00d7 /* U+00D7 MULTIPLICATION SIGN */ +const XK_Oslash = 0x00d8 /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */ +const XK_Ooblique = 0x00d8 /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */ +const XK_Ugrave = 0x00d9 /* U+00D9 LATIN CAPITAL LETTER U WITH GRAVE */ +const XK_Uacute = 0x00da /* U+00DA LATIN CAPITAL LETTER U WITH ACUTE */ +const XK_Ucircumflex = 0x00db /* U+00DB LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ +const XK_Udiaeresis = 0x00dc /* U+00DC LATIN CAPITAL LETTER U WITH DIAERESIS */ +const XK_Yacute = 0x00dd /* U+00DD LATIN CAPITAL LETTER Y WITH ACUTE */ +const XK_THORN = 0x00de /* U+00DE LATIN CAPITAL LETTER THORN */ +const XK_Thorn = 0x00de /* deprecated */ +const XK_ssharp = 0x00df /* U+00DF LATIN SMALL LETTER SHARP S */ +const XK_agrave = 0x00e0 /* U+00E0 LATIN SMALL LETTER A WITH GRAVE */ +const XK_aacute = 0x00e1 /* U+00E1 LATIN SMALL LETTER A WITH ACUTE */ +const XK_acircumflex = 0x00e2 /* U+00E2 LATIN SMALL LETTER A WITH CIRCUMFLEX */ +const XK_atilde = 0x00e3 /* U+00E3 LATIN SMALL LETTER A WITH TILDE */ +const XK_adiaeresis = 0x00e4 /* U+00E4 LATIN SMALL LETTER A WITH DIAERESIS */ +const XK_aring = 0x00e5 /* U+00E5 LATIN SMALL LETTER A WITH RING ABOVE */ +const XK_ae = 0x00e6 /* U+00E6 LATIN SMALL LETTER AE */ +const XK_ccedilla = 0x00e7 /* U+00E7 LATIN SMALL LETTER C WITH CEDILLA */ +const XK_egrave = 0x00e8 /* U+00E8 LATIN SMALL LETTER E WITH GRAVE */ +const XK_eacute = 0x00e9 /* U+00E9 LATIN SMALL LETTER E WITH ACUTE */ +const XK_ecircumflex = 0x00ea /* U+00EA LATIN SMALL LETTER E WITH CIRCUMFLEX */ +const XK_ediaeresis = 0x00eb /* U+00EB LATIN SMALL LETTER E WITH DIAERESIS */ +const XK_igrave = 0x00ec /* U+00EC LATIN SMALL LETTER I WITH GRAVE */ +const XK_iacute = 0x00ed /* U+00ED LATIN SMALL LETTER I WITH ACUTE */ +const XK_icircumflex = 0x00ee /* U+00EE LATIN SMALL LETTER I WITH CIRCUMFLEX */ +const XK_idiaeresis = 0x00ef /* U+00EF LATIN SMALL LETTER I WITH DIAERESIS */ +const XK_eth = 0x00f0 /* U+00F0 LATIN SMALL LETTER ETH */ +const XK_ntilde = 0x00f1 /* U+00F1 LATIN SMALL LETTER N WITH TILDE */ +const XK_ograve = 0x00f2 /* U+00F2 LATIN SMALL LETTER O WITH GRAVE */ +const XK_oacute = 0x00f3 /* U+00F3 LATIN SMALL LETTER O WITH ACUTE */ +const XK_ocircumflex = 0x00f4 /* U+00F4 LATIN SMALL LETTER O WITH CIRCUMFLEX */ +const XK_otilde = 0x00f5 /* U+00F5 LATIN SMALL LETTER O WITH TILDE */ +const XK_odiaeresis = 0x00f6 /* U+00F6 LATIN SMALL LETTER O WITH DIAERESIS */ +const XK_division = 0x00f7 /* U+00F7 DIVISION SIGN */ +const XK_oslash = 0x00f8 /* U+00F8 LATIN SMALL LETTER O WITH STROKE */ +const XK_ooblique = 0x00f8 /* U+00F8 LATIN SMALL LETTER O WITH STROKE */ +const XK_ugrave = 0x00f9 /* U+00F9 LATIN SMALL LETTER U WITH GRAVE */ +const XK_uacute = 0x00fa /* U+00FA LATIN SMALL LETTER U WITH ACUTE */ +const XK_ucircumflex = 0x00fb /* U+00FB LATIN SMALL LETTER U WITH CIRCUMFLEX */ +const XK_udiaeresis = 0x00fc /* U+00FC LATIN SMALL LETTER U WITH DIAERESIS */ +const XK_yacute = 0x00fd /* U+00FD LATIN SMALL LETTER Y WITH ACUTE */ +const XK_thorn = 0x00fe /* U+00FE LATIN SMALL LETTER THORN */ +const XK_ydiaeresis = 0x00ff /* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */ +//endif /* XK_LATIN1 */ + +/* + * Latin 2 + * Byte 3 = 1 + */ + +//ifdef XK_LATIN2 +const XK_Aogonek = 0x01a1 /* U+0104 LATIN CAPITAL LETTER A WITH OGONEK */ +const XK_breve = 0x01a2 /* U+02D8 BREVE */ +const XK_Lstroke = 0x01a3 /* U+0141 LATIN CAPITAL LETTER L WITH STROKE */ +const XK_Lcaron = 0x01a5 /* U+013D LATIN CAPITAL LETTER L WITH CARON */ +const XK_Sacute = 0x01a6 /* U+015A LATIN CAPITAL LETTER S WITH ACUTE */ +const XK_Scaron = 0x01a9 /* U+0160 LATIN CAPITAL LETTER S WITH CARON */ +const XK_Scedilla = 0x01aa /* U+015E LATIN CAPITAL LETTER S WITH CEDILLA */ +const XK_Tcaron = 0x01ab /* U+0164 LATIN CAPITAL LETTER T WITH CARON */ +const XK_Zacute = 0x01ac /* U+0179 LATIN CAPITAL LETTER Z WITH ACUTE */ +const XK_Zcaron = 0x01ae /* U+017D LATIN CAPITAL LETTER Z WITH CARON */ +const XK_Zabovedot = 0x01af /* U+017B LATIN CAPITAL LETTER Z WITH DOT ABOVE */ +const XK_aogonek = 0x01b1 /* U+0105 LATIN SMALL LETTER A WITH OGONEK */ +const XK_ogonek = 0x01b2 /* U+02DB OGONEK */ +const XK_lstroke = 0x01b3 /* U+0142 LATIN SMALL LETTER L WITH STROKE */ +const XK_lcaron = 0x01b5 /* U+013E LATIN SMALL LETTER L WITH CARON */ +const XK_sacute = 0x01b6 /* U+015B LATIN SMALL LETTER S WITH ACUTE */ +const XK_caron = 0x01b7 /* U+02C7 CARON */ +const XK_scaron = 0x01b9 /* U+0161 LATIN SMALL LETTER S WITH CARON */ +const XK_scedilla = 0x01ba /* U+015F LATIN SMALL LETTER S WITH CEDILLA */ +const XK_tcaron = 0x01bb /* U+0165 LATIN SMALL LETTER T WITH CARON */ +const XK_zacute = 0x01bc /* U+017A LATIN SMALL LETTER Z WITH ACUTE */ +const XK_doubleacute = 0x01bd /* U+02DD DOUBLE ACUTE ACCENT */ +const XK_zcaron = 0x01be /* U+017E LATIN SMALL LETTER Z WITH CARON */ +const XK_zabovedot = 0x01bf /* U+017C LATIN SMALL LETTER Z WITH DOT ABOVE */ +const XK_Racute = 0x01c0 /* U+0154 LATIN CAPITAL LETTER R WITH ACUTE */ +const XK_Abreve = 0x01c3 /* U+0102 LATIN CAPITAL LETTER A WITH BREVE */ +const XK_Lacute = 0x01c5 /* U+0139 LATIN CAPITAL LETTER L WITH ACUTE */ +const XK_Cacute = 0x01c6 /* U+0106 LATIN CAPITAL LETTER C WITH ACUTE */ +const XK_Ccaron = 0x01c8 /* U+010C LATIN CAPITAL LETTER C WITH CARON */ +const XK_Eogonek = 0x01ca /* U+0118 LATIN CAPITAL LETTER E WITH OGONEK */ +const XK_Ecaron = 0x01cc /* U+011A LATIN CAPITAL LETTER E WITH CARON */ +const XK_Dcaron = 0x01cf /* U+010E LATIN CAPITAL LETTER D WITH CARON */ +const XK_Dstroke = 0x01d0 /* U+0110 LATIN CAPITAL LETTER D WITH STROKE */ +const XK_Nacute = 0x01d1 /* U+0143 LATIN CAPITAL LETTER N WITH ACUTE */ +const XK_Ncaron = 0x01d2 /* U+0147 LATIN CAPITAL LETTER N WITH CARON */ +const XK_Odoubleacute = 0x01d5 /* U+0150 LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ +const XK_Rcaron = 0x01d8 /* U+0158 LATIN CAPITAL LETTER R WITH CARON */ +const XK_Uring = 0x01d9 /* U+016E LATIN CAPITAL LETTER U WITH RING ABOVE */ +const XK_Udoubleacute = 0x01db /* U+0170 LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ +const XK_Tcedilla = 0x01de /* U+0162 LATIN CAPITAL LETTER T WITH CEDILLA */ +const XK_racute = 0x01e0 /* U+0155 LATIN SMALL LETTER R WITH ACUTE */ +const XK_abreve = 0x01e3 /* U+0103 LATIN SMALL LETTER A WITH BREVE */ +const XK_lacute = 0x01e5 /* U+013A LATIN SMALL LETTER L WITH ACUTE */ +const XK_cacute = 0x01e6 /* U+0107 LATIN SMALL LETTER C WITH ACUTE */ +const XK_ccaron = 0x01e8 /* U+010D LATIN SMALL LETTER C WITH CARON */ +const XK_eogonek = 0x01ea /* U+0119 LATIN SMALL LETTER E WITH OGONEK */ +const XK_ecaron = 0x01ec /* U+011B LATIN SMALL LETTER E WITH CARON */ +const XK_dcaron = 0x01ef /* U+010F LATIN SMALL LETTER D WITH CARON */ +const XK_dstroke = 0x01f0 /* U+0111 LATIN SMALL LETTER D WITH STROKE */ +const XK_nacute = 0x01f1 /* U+0144 LATIN SMALL LETTER N WITH ACUTE */ +const XK_ncaron = 0x01f2 /* U+0148 LATIN SMALL LETTER N WITH CARON */ +const XK_odoubleacute = 0x01f5 /* U+0151 LATIN SMALL LETTER O WITH DOUBLE ACUTE */ +const XK_rcaron = 0x01f8 /* U+0159 LATIN SMALL LETTER R WITH CARON */ +const XK_uring = 0x01f9 /* U+016F LATIN SMALL LETTER U WITH RING ABOVE */ +const XK_udoubleacute = 0x01fb /* U+0171 LATIN SMALL LETTER U WITH DOUBLE ACUTE */ +const XK_tcedilla = 0x01fe /* U+0163 LATIN SMALL LETTER T WITH CEDILLA */ +const XK_abovedot = 0x01ff /* U+02D9 DOT ABOVE */ +//endif /* XK_LATIN2 */ + +/* + * Latin 3 + * Byte 3 = 2 + */ + +//ifdef XK_LATIN3 +const XK_Hstroke = 0x02a1 /* U+0126 LATIN CAPITAL LETTER H WITH STROKE */ +const XK_Hcircumflex = 0x02a6 /* U+0124 LATIN CAPITAL LETTER H WITH CIRCUMFLEX */ +const XK_Iabovedot = 0x02a9 /* U+0130 LATIN CAPITAL LETTER I WITH DOT ABOVE */ +const XK_Gbreve = 0x02ab /* U+011E LATIN CAPITAL LETTER G WITH BREVE */ +const XK_Jcircumflex = 0x02ac /* U+0134 LATIN CAPITAL LETTER J WITH CIRCUMFLEX */ +const XK_hstroke = 0x02b1 /* U+0127 LATIN SMALL LETTER H WITH STROKE */ +const XK_hcircumflex = 0x02b6 /* U+0125 LATIN SMALL LETTER H WITH CIRCUMFLEX */ +const XK_idotless = 0x02b9 /* U+0131 LATIN SMALL LETTER DOTLESS I */ +const XK_gbreve = 0x02bb /* U+011F LATIN SMALL LETTER G WITH BREVE */ +const XK_jcircumflex = 0x02bc /* U+0135 LATIN SMALL LETTER J WITH CIRCUMFLEX */ +const XK_Cabovedot = 0x02c5 /* U+010A LATIN CAPITAL LETTER C WITH DOT ABOVE */ +const XK_Ccircumflex = 0x02c6 /* U+0108 LATIN CAPITAL LETTER C WITH CIRCUMFLEX */ +const XK_Gabovedot = 0x02d5 /* U+0120 LATIN CAPITAL LETTER G WITH DOT ABOVE */ +const XK_Gcircumflex = 0x02d8 /* U+011C LATIN CAPITAL LETTER G WITH CIRCUMFLEX */ +const XK_Ubreve = 0x02dd /* U+016C LATIN CAPITAL LETTER U WITH BREVE */ +const XK_Scircumflex = 0x02de /* U+015C LATIN CAPITAL LETTER S WITH CIRCUMFLEX */ +const XK_cabovedot = 0x02e5 /* U+010B LATIN SMALL LETTER C WITH DOT ABOVE */ +const XK_ccircumflex = 0x02e6 /* U+0109 LATIN SMALL LETTER C WITH CIRCUMFLEX */ +const XK_gabovedot = 0x02f5 /* U+0121 LATIN SMALL LETTER G WITH DOT ABOVE */ +const XK_gcircumflex = 0x02f8 /* U+011D LATIN SMALL LETTER G WITH CIRCUMFLEX */ +const XK_ubreve = 0x02fd /* U+016D LATIN SMALL LETTER U WITH BREVE */ +const XK_scircumflex = 0x02fe /* U+015D LATIN SMALL LETTER S WITH CIRCUMFLEX */ +//endif /* XK_LATIN3 */ + + +/* + * Latin 4 + * Byte 3 = 3 + */ + +//ifdef XK_LATIN4 +const XK_kra = 0x03a2 /* U+0138 LATIN SMALL LETTER KRA */ +const XK_kappa = 0x03a2 /* deprecated */ +const XK_Rcedilla = 0x03a3 /* U+0156 LATIN CAPITAL LETTER R WITH CEDILLA */ +const XK_Itilde = 0x03a5 /* U+0128 LATIN CAPITAL LETTER I WITH TILDE */ +const XK_Lcedilla = 0x03a6 /* U+013B LATIN CAPITAL LETTER L WITH CEDILLA */ +const XK_Emacron = 0x03aa /* U+0112 LATIN CAPITAL LETTER E WITH MACRON */ +const XK_Gcedilla = 0x03ab /* U+0122 LATIN CAPITAL LETTER G WITH CEDILLA */ +const XK_Tslash = 0x03ac /* U+0166 LATIN CAPITAL LETTER T WITH STROKE */ +const XK_rcedilla = 0x03b3 /* U+0157 LATIN SMALL LETTER R WITH CEDILLA */ +const XK_itilde = 0x03b5 /* U+0129 LATIN SMALL LETTER I WITH TILDE */ +const XK_lcedilla = 0x03b6 /* U+013C LATIN SMALL LETTER L WITH CEDILLA */ +const XK_emacron = 0x03ba /* U+0113 LATIN SMALL LETTER E WITH MACRON */ +const XK_gcedilla = 0x03bb /* U+0123 LATIN SMALL LETTER G WITH CEDILLA */ +const XK_tslash = 0x03bc /* U+0167 LATIN SMALL LETTER T WITH STROKE */ +const XK_ENG = 0x03bd /* U+014A LATIN CAPITAL LETTER ENG */ +const XK_eng = 0x03bf /* U+014B LATIN SMALL LETTER ENG */ +const XK_Amacron = 0x03c0 /* U+0100 LATIN CAPITAL LETTER A WITH MACRON */ +const XK_Iogonek = 0x03c7 /* U+012E LATIN CAPITAL LETTER I WITH OGONEK */ +const XK_Eabovedot = 0x03cc /* U+0116 LATIN CAPITAL LETTER E WITH DOT ABOVE */ +const XK_Imacron = 0x03cf /* U+012A LATIN CAPITAL LETTER I WITH MACRON */ +const XK_Ncedilla = 0x03d1 /* U+0145 LATIN CAPITAL LETTER N WITH CEDILLA */ +const XK_Omacron = 0x03d2 /* U+014C LATIN CAPITAL LETTER O WITH MACRON */ +const XK_Kcedilla = 0x03d3 /* U+0136 LATIN CAPITAL LETTER K WITH CEDILLA */ +const XK_Uogonek = 0x03d9 /* U+0172 LATIN CAPITAL LETTER U WITH OGONEK */ +const XK_Utilde = 0x03dd /* U+0168 LATIN CAPITAL LETTER U WITH TILDE */ +const XK_Umacron = 0x03de /* U+016A LATIN CAPITAL LETTER U WITH MACRON */ +const XK_amacron = 0x03e0 /* U+0101 LATIN SMALL LETTER A WITH MACRON */ +const XK_iogonek = 0x03e7 /* U+012F LATIN SMALL LETTER I WITH OGONEK */ +const XK_eabovedot = 0x03ec /* U+0117 LATIN SMALL LETTER E WITH DOT ABOVE */ +const XK_imacron = 0x03ef /* U+012B LATIN SMALL LETTER I WITH MACRON */ +const XK_ncedilla = 0x03f1 /* U+0146 LATIN SMALL LETTER N WITH CEDILLA */ +const XK_omacron = 0x03f2 /* U+014D LATIN SMALL LETTER O WITH MACRON */ +const XK_kcedilla = 0x03f3 /* U+0137 LATIN SMALL LETTER K WITH CEDILLA */ +const XK_uogonek = 0x03f9 /* U+0173 LATIN SMALL LETTER U WITH OGONEK */ +const XK_utilde = 0x03fd /* U+0169 LATIN SMALL LETTER U WITH TILDE */ +const XK_umacron = 0x03fe /* U+016B LATIN SMALL LETTER U WITH MACRON */ +//endif /* XK_LATIN4 */ + +/* + * Latin 8 + */ +//ifdef XK_LATIN8 +const XK_Wcircumflex = 0x1000174 /* U+0174 LATIN CAPITAL LETTER W WITH CIRCUMFLEX */ +const XK_wcircumflex = 0x1000175 /* U+0175 LATIN SMALL LETTER W WITH CIRCUMFLEX */ +const XK_Ycircumflex = 0x1000176 /* U+0176 LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */ +const XK_ycircumflex = 0x1000177 /* U+0177 LATIN SMALL LETTER Y WITH CIRCUMFLEX */ +const XK_Babovedot = 0x1001e02 /* U+1E02 LATIN CAPITAL LETTER B WITH DOT ABOVE */ +const XK_babovedot = 0x1001e03 /* U+1E03 LATIN SMALL LETTER B WITH DOT ABOVE */ +const XK_Dabovedot = 0x1001e0a /* U+1E0A LATIN CAPITAL LETTER D WITH DOT ABOVE */ +const XK_dabovedot = 0x1001e0b /* U+1E0B LATIN SMALL LETTER D WITH DOT ABOVE */ +const XK_Fabovedot = 0x1001e1e /* U+1E1E LATIN CAPITAL LETTER F WITH DOT ABOVE */ +const XK_fabovedot = 0x1001e1f /* U+1E1F LATIN SMALL LETTER F WITH DOT ABOVE */ +const XK_Mabovedot = 0x1001e40 /* U+1E40 LATIN CAPITAL LETTER M WITH DOT ABOVE */ +const XK_mabovedot = 0x1001e41 /* U+1E41 LATIN SMALL LETTER M WITH DOT ABOVE */ +const XK_Pabovedot = 0x1001e56 /* U+1E56 LATIN CAPITAL LETTER P WITH DOT ABOVE */ +const XK_pabovedot = 0x1001e57 /* U+1E57 LATIN SMALL LETTER P WITH DOT ABOVE */ +const XK_Sabovedot = 0x1001e60 /* U+1E60 LATIN CAPITAL LETTER S WITH DOT ABOVE */ +const XK_sabovedot = 0x1001e61 /* U+1E61 LATIN SMALL LETTER S WITH DOT ABOVE */ +const XK_Tabovedot = 0x1001e6a /* U+1E6A LATIN CAPITAL LETTER T WITH DOT ABOVE */ +const XK_tabovedot = 0x1001e6b /* U+1E6B LATIN SMALL LETTER T WITH DOT ABOVE */ +const XK_Wgrave = 0x1001e80 /* U+1E80 LATIN CAPITAL LETTER W WITH GRAVE */ +const XK_wgrave = 0x1001e81 /* U+1E81 LATIN SMALL LETTER W WITH GRAVE */ +const XK_Wacute = 0x1001e82 /* U+1E82 LATIN CAPITAL LETTER W WITH ACUTE */ +const XK_wacute = 0x1001e83 /* U+1E83 LATIN SMALL LETTER W WITH ACUTE */ +const XK_Wdiaeresis = 0x1001e84 /* U+1E84 LATIN CAPITAL LETTER W WITH DIAERESIS */ +const XK_wdiaeresis = 0x1001e85 /* U+1E85 LATIN SMALL LETTER W WITH DIAERESIS */ +const XK_Ygrave = 0x1001ef2 /* U+1EF2 LATIN CAPITAL LETTER Y WITH GRAVE */ +const XK_ygrave = 0x1001ef3 /* U+1EF3 LATIN SMALL LETTER Y WITH GRAVE */ +//endif /* XK_LATIN8 */ + +/* + * Latin 9 + * Byte 3 = 0x13 + */ + +//ifdef XK_LATIN9 +const XK_OE = 0x13bc /* U+0152 LATIN CAPITAL LIGATURE OE */ +const XK_oe = 0x13bd /* U+0153 LATIN SMALL LIGATURE OE */ +const XK_Ydiaeresis = 0x13be /* U+0178 LATIN CAPITAL LETTER Y WITH DIAERESIS */ +//endif /* XK_LATIN9 */ + +/* + * Katakana + * Byte 3 = 4 + */ + +//ifdef XK_KATAKANA +const XK_overline = 0x047e /* U+203E OVERLINE */ +const XK_kana_fullstop = 0x04a1 /* U+3002 IDEOGRAPHIC FULL STOP */ +const XK_kana_openingbracket = 0x04a2 /* U+300C LEFT CORNER BRACKET */ +const XK_kana_closingbracket = 0x04a3 /* U+300D RIGHT CORNER BRACKET */ +const XK_kana_comma = 0x04a4 /* U+3001 IDEOGRAPHIC COMMA */ +const XK_kana_conjunctive = 0x04a5 /* U+30FB KATAKANA MIDDLE DOT */ +const XK_kana_middledot = 0x04a5 /* deprecated */ +const XK_kana_WO = 0x04a6 /* U+30F2 KATAKANA LETTER WO */ +const XK_kana_a = 0x04a7 /* U+30A1 KATAKANA LETTER SMALL A */ +const XK_kana_i = 0x04a8 /* U+30A3 KATAKANA LETTER SMALL I */ +const XK_kana_u = 0x04a9 /* U+30A5 KATAKANA LETTER SMALL U */ +const XK_kana_e = 0x04aa /* U+30A7 KATAKANA LETTER SMALL E */ +const XK_kana_o = 0x04ab /* U+30A9 KATAKANA LETTER SMALL O */ +const XK_kana_ya = 0x04ac /* U+30E3 KATAKANA LETTER SMALL YA */ +const XK_kana_yu = 0x04ad /* U+30E5 KATAKANA LETTER SMALL YU */ +const XK_kana_yo = 0x04ae /* U+30E7 KATAKANA LETTER SMALL YO */ +const XK_kana_tsu = 0x04af /* U+30C3 KATAKANA LETTER SMALL TU */ +const XK_kana_tu = 0x04af /* deprecated */ +const XK_prolongedsound = 0x04b0 /* U+30FC KATAKANA-HIRAGANA PROLONGED SOUND MARK */ +const XK_kana_A = 0x04b1 /* U+30A2 KATAKANA LETTER A */ +const XK_kana_I = 0x04b2 /* U+30A4 KATAKANA LETTER I */ +const XK_kana_U = 0x04b3 /* U+30A6 KATAKANA LETTER U */ +const XK_kana_E = 0x04b4 /* U+30A8 KATAKANA LETTER E */ +const XK_kana_O = 0x04b5 /* U+30AA KATAKANA LETTER O */ +const XK_kana_KA = 0x04b6 /* U+30AB KATAKANA LETTER KA */ +const XK_kana_KI = 0x04b7 /* U+30AD KATAKANA LETTER KI */ +const XK_kana_KU = 0x04b8 /* U+30AF KATAKANA LETTER KU */ +const XK_kana_KE = 0x04b9 /* U+30B1 KATAKANA LETTER KE */ +const XK_kana_KO = 0x04ba /* U+30B3 KATAKANA LETTER KO */ +const XK_kana_SA = 0x04bb /* U+30B5 KATAKANA LETTER SA */ +const XK_kana_SHI = 0x04bc /* U+30B7 KATAKANA LETTER SI */ +const XK_kana_SU = 0x04bd /* U+30B9 KATAKANA LETTER SU */ +const XK_kana_SE = 0x04be /* U+30BB KATAKANA LETTER SE */ +const XK_kana_SO = 0x04bf /* U+30BD KATAKANA LETTER SO */ +const XK_kana_TA = 0x04c0 /* U+30BF KATAKANA LETTER TA */ +const XK_kana_CHI = 0x04c1 /* U+30C1 KATAKANA LETTER TI */ +const XK_kana_TI = 0x04c1 /* deprecated */ +const XK_kana_TSU = 0x04c2 /* U+30C4 KATAKANA LETTER TU */ +const XK_kana_TU = 0x04c2 /* deprecated */ +const XK_kana_TE = 0x04c3 /* U+30C6 KATAKANA LETTER TE */ +const XK_kana_TO = 0x04c4 /* U+30C8 KATAKANA LETTER TO */ +const XK_kana_NA = 0x04c5 /* U+30CA KATAKANA LETTER NA */ +const XK_kana_NI = 0x04c6 /* U+30CB KATAKANA LETTER NI */ +const XK_kana_NU = 0x04c7 /* U+30CC KATAKANA LETTER NU */ +const XK_kana_NE = 0x04c8 /* U+30CD KATAKANA LETTER NE */ +const XK_kana_NO = 0x04c9 /* U+30CE KATAKANA LETTER NO */ +const XK_kana_HA = 0x04ca /* U+30CF KATAKANA LETTER HA */ +const XK_kana_HI = 0x04cb /* U+30D2 KATAKANA LETTER HI */ +const XK_kana_FU = 0x04cc /* U+30D5 KATAKANA LETTER HU */ +const XK_kana_HU = 0x04cc /* deprecated */ +const XK_kana_HE = 0x04cd /* U+30D8 KATAKANA LETTER HE */ +const XK_kana_HO = 0x04ce /* U+30DB KATAKANA LETTER HO */ +const XK_kana_MA = 0x04cf /* U+30DE KATAKANA LETTER MA */ +const XK_kana_MI = 0x04d0 /* U+30DF KATAKANA LETTER MI */ +const XK_kana_MU = 0x04d1 /* U+30E0 KATAKANA LETTER MU */ +const XK_kana_ME = 0x04d2 /* U+30E1 KATAKANA LETTER ME */ +const XK_kana_MO = 0x04d3 /* U+30E2 KATAKANA LETTER MO */ +const XK_kana_YA = 0x04d4 /* U+30E4 KATAKANA LETTER YA */ +const XK_kana_YU = 0x04d5 /* U+30E6 KATAKANA LETTER YU */ +const XK_kana_YO = 0x04d6 /* U+30E8 KATAKANA LETTER YO */ +const XK_kana_RA = 0x04d7 /* U+30E9 KATAKANA LETTER RA */ +const XK_kana_RI = 0x04d8 /* U+30EA KATAKANA LETTER RI */ +const XK_kana_RU = 0x04d9 /* U+30EB KATAKANA LETTER RU */ +const XK_kana_RE = 0x04da /* U+30EC KATAKANA LETTER RE */ +const XK_kana_RO = 0x04db /* U+30ED KATAKANA LETTER RO */ +const XK_kana_WA = 0x04dc /* U+30EF KATAKANA LETTER WA */ +const XK_kana_N = 0x04dd /* U+30F3 KATAKANA LETTER N */ +const XK_voicedsound = 0x04de /* U+309B KATAKANA-HIRAGANA VOICED SOUND MARK */ +const XK_semivoicedsound = 0x04df /* U+309C KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */ +const XK_kana_switch = 0xff7e /* Alias for mode_switch */ +//endif /* XK_KATAKANA */ + +/* + * Arabic + * Byte 3 = 5 + */ + +//ifdef XK_ARABIC +const XK_Farsi_0 = 0x10006f0 /* U+06F0 EXTENDED ARABIC-INDIC DIGIT ZERO */ +const XK_Farsi_1 = 0x10006f1 /* U+06F1 EXTENDED ARABIC-INDIC DIGIT ONE */ +const XK_Farsi_2 = 0x10006f2 /* U+06F2 EXTENDED ARABIC-INDIC DIGIT TWO */ +const XK_Farsi_3 = 0x10006f3 /* U+06F3 EXTENDED ARABIC-INDIC DIGIT THREE */ +const XK_Farsi_4 = 0x10006f4 /* U+06F4 EXTENDED ARABIC-INDIC DIGIT FOUR */ +const XK_Farsi_5 = 0x10006f5 /* U+06F5 EXTENDED ARABIC-INDIC DIGIT FIVE */ +const XK_Farsi_6 = 0x10006f6 /* U+06F6 EXTENDED ARABIC-INDIC DIGIT SIX */ +const XK_Farsi_7 = 0x10006f7 /* U+06F7 EXTENDED ARABIC-INDIC DIGIT SEVEN */ +const XK_Farsi_8 = 0x10006f8 /* U+06F8 EXTENDED ARABIC-INDIC DIGIT EIGHT */ +const XK_Farsi_9 = 0x10006f9 /* U+06F9 EXTENDED ARABIC-INDIC DIGIT NINE */ +const XK_Arabic_percent = 0x100066a /* U+066A ARABIC PERCENT SIGN */ +const XK_Arabic_superscript_alef = 0x1000670 /* U+0670 ARABIC LETTER SUPERSCRIPT ALEF */ +const XK_Arabic_tteh = 0x1000679 /* U+0679 ARABIC LETTER TTEH */ +const XK_Arabic_peh = 0x100067e /* U+067E ARABIC LETTER PEH */ +const XK_Arabic_tcheh = 0x1000686 /* U+0686 ARABIC LETTER TCHEH */ +const XK_Arabic_ddal = 0x1000688 /* U+0688 ARABIC LETTER DDAL */ +const XK_Arabic_rreh = 0x1000691 /* U+0691 ARABIC LETTER RREH */ +const XK_Arabic_comma = 0x05ac /* U+060C ARABIC COMMA */ +const XK_Arabic_fullstop = 0x10006d4 /* U+06D4 ARABIC FULL STOP */ +const XK_Arabic_0 = 0x1000660 /* U+0660 ARABIC-INDIC DIGIT ZERO */ +const XK_Arabic_1 = 0x1000661 /* U+0661 ARABIC-INDIC DIGIT ONE */ +const XK_Arabic_2 = 0x1000662 /* U+0662 ARABIC-INDIC DIGIT TWO */ +const XK_Arabic_3 = 0x1000663 /* U+0663 ARABIC-INDIC DIGIT THREE */ +const XK_Arabic_4 = 0x1000664 /* U+0664 ARABIC-INDIC DIGIT FOUR */ +const XK_Arabic_5 = 0x1000665 /* U+0665 ARABIC-INDIC DIGIT FIVE */ +const XK_Arabic_6 = 0x1000666 /* U+0666 ARABIC-INDIC DIGIT SIX */ +const XK_Arabic_7 = 0x1000667 /* U+0667 ARABIC-INDIC DIGIT SEVEN */ +const XK_Arabic_8 = 0x1000668 /* U+0668 ARABIC-INDIC DIGIT EIGHT */ +const XK_Arabic_9 = 0x1000669 /* U+0669 ARABIC-INDIC DIGIT NINE */ +const XK_Arabic_semicolon = 0x05bb /* U+061B ARABIC SEMICOLON */ +const XK_Arabic_question_mark = 0x05bf /* U+061F ARABIC QUESTION MARK */ +const XK_Arabic_hamza = 0x05c1 /* U+0621 ARABIC LETTER HAMZA */ +const XK_Arabic_maddaonalef = 0x05c2 /* U+0622 ARABIC LETTER ALEF WITH MADDA ABOVE */ +const XK_Arabic_hamzaonalef = 0x05c3 /* U+0623 ARABIC LETTER ALEF WITH HAMZA ABOVE */ +const XK_Arabic_hamzaonwaw = 0x05c4 /* U+0624 ARABIC LETTER WAW WITH HAMZA ABOVE */ +const XK_Arabic_hamzaunderalef = 0x05c5 /* U+0625 ARABIC LETTER ALEF WITH HAMZA BELOW */ +const XK_Arabic_hamzaonyeh = 0x05c6 /* U+0626 ARABIC LETTER YEH WITH HAMZA ABOVE */ +const XK_Arabic_alef = 0x05c7 /* U+0627 ARABIC LETTER ALEF */ +const XK_Arabic_beh = 0x05c8 /* U+0628 ARABIC LETTER BEH */ +const XK_Arabic_tehmarbuta = 0x05c9 /* U+0629 ARABIC LETTER TEH MARBUTA */ +const XK_Arabic_teh = 0x05ca /* U+062A ARABIC LETTER TEH */ +const XK_Arabic_theh = 0x05cb /* U+062B ARABIC LETTER THEH */ +const XK_Arabic_jeem = 0x05cc /* U+062C ARABIC LETTER JEEM */ +const XK_Arabic_hah = 0x05cd /* U+062D ARABIC LETTER HAH */ +const XK_Arabic_khah = 0x05ce /* U+062E ARABIC LETTER KHAH */ +const XK_Arabic_dal = 0x05cf /* U+062F ARABIC LETTER DAL */ +const XK_Arabic_thal = 0x05d0 /* U+0630 ARABIC LETTER THAL */ +const XK_Arabic_ra = 0x05d1 /* U+0631 ARABIC LETTER REH */ +const XK_Arabic_zain = 0x05d2 /* U+0632 ARABIC LETTER ZAIN */ +const XK_Arabic_seen = 0x05d3 /* U+0633 ARABIC LETTER SEEN */ +const XK_Arabic_sheen = 0x05d4 /* U+0634 ARABIC LETTER SHEEN */ +const XK_Arabic_sad = 0x05d5 /* U+0635 ARABIC LETTER SAD */ +const XK_Arabic_dad = 0x05d6 /* U+0636 ARABIC LETTER DAD */ +const XK_Arabic_tah = 0x05d7 /* U+0637 ARABIC LETTER TAH */ +const XK_Arabic_zah = 0x05d8 /* U+0638 ARABIC LETTER ZAH */ +const XK_Arabic_ain = 0x05d9 /* U+0639 ARABIC LETTER AIN */ +const XK_Arabic_ghain = 0x05da /* U+063A ARABIC LETTER GHAIN */ +const XK_Arabic_tatweel = 0x05e0 /* U+0640 ARABIC TATWEEL */ +const XK_Arabic_feh = 0x05e1 /* U+0641 ARABIC LETTER FEH */ +const XK_Arabic_qaf = 0x05e2 /* U+0642 ARABIC LETTER QAF */ +const XK_Arabic_kaf = 0x05e3 /* U+0643 ARABIC LETTER KAF */ +const XK_Arabic_lam = 0x05e4 /* U+0644 ARABIC LETTER LAM */ +const XK_Arabic_meem = 0x05e5 /* U+0645 ARABIC LETTER MEEM */ +const XK_Arabic_noon = 0x05e6 /* U+0646 ARABIC LETTER NOON */ +const XK_Arabic_ha = 0x05e7 /* U+0647 ARABIC LETTER HEH */ +const XK_Arabic_heh = 0x05e7 /* deprecated */ +const XK_Arabic_waw = 0x05e8 /* U+0648 ARABIC LETTER WAW */ +const XK_Arabic_alefmaksura = 0x05e9 /* U+0649 ARABIC LETTER ALEF MAKSURA */ +const XK_Arabic_yeh = 0x05ea /* U+064A ARABIC LETTER YEH */ +const XK_Arabic_fathatan = 0x05eb /* U+064B ARABIC FATHATAN */ +const XK_Arabic_dammatan = 0x05ec /* U+064C ARABIC DAMMATAN */ +const XK_Arabic_kasratan = 0x05ed /* U+064D ARABIC KASRATAN */ +const XK_Arabic_fatha = 0x05ee /* U+064E ARABIC FATHA */ +const XK_Arabic_damma = 0x05ef /* U+064F ARABIC DAMMA */ +const XK_Arabic_kasra = 0x05f0 /* U+0650 ARABIC KASRA */ +const XK_Arabic_shadda = 0x05f1 /* U+0651 ARABIC SHADDA */ +const XK_Arabic_sukun = 0x05f2 /* U+0652 ARABIC SUKUN */ +const XK_Arabic_madda_above = 0x1000653 /* U+0653 ARABIC MADDAH ABOVE */ +const XK_Arabic_hamza_above = 0x1000654 /* U+0654 ARABIC HAMZA ABOVE */ +const XK_Arabic_hamza_below = 0x1000655 /* U+0655 ARABIC HAMZA BELOW */ +const XK_Arabic_jeh = 0x1000698 /* U+0698 ARABIC LETTER JEH */ +const XK_Arabic_veh = 0x10006a4 /* U+06A4 ARABIC LETTER VEH */ +const XK_Arabic_keheh = 0x10006a9 /* U+06A9 ARABIC LETTER KEHEH */ +const XK_Arabic_gaf = 0x10006af /* U+06AF ARABIC LETTER GAF */ +const XK_Arabic_noon_ghunna = 0x10006ba /* U+06BA ARABIC LETTER NOON GHUNNA */ +const XK_Arabic_heh_doachashmee = 0x10006be /* U+06BE ARABIC LETTER HEH DOACHASHMEE */ +const XK_Farsi_yeh = 0x10006cc /* U+06CC ARABIC LETTER FARSI YEH */ +const XK_Arabic_farsi_yeh = 0x10006cc /* U+06CC ARABIC LETTER FARSI YEH */ +const XK_Arabic_yeh_baree = 0x10006d2 /* U+06D2 ARABIC LETTER YEH BARREE */ +const XK_Arabic_heh_goal = 0x10006c1 /* U+06C1 ARABIC LETTER HEH GOAL */ +const XK_Arabic_switch = 0xff7e /* Alias for mode_switch */ +//endif /* XK_ARABIC */ + +/* + * Cyrillic + * Byte 3 = 6 + */ +//ifdef XK_CYRILLIC +const XK_Cyrillic_GHE_bar = 0x1000492 /* U+0492 CYRILLIC CAPITAL LETTER GHE WITH STROKE */ +const XK_Cyrillic_ghe_bar = 0x1000493 /* U+0493 CYRILLIC SMALL LETTER GHE WITH STROKE */ +const XK_Cyrillic_ZHE_descender = 0x1000496 /* U+0496 CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER */ +const XK_Cyrillic_zhe_descender = 0x1000497 /* U+0497 CYRILLIC SMALL LETTER ZHE WITH DESCENDER */ +const XK_Cyrillic_KA_descender = 0x100049a /* U+049A CYRILLIC CAPITAL LETTER KA WITH DESCENDER */ +const XK_Cyrillic_ka_descender = 0x100049b /* U+049B CYRILLIC SMALL LETTER KA WITH DESCENDER */ +const XK_Cyrillic_KA_vertstroke = 0x100049c /* U+049C CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE */ +const XK_Cyrillic_ka_vertstroke = 0x100049d /* U+049D CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE */ +const XK_Cyrillic_EN_descender = 0x10004a2 /* U+04A2 CYRILLIC CAPITAL LETTER EN WITH DESCENDER */ +const XK_Cyrillic_en_descender = 0x10004a3 /* U+04A3 CYRILLIC SMALL LETTER EN WITH DESCENDER */ +const XK_Cyrillic_U_straight = 0x10004ae /* U+04AE CYRILLIC CAPITAL LETTER STRAIGHT U */ +const XK_Cyrillic_u_straight = 0x10004af /* U+04AF CYRILLIC SMALL LETTER STRAIGHT U */ +const XK_Cyrillic_U_straight_bar = 0x10004b0 /* U+04B0 CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE */ +const XK_Cyrillic_u_straight_bar = 0x10004b1 /* U+04B1 CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE */ +const XK_Cyrillic_HA_descender = 0x10004b2 /* U+04B2 CYRILLIC CAPITAL LETTER HA WITH DESCENDER */ +const XK_Cyrillic_ha_descender = 0x10004b3 /* U+04B3 CYRILLIC SMALL LETTER HA WITH DESCENDER */ +const XK_Cyrillic_CHE_descender = 0x10004b6 /* U+04B6 CYRILLIC CAPITAL LETTER CHE WITH DESCENDER */ +const XK_Cyrillic_che_descender = 0x10004b7 /* U+04B7 CYRILLIC SMALL LETTER CHE WITH DESCENDER */ +const XK_Cyrillic_CHE_vertstroke = 0x10004b8 /* U+04B8 CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE */ +const XK_Cyrillic_che_vertstroke = 0x10004b9 /* U+04B9 CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE */ +const XK_Cyrillic_SHHA = 0x10004ba /* U+04BA CYRILLIC CAPITAL LETTER SHHA */ +const XK_Cyrillic_shha = 0x10004bb /* U+04BB CYRILLIC SMALL LETTER SHHA */ + +const XK_Cyrillic_SCHWA = 0x10004d8 /* U+04D8 CYRILLIC CAPITAL LETTER SCHWA */ +const XK_Cyrillic_schwa = 0x10004d9 /* U+04D9 CYRILLIC SMALL LETTER SCHWA */ +const XK_Cyrillic_I_macron = 0x10004e2 /* U+04E2 CYRILLIC CAPITAL LETTER I WITH MACRON */ +const XK_Cyrillic_i_macron = 0x10004e3 /* U+04E3 CYRILLIC SMALL LETTER I WITH MACRON */ +const XK_Cyrillic_O_bar = 0x10004e8 /* U+04E8 CYRILLIC CAPITAL LETTER BARRED O */ +const XK_Cyrillic_o_bar = 0x10004e9 /* U+04E9 CYRILLIC SMALL LETTER BARRED O */ +const XK_Cyrillic_U_macron = 0x10004ee /* U+04EE CYRILLIC CAPITAL LETTER U WITH MACRON */ +const XK_Cyrillic_u_macron = 0x10004ef /* U+04EF CYRILLIC SMALL LETTER U WITH MACRON */ + +const XK_Serbian_dje = 0x06a1 /* U+0452 CYRILLIC SMALL LETTER DJE */ +const XK_Macedonia_gje = 0x06a2 /* U+0453 CYRILLIC SMALL LETTER GJE */ +const XK_Cyrillic_io = 0x06a3 /* U+0451 CYRILLIC SMALL LETTER IO */ +const XK_Ukrainian_ie = 0x06a4 /* U+0454 CYRILLIC SMALL LETTER UKRAINIAN IE */ +const XK_Ukranian_je = 0x06a4 /* deprecated */ +const XK_Macedonia_dse = 0x06a5 /* U+0455 CYRILLIC SMALL LETTER DZE */ +const XK_Ukrainian_i = 0x06a6 /* U+0456 CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ +const XK_Ukranian_i = 0x06a6 /* deprecated */ +const XK_Ukrainian_yi = 0x06a7 /* U+0457 CYRILLIC SMALL LETTER YI */ +const XK_Ukranian_yi = 0x06a7 /* deprecated */ +const XK_Cyrillic_je = 0x06a8 /* U+0458 CYRILLIC SMALL LETTER JE */ +const XK_Serbian_je = 0x06a8 /* deprecated */ +const XK_Cyrillic_lje = 0x06a9 /* U+0459 CYRILLIC SMALL LETTER LJE */ +const XK_Serbian_lje = 0x06a9 /* deprecated */ +const XK_Cyrillic_nje = 0x06aa /* U+045A CYRILLIC SMALL LETTER NJE */ +const XK_Serbian_nje = 0x06aa /* deprecated */ +const XK_Serbian_tshe = 0x06ab /* U+045B CYRILLIC SMALL LETTER TSHE */ +const XK_Macedonia_kje = 0x06ac /* U+045C CYRILLIC SMALL LETTER KJE */ +const XK_Ukrainian_ghe_with_upturn = 0x06ad /* U+0491 CYRILLIC SMALL LETTER GHE WITH UPTURN */ +const XK_Byelorussian_shortu = 0x06ae /* U+045E CYRILLIC SMALL LETTER SHORT U */ +const XK_Cyrillic_dzhe = 0x06af /* U+045F CYRILLIC SMALL LETTER DZHE */ +const XK_Serbian_dze = 0x06af /* deprecated */ +const XK_numerosign = 0x06b0 /* U+2116 NUMERO SIGN */ +const XK_Serbian_DJE = 0x06b1 /* U+0402 CYRILLIC CAPITAL LETTER DJE */ +const XK_Macedonia_GJE = 0x06b2 /* U+0403 CYRILLIC CAPITAL LETTER GJE */ +const XK_Cyrillic_IO = 0x06b3 /* U+0401 CYRILLIC CAPITAL LETTER IO */ +const XK_Ukrainian_IE = 0x06b4 /* U+0404 CYRILLIC CAPITAL LETTER UKRAINIAN IE */ +const XK_Ukranian_JE = 0x06b4 /* deprecated */ +const XK_Macedonia_DSE = 0x06b5 /* U+0405 CYRILLIC CAPITAL LETTER DZE */ +const XK_Ukrainian_I = 0x06b6 /* U+0406 CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ +const XK_Ukranian_I = 0x06b6 /* deprecated */ +const XK_Ukrainian_YI = 0x06b7 /* U+0407 CYRILLIC CAPITAL LETTER YI */ +const XK_Ukranian_YI = 0x06b7 /* deprecated */ +const XK_Cyrillic_JE = 0x06b8 /* U+0408 CYRILLIC CAPITAL LETTER JE */ +const XK_Serbian_JE = 0x06b8 /* deprecated */ +const XK_Cyrillic_LJE = 0x06b9 /* U+0409 CYRILLIC CAPITAL LETTER LJE */ +const XK_Serbian_LJE = 0x06b9 /* deprecated */ +const XK_Cyrillic_NJE = 0x06ba /* U+040A CYRILLIC CAPITAL LETTER NJE */ +const XK_Serbian_NJE = 0x06ba /* deprecated */ +const XK_Serbian_TSHE = 0x06bb /* U+040B CYRILLIC CAPITAL LETTER TSHE */ +const XK_Macedonia_KJE = 0x06bc /* U+040C CYRILLIC CAPITAL LETTER KJE */ +const XK_Ukrainian_GHE_WITH_UPTURN = 0x06bd /* U+0490 CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ +const XK_Byelorussian_SHORTU = 0x06be /* U+040E CYRILLIC CAPITAL LETTER SHORT U */ +const XK_Cyrillic_DZHE = 0x06bf /* U+040F CYRILLIC CAPITAL LETTER DZHE */ +const XK_Serbian_DZE = 0x06bf /* deprecated */ +const XK_Cyrillic_yu = 0x06c0 /* U+044E CYRILLIC SMALL LETTER YU */ +const XK_Cyrillic_a = 0x06c1 /* U+0430 CYRILLIC SMALL LETTER A */ +const XK_Cyrillic_be = 0x06c2 /* U+0431 CYRILLIC SMALL LETTER BE */ +const XK_Cyrillic_tse = 0x06c3 /* U+0446 CYRILLIC SMALL LETTER TSE */ +const XK_Cyrillic_de = 0x06c4 /* U+0434 CYRILLIC SMALL LETTER DE */ +const XK_Cyrillic_ie = 0x06c5 /* U+0435 CYRILLIC SMALL LETTER IE */ +const XK_Cyrillic_ef = 0x06c6 /* U+0444 CYRILLIC SMALL LETTER EF */ +const XK_Cyrillic_ghe = 0x06c7 /* U+0433 CYRILLIC SMALL LETTER GHE */ +const XK_Cyrillic_ha = 0x06c8 /* U+0445 CYRILLIC SMALL LETTER HA */ +const XK_Cyrillic_i = 0x06c9 /* U+0438 CYRILLIC SMALL LETTER I */ +const XK_Cyrillic_shorti = 0x06ca /* U+0439 CYRILLIC SMALL LETTER SHORT I */ +const XK_Cyrillic_ka = 0x06cb /* U+043A CYRILLIC SMALL LETTER KA */ +const XK_Cyrillic_el = 0x06cc /* U+043B CYRILLIC SMALL LETTER EL */ +const XK_Cyrillic_em = 0x06cd /* U+043C CYRILLIC SMALL LETTER EM */ +const XK_Cyrillic_en = 0x06ce /* U+043D CYRILLIC SMALL LETTER EN */ +const XK_Cyrillic_o = 0x06cf /* U+043E CYRILLIC SMALL LETTER O */ +const XK_Cyrillic_pe = 0x06d0 /* U+043F CYRILLIC SMALL LETTER PE */ +const XK_Cyrillic_ya = 0x06d1 /* U+044F CYRILLIC SMALL LETTER YA */ +const XK_Cyrillic_er = 0x06d2 /* U+0440 CYRILLIC SMALL LETTER ER */ +const XK_Cyrillic_es = 0x06d3 /* U+0441 CYRILLIC SMALL LETTER ES */ +const XK_Cyrillic_te = 0x06d4 /* U+0442 CYRILLIC SMALL LETTER TE */ +const XK_Cyrillic_u = 0x06d5 /* U+0443 CYRILLIC SMALL LETTER U */ +const XK_Cyrillic_zhe = 0x06d6 /* U+0436 CYRILLIC SMALL LETTER ZHE */ +const XK_Cyrillic_ve = 0x06d7 /* U+0432 CYRILLIC SMALL LETTER VE */ +const XK_Cyrillic_softsign = 0x06d8 /* U+044C CYRILLIC SMALL LETTER SOFT SIGN */ +const XK_Cyrillic_yeru = 0x06d9 /* U+044B CYRILLIC SMALL LETTER YERU */ +const XK_Cyrillic_ze = 0x06da /* U+0437 CYRILLIC SMALL LETTER ZE */ +const XK_Cyrillic_sha = 0x06db /* U+0448 CYRILLIC SMALL LETTER SHA */ +const XK_Cyrillic_e = 0x06dc /* U+044D CYRILLIC SMALL LETTER E */ +const XK_Cyrillic_shcha = 0x06dd /* U+0449 CYRILLIC SMALL LETTER SHCHA */ +const XK_Cyrillic_che = 0x06de /* U+0447 CYRILLIC SMALL LETTER CHE */ +const XK_Cyrillic_hardsign = 0x06df /* U+044A CYRILLIC SMALL LETTER HARD SIGN */ +const XK_Cyrillic_YU = 0x06e0 /* U+042E CYRILLIC CAPITAL LETTER YU */ +const XK_Cyrillic_A = 0x06e1 /* U+0410 CYRILLIC CAPITAL LETTER A */ +const XK_Cyrillic_BE = 0x06e2 /* U+0411 CYRILLIC CAPITAL LETTER BE */ +const XK_Cyrillic_TSE = 0x06e3 /* U+0426 CYRILLIC CAPITAL LETTER TSE */ +const XK_Cyrillic_DE = 0x06e4 /* U+0414 CYRILLIC CAPITAL LETTER DE */ +const XK_Cyrillic_IE = 0x06e5 /* U+0415 CYRILLIC CAPITAL LETTER IE */ +const XK_Cyrillic_EF = 0x06e6 /* U+0424 CYRILLIC CAPITAL LETTER EF */ +const XK_Cyrillic_GHE = 0x06e7 /* U+0413 CYRILLIC CAPITAL LETTER GHE */ +const XK_Cyrillic_HA = 0x06e8 /* U+0425 CYRILLIC CAPITAL LETTER HA */ +const XK_Cyrillic_I = 0x06e9 /* U+0418 CYRILLIC CAPITAL LETTER I */ +const XK_Cyrillic_SHORTI = 0x06ea /* U+0419 CYRILLIC CAPITAL LETTER SHORT I */ +const XK_Cyrillic_KA = 0x06eb /* U+041A CYRILLIC CAPITAL LETTER KA */ +const XK_Cyrillic_EL = 0x06ec /* U+041B CYRILLIC CAPITAL LETTER EL */ +const XK_Cyrillic_EM = 0x06ed /* U+041C CYRILLIC CAPITAL LETTER EM */ +const XK_Cyrillic_EN = 0x06ee /* U+041D CYRILLIC CAPITAL LETTER EN */ +const XK_Cyrillic_O = 0x06ef /* U+041E CYRILLIC CAPITAL LETTER O */ +const XK_Cyrillic_PE = 0x06f0 /* U+041F CYRILLIC CAPITAL LETTER PE */ +const XK_Cyrillic_YA = 0x06f1 /* U+042F CYRILLIC CAPITAL LETTER YA */ +const XK_Cyrillic_ER = 0x06f2 /* U+0420 CYRILLIC CAPITAL LETTER ER */ +const XK_Cyrillic_ES = 0x06f3 /* U+0421 CYRILLIC CAPITAL LETTER ES */ +const XK_Cyrillic_TE = 0x06f4 /* U+0422 CYRILLIC CAPITAL LETTER TE */ +const XK_Cyrillic_U = 0x06f5 /* U+0423 CYRILLIC CAPITAL LETTER U */ +const XK_Cyrillic_ZHE = 0x06f6 /* U+0416 CYRILLIC CAPITAL LETTER ZHE */ +const XK_Cyrillic_VE = 0x06f7 /* U+0412 CYRILLIC CAPITAL LETTER VE */ +const XK_Cyrillic_SOFTSIGN = 0x06f8 /* U+042C CYRILLIC CAPITAL LETTER SOFT SIGN */ +const XK_Cyrillic_YERU = 0x06f9 /* U+042B CYRILLIC CAPITAL LETTER YERU */ +const XK_Cyrillic_ZE = 0x06fa /* U+0417 CYRILLIC CAPITAL LETTER ZE */ +const XK_Cyrillic_SHA = 0x06fb /* U+0428 CYRILLIC CAPITAL LETTER SHA */ +const XK_Cyrillic_E = 0x06fc /* U+042D CYRILLIC CAPITAL LETTER E */ +const XK_Cyrillic_SHCHA = 0x06fd /* U+0429 CYRILLIC CAPITAL LETTER SHCHA */ +const XK_Cyrillic_CHE = 0x06fe /* U+0427 CYRILLIC CAPITAL LETTER CHE */ +const XK_Cyrillic_HARDSIGN = 0x06ff /* U+042A CYRILLIC CAPITAL LETTER HARD SIGN */ +//endif /* XK_CYRILLIC */ + +/* + * Greek + * (based on an early draft of, and not quite identical to, ISO/IEC 8859-7) + * Byte 3 = 7 + */ + +//ifdef XK_GREEK +const XK_Greek_ALPHAaccent = 0x07a1 /* U+0386 GREEK CAPITAL LETTER ALPHA WITH TONOS */ +const XK_Greek_EPSILONaccent = 0x07a2 /* U+0388 GREEK CAPITAL LETTER EPSILON WITH TONOS */ +const XK_Greek_ETAaccent = 0x07a3 /* U+0389 GREEK CAPITAL LETTER ETA WITH TONOS */ +const XK_Greek_IOTAaccent = 0x07a4 /* U+038A GREEK CAPITAL LETTER IOTA WITH TONOS */ +const XK_Greek_IOTAdieresis = 0x07a5 /* U+03AA GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */ +const XK_Greek_IOTAdiaeresis = 0x07a5 /* old typo */ +const XK_Greek_OMICRONaccent = 0x07a7 /* U+038C GREEK CAPITAL LETTER OMICRON WITH TONOS */ +const XK_Greek_UPSILONaccent = 0x07a8 /* U+038E GREEK CAPITAL LETTER UPSILON WITH TONOS */ +const XK_Greek_UPSILONdieresis = 0x07a9 /* U+03AB GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */ +const XK_Greek_OMEGAaccent = 0x07ab /* U+038F GREEK CAPITAL LETTER OMEGA WITH TONOS */ +const XK_Greek_accentdieresis = 0x07ae /* U+0385 GREEK DIALYTIKA TONOS */ +const XK_Greek_horizbar = 0x07af /* U+2015 HORIZONTAL BAR */ +const XK_Greek_alphaaccent = 0x07b1 /* U+03AC GREEK SMALL LETTER ALPHA WITH TONOS */ +const XK_Greek_epsilonaccent = 0x07b2 /* U+03AD GREEK SMALL LETTER EPSILON WITH TONOS */ +const XK_Greek_etaaccent = 0x07b3 /* U+03AE GREEK SMALL LETTER ETA WITH TONOS */ +const XK_Greek_iotaaccent = 0x07b4 /* U+03AF GREEK SMALL LETTER IOTA WITH TONOS */ +const XK_Greek_iotadieresis = 0x07b5 /* U+03CA GREEK SMALL LETTER IOTA WITH DIALYTIKA */ +const XK_Greek_iotaaccentdieresis = 0x07b6 /* U+0390 GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */ +const XK_Greek_omicronaccent = 0x07b7 /* U+03CC GREEK SMALL LETTER OMICRON WITH TONOS */ +const XK_Greek_upsilonaccent = 0x07b8 /* U+03CD GREEK SMALL LETTER UPSILON WITH TONOS */ +const XK_Greek_upsilondieresis = 0x07b9 /* U+03CB GREEK SMALL LETTER UPSILON WITH DIALYTIKA */ +const XK_Greek_upsilonaccentdieresis = 0x07ba /* U+03B0 GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */ +const XK_Greek_omegaaccent = 0x07bb /* U+03CE GREEK SMALL LETTER OMEGA WITH TONOS */ +const XK_Greek_ALPHA = 0x07c1 /* U+0391 GREEK CAPITAL LETTER ALPHA */ +const XK_Greek_BETA = 0x07c2 /* U+0392 GREEK CAPITAL LETTER BETA */ +const XK_Greek_GAMMA = 0x07c3 /* U+0393 GREEK CAPITAL LETTER GAMMA */ +const XK_Greek_DELTA = 0x07c4 /* U+0394 GREEK CAPITAL LETTER DELTA */ +const XK_Greek_EPSILON = 0x07c5 /* U+0395 GREEK CAPITAL LETTER EPSILON */ +const XK_Greek_ZETA = 0x07c6 /* U+0396 GREEK CAPITAL LETTER ZETA */ +const XK_Greek_ETA = 0x07c7 /* U+0397 GREEK CAPITAL LETTER ETA */ +const XK_Greek_THETA = 0x07c8 /* U+0398 GREEK CAPITAL LETTER THETA */ +const XK_Greek_IOTA = 0x07c9 /* U+0399 GREEK CAPITAL LETTER IOTA */ +const XK_Greek_KAPPA = 0x07ca /* U+039A GREEK CAPITAL LETTER KAPPA */ +const XK_Greek_LAMDA = 0x07cb /* U+039B GREEK CAPITAL LETTER LAMDA */ +const XK_Greek_LAMBDA = 0x07cb /* U+039B GREEK CAPITAL LETTER LAMDA */ +const XK_Greek_MU = 0x07cc /* U+039C GREEK CAPITAL LETTER MU */ +const XK_Greek_NU = 0x07cd /* U+039D GREEK CAPITAL LETTER NU */ +const XK_Greek_XI = 0x07ce /* U+039E GREEK CAPITAL LETTER XI */ +const XK_Greek_OMICRON = 0x07cf /* U+039F GREEK CAPITAL LETTER OMICRON */ +const XK_Greek_PI = 0x07d0 /* U+03A0 GREEK CAPITAL LETTER PI */ +const XK_Greek_RHO = 0x07d1 /* U+03A1 GREEK CAPITAL LETTER RHO */ +const XK_Greek_SIGMA = 0x07d2 /* U+03A3 GREEK CAPITAL LETTER SIGMA */ +const XK_Greek_TAU = 0x07d4 /* U+03A4 GREEK CAPITAL LETTER TAU */ +const XK_Greek_UPSILON = 0x07d5 /* U+03A5 GREEK CAPITAL LETTER UPSILON */ +const XK_Greek_PHI = 0x07d6 /* U+03A6 GREEK CAPITAL LETTER PHI */ +const XK_Greek_CHI = 0x07d7 /* U+03A7 GREEK CAPITAL LETTER CHI */ +const XK_Greek_PSI = 0x07d8 /* U+03A8 GREEK CAPITAL LETTER PSI */ +const XK_Greek_OMEGA = 0x07d9 /* U+03A9 GREEK CAPITAL LETTER OMEGA */ +const XK_Greek_alpha = 0x07e1 /* U+03B1 GREEK SMALL LETTER ALPHA */ +const XK_Greek_beta = 0x07e2 /* U+03B2 GREEK SMALL LETTER BETA */ +const XK_Greek_gamma = 0x07e3 /* U+03B3 GREEK SMALL LETTER GAMMA */ +const XK_Greek_delta = 0x07e4 /* U+03B4 GREEK SMALL LETTER DELTA */ +const XK_Greek_epsilon = 0x07e5 /* U+03B5 GREEK SMALL LETTER EPSILON */ +const XK_Greek_zeta = 0x07e6 /* U+03B6 GREEK SMALL LETTER ZETA */ +const XK_Greek_eta = 0x07e7 /* U+03B7 GREEK SMALL LETTER ETA */ +const XK_Greek_theta = 0x07e8 /* U+03B8 GREEK SMALL LETTER THETA */ +const XK_Greek_iota = 0x07e9 /* U+03B9 GREEK SMALL LETTER IOTA */ +const XK_Greek_kappa = 0x07ea /* U+03BA GREEK SMALL LETTER KAPPA */ +const XK_Greek_lamda = 0x07eb /* U+03BB GREEK SMALL LETTER LAMDA */ +const XK_Greek_lambda = 0x07eb /* U+03BB GREEK SMALL LETTER LAMDA */ +const XK_Greek_mu = 0x07ec /* U+03BC GREEK SMALL LETTER MU */ +const XK_Greek_nu = 0x07ed /* U+03BD GREEK SMALL LETTER NU */ +const XK_Greek_xi = 0x07ee /* U+03BE GREEK SMALL LETTER XI */ +const XK_Greek_omicron = 0x07ef /* U+03BF GREEK SMALL LETTER OMICRON */ +const XK_Greek_pi = 0x07f0 /* U+03C0 GREEK SMALL LETTER PI */ +const XK_Greek_rho = 0x07f1 /* U+03C1 GREEK SMALL LETTER RHO */ +const XK_Greek_sigma = 0x07f2 /* U+03C3 GREEK SMALL LETTER SIGMA */ +const XK_Greek_finalsmallsigma = 0x07f3 /* U+03C2 GREEK SMALL LETTER FINAL SIGMA */ +const XK_Greek_tau = 0x07f4 /* U+03C4 GREEK SMALL LETTER TAU */ +const XK_Greek_upsilon = 0x07f5 /* U+03C5 GREEK SMALL LETTER UPSILON */ +const XK_Greek_phi = 0x07f6 /* U+03C6 GREEK SMALL LETTER PHI */ +const XK_Greek_chi = 0x07f7 /* U+03C7 GREEK SMALL LETTER CHI */ +const XK_Greek_psi = 0x07f8 /* U+03C8 GREEK SMALL LETTER PSI */ +const XK_Greek_omega = 0x07f9 /* U+03C9 GREEK SMALL LETTER OMEGA */ +const XK_Greek_switch = 0xff7e /* Alias for mode_switch */ +//endif /* XK_GREEK */ + +/* + * Technical + * (from the DEC VT330/VT420 Technical Character Set, http://vt100.net/charsets/technical.html) + * Byte 3 = 8 + */ + +//ifdef XK_TECHNICAL +const XK_leftradical = 0x08a1 /* U+23B7 RADICAL SYMBOL BOTTOM */ +const XK_topleftradical = 0x08a2 /*(U+250C BOX DRAWINGS LIGHT DOWN AND RIGHT)*/ +const XK_horizconnector = 0x08a3 /*(U+2500 BOX DRAWINGS LIGHT HORIZONTAL)*/ +const XK_topintegral = 0x08a4 /* U+2320 TOP HALF INTEGRAL */ +const XK_botintegral = 0x08a5 /* U+2321 BOTTOM HALF INTEGRAL */ +const XK_vertconnector = 0x08a6 /*(U+2502 BOX DRAWINGS LIGHT VERTICAL)*/ +const XK_topleftsqbracket = 0x08a7 /* U+23A1 LEFT SQUARE BRACKET UPPER CORNER */ +const XK_botleftsqbracket = 0x08a8 /* U+23A3 LEFT SQUARE BRACKET LOWER CORNER */ +const XK_toprightsqbracket = 0x08a9 /* U+23A4 RIGHT SQUARE BRACKET UPPER CORNER */ +const XK_botrightsqbracket = 0x08aa /* U+23A6 RIGHT SQUARE BRACKET LOWER CORNER */ +const XK_topleftparens = 0x08ab /* U+239B LEFT PARENTHESIS UPPER HOOK */ +const XK_botleftparens = 0x08ac /* U+239D LEFT PARENTHESIS LOWER HOOK */ +const XK_toprightparens = 0x08ad /* U+239E RIGHT PARENTHESIS UPPER HOOK */ +const XK_botrightparens = 0x08ae /* U+23A0 RIGHT PARENTHESIS LOWER HOOK */ +const XK_leftmiddlecurlybrace = 0x08af /* U+23A8 LEFT CURLY BRACKET MIDDLE PIECE */ +const XK_rightmiddlecurlybrace = 0x08b0 /* U+23AC RIGHT CURLY BRACKET MIDDLE PIECE */ +const XK_topleftsummation = 0x08b1 +const XK_botleftsummation = 0x08b2 +const XK_topvertsummationconnector = 0x08b3 +const XK_botvertsummationconnector = 0x08b4 +const XK_toprightsummation = 0x08b5 +const XK_botrightsummation = 0x08b6 +const XK_rightmiddlesummation = 0x08b7 +const XK_lessthanequal = 0x08bc /* U+2264 LESS-THAN OR EQUAL TO */ +const XK_notequal = 0x08bd /* U+2260 NOT EQUAL TO */ +const XK_greaterthanequal = 0x08be /* U+2265 GREATER-THAN OR EQUAL TO */ +const XK_integral = 0x08bf /* U+222B INTEGRAL */ +const XK_therefore = 0x08c0 /* U+2234 THEREFORE */ +const XK_variation = 0x08c1 /* U+221D PROPORTIONAL TO */ +const XK_infinity = 0x08c2 /* U+221E INFINITY */ +const XK_nabla = 0x08c5 /* U+2207 NABLA */ +const XK_approximate = 0x08c8 /* U+223C TILDE OPERATOR */ +const XK_similarequal = 0x08c9 /* U+2243 ASYMPTOTICALLY EQUAL TO */ +const XK_ifonlyif = 0x08cd /* U+21D4 LEFT RIGHT DOUBLE ARROW */ +const XK_implies = 0x08ce /* U+21D2 RIGHTWARDS DOUBLE ARROW */ +const XK_identical = 0x08cf /* U+2261 IDENTICAL TO */ +const XK_radical = 0x08d6 /* U+221A SQUARE ROOT */ +const XK_includedin = 0x08da /* U+2282 SUBSET OF */ +const XK_includes = 0x08db /* U+2283 SUPERSET OF */ +const XK_intersection = 0x08dc /* U+2229 INTERSECTION */ +const XK_union = 0x08dd /* U+222A UNION */ +const XK_logicaland = 0x08de /* U+2227 LOGICAL AND */ +const XK_logicalor = 0x08df /* U+2228 LOGICAL OR */ +const XK_partialderivative = 0x08ef /* U+2202 PARTIAL DIFFERENTIAL */ +const XK_function = 0x08f6 /* U+0192 LATIN SMALL LETTER F WITH HOOK */ +const XK_leftarrow = 0x08fb /* U+2190 LEFTWARDS ARROW */ +const XK_uparrow = 0x08fc /* U+2191 UPWARDS ARROW */ +const XK_rightarrow = 0x08fd /* U+2192 RIGHTWARDS ARROW */ +const XK_downarrow = 0x08fe /* U+2193 DOWNWARDS ARROW */ +//endif /* XK_TECHNICAL */ + +/* + * Special + * (from the DEC VT100 Special Graphics Character Set) + * Byte 3 = 9 + */ + +//ifdef XK_SPECIAL +const XK_blank = 0x09df +const XK_soliddiamond = 0x09e0 /* U+25C6 BLACK DIAMOND */ +const XK_checkerboard = 0x09e1 /* U+2592 MEDIUM SHADE */ +const XK_ht = 0x09e2 /* U+2409 SYMBOL FOR HORIZONTAL TABULATION */ +const XK_ff = 0x09e3 /* U+240C SYMBOL FOR FORM FEED */ +const XK_cr = 0x09e4 /* U+240D SYMBOL FOR CARRIAGE RETURN */ +const XK_lf = 0x09e5 /* U+240A SYMBOL FOR LINE FEED */ +const XK_nl = 0x09e8 /* U+2424 SYMBOL FOR NEWLINE */ +const XK_vt = 0x09e9 /* U+240B SYMBOL FOR VERTICAL TABULATION */ +const XK_lowrightcorner = 0x09ea /* U+2518 BOX DRAWINGS LIGHT UP AND LEFT */ +const XK_uprightcorner = 0x09eb /* U+2510 BOX DRAWINGS LIGHT DOWN AND LEFT */ +const XK_upleftcorner = 0x09ec /* U+250C BOX DRAWINGS LIGHT DOWN AND RIGHT */ +const XK_lowleftcorner = 0x09ed /* U+2514 BOX DRAWINGS LIGHT UP AND RIGHT */ +const XK_crossinglines = 0x09ee /* U+253C BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ +const XK_horizlinescan1 = 0x09ef /* U+23BA HORIZONTAL SCAN LINE-1 */ +const XK_horizlinescan3 = 0x09f0 /* U+23BB HORIZONTAL SCAN LINE-3 */ +const XK_horizlinescan5 = 0x09f1 /* U+2500 BOX DRAWINGS LIGHT HORIZONTAL */ +const XK_horizlinescan7 = 0x09f2 /* U+23BC HORIZONTAL SCAN LINE-7 */ +const XK_horizlinescan9 = 0x09f3 /* U+23BD HORIZONTAL SCAN LINE-9 */ +const XK_leftt = 0x09f4 /* U+251C BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ +const XK_rightt = 0x09f5 /* U+2524 BOX DRAWINGS LIGHT VERTICAL AND LEFT */ +const XK_bott = 0x09f6 /* U+2534 BOX DRAWINGS LIGHT UP AND HORIZONTAL */ +const XK_topt = 0x09f7 /* U+252C BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ +const XK_vertbar = 0x09f8 /* U+2502 BOX DRAWINGS LIGHT VERTICAL */ +//endif /* XK_SPECIAL */ + +/* + * Publishing + * (these are probably from a long forgotten DEC Publishing + * font that once shipped with DECwrite) + * Byte 3 = 0x0a + */ + +//ifdef XK_PUBLISHING +const XK_emspace = 0x0aa1 /* U+2003 EM SPACE */ +const XK_enspace = 0x0aa2 /* U+2002 EN SPACE */ +const XK_em3space = 0x0aa3 /* U+2004 THREE-PER-EM SPACE */ +const XK_em4space = 0x0aa4 /* U+2005 FOUR-PER-EM SPACE */ +const XK_digitspace = 0x0aa5 /* U+2007 FIGURE SPACE */ +const XK_punctspace = 0x0aa6 /* U+2008 PUNCTUATION SPACE */ +const XK_thinspace = 0x0aa7 /* U+2009 THIN SPACE */ +const XK_hairspace = 0x0aa8 /* U+200A HAIR SPACE */ +const XK_emdash = 0x0aa9 /* U+2014 EM DASH */ +const XK_endash = 0x0aaa /* U+2013 EN DASH */ +const XK_signifblank = 0x0aac /*(U+2423 OPEN BOX)*/ +const XK_ellipsis = 0x0aae /* U+2026 HORIZONTAL ELLIPSIS */ +const XK_doubbaselinedot = 0x0aaf /* U+2025 TWO DOT LEADER */ +const XK_onethird = 0x0ab0 /* U+2153 VULGAR FRACTION ONE THIRD */ +const XK_twothirds = 0x0ab1 /* U+2154 VULGAR FRACTION TWO THIRDS */ +const XK_onefifth = 0x0ab2 /* U+2155 VULGAR FRACTION ONE FIFTH */ +const XK_twofifths = 0x0ab3 /* U+2156 VULGAR FRACTION TWO FIFTHS */ +const XK_threefifths = 0x0ab4 /* U+2157 VULGAR FRACTION THREE FIFTHS */ +const XK_fourfifths = 0x0ab5 /* U+2158 VULGAR FRACTION FOUR FIFTHS */ +const XK_onesixth = 0x0ab6 /* U+2159 VULGAR FRACTION ONE SIXTH */ +const XK_fivesixths = 0x0ab7 /* U+215A VULGAR FRACTION FIVE SIXTHS */ +const XK_careof = 0x0ab8 /* U+2105 CARE OF */ +const XK_figdash = 0x0abb /* U+2012 FIGURE DASH */ +const XK_leftanglebracket = 0x0abc /*(U+27E8 MATHEMATICAL LEFT ANGLE BRACKET)*/ +const XK_decimalpoint = 0x0abd /*(U+002E FULL STOP)*/ +const XK_rightanglebracket = 0x0abe /*(U+27E9 MATHEMATICAL RIGHT ANGLE BRACKET)*/ +const XK_marker = 0x0abf +const XK_oneeighth = 0x0ac3 /* U+215B VULGAR FRACTION ONE EIGHTH */ +const XK_threeeighths = 0x0ac4 /* U+215C VULGAR FRACTION THREE EIGHTHS */ +const XK_fiveeighths = 0x0ac5 /* U+215D VULGAR FRACTION FIVE EIGHTHS */ +const XK_seveneighths = 0x0ac6 /* U+215E VULGAR FRACTION SEVEN EIGHTHS */ +const XK_trademark = 0x0ac9 /* U+2122 TRADE MARK SIGN */ +const XK_signaturemark = 0x0aca /*(U+2613 SALTIRE)*/ +const XK_trademarkincircle = 0x0acb +const XK_leftopentriangle = 0x0acc /*(U+25C1 WHITE LEFT-POINTING TRIANGLE)*/ +const XK_rightopentriangle = 0x0acd /*(U+25B7 WHITE RIGHT-POINTING TRIANGLE)*/ +const XK_emopencircle = 0x0ace /*(U+25CB WHITE CIRCLE)*/ +const XK_emopenrectangle = 0x0acf /*(U+25AF WHITE VERTICAL RECTANGLE)*/ +const XK_leftsinglequotemark = 0x0ad0 /* U+2018 LEFT SINGLE QUOTATION MARK */ +const XK_rightsinglequotemark = 0x0ad1 /* U+2019 RIGHT SINGLE QUOTATION MARK */ +const XK_leftdoublequotemark = 0x0ad2 /* U+201C LEFT DOUBLE QUOTATION MARK */ +const XK_rightdoublequotemark = 0x0ad3 /* U+201D RIGHT DOUBLE QUOTATION MARK */ +const XK_prescription = 0x0ad4 /* U+211E PRESCRIPTION TAKE */ +const XK_permille = 0x0ad5 /* U+2030 PER MILLE SIGN */ +const XK_minutes = 0x0ad6 /* U+2032 PRIME */ +const XK_seconds = 0x0ad7 /* U+2033 DOUBLE PRIME */ +const XK_latincross = 0x0ad9 /* U+271D LATIN CROSS */ +const XK_hexagram = 0x0ada +const XK_filledrectbullet = 0x0adb /*(U+25AC BLACK RECTANGLE)*/ +const XK_filledlefttribullet = 0x0adc /*(U+25C0 BLACK LEFT-POINTING TRIANGLE)*/ +const XK_filledrighttribullet = 0x0add /*(U+25B6 BLACK RIGHT-POINTING TRIANGLE)*/ +const XK_emfilledcircle = 0x0ade /*(U+25CF BLACK CIRCLE)*/ +const XK_emfilledrect = 0x0adf /*(U+25AE BLACK VERTICAL RECTANGLE)*/ +const XK_enopencircbullet = 0x0ae0 /*(U+25E6 WHITE BULLET)*/ +const XK_enopensquarebullet = 0x0ae1 /*(U+25AB WHITE SMALL SQUARE)*/ +const XK_openrectbullet = 0x0ae2 /*(U+25AD WHITE RECTANGLE)*/ +const XK_opentribulletup = 0x0ae3 /*(U+25B3 WHITE UP-POINTING TRIANGLE)*/ +const XK_opentribulletdown = 0x0ae4 /*(U+25BD WHITE DOWN-POINTING TRIANGLE)*/ +const XK_openstar = 0x0ae5 /*(U+2606 WHITE STAR)*/ +const XK_enfilledcircbullet = 0x0ae6 /*(U+2022 BULLET)*/ +const XK_enfilledsqbullet = 0x0ae7 /*(U+25AA BLACK SMALL SQUARE)*/ +const XK_filledtribulletup = 0x0ae8 /*(U+25B2 BLACK UP-POINTING TRIANGLE)*/ +const XK_filledtribulletdown = 0x0ae9 /*(U+25BC BLACK DOWN-POINTING TRIANGLE)*/ +const XK_leftpointer = 0x0aea /*(U+261C WHITE LEFT POINTING INDEX)*/ +const XK_rightpointer = 0x0aeb /*(U+261E WHITE RIGHT POINTING INDEX)*/ +const XK_club = 0x0aec /* U+2663 BLACK CLUB SUIT */ +const XK_diamond = 0x0aed /* U+2666 BLACK DIAMOND SUIT */ +const XK_heart = 0x0aee /* U+2665 BLACK HEART SUIT */ +const XK_maltesecross = 0x0af0 /* U+2720 MALTESE CROSS */ +const XK_dagger = 0x0af1 /* U+2020 DAGGER */ +const XK_doubledagger = 0x0af2 /* U+2021 DOUBLE DAGGER */ +const XK_checkmark = 0x0af3 /* U+2713 CHECK MARK */ +const XK_ballotcross = 0x0af4 /* U+2717 BALLOT X */ +const XK_musicalsharp = 0x0af5 /* U+266F MUSIC SHARP SIGN */ +const XK_musicalflat = 0x0af6 /* U+266D MUSIC FLAT SIGN */ +const XK_malesymbol = 0x0af7 /* U+2642 MALE SIGN */ +const XK_femalesymbol = 0x0af8 /* U+2640 FEMALE SIGN */ +const XK_telephone = 0x0af9 /* U+260E BLACK TELEPHONE */ +const XK_telephonerecorder = 0x0afa /* U+2315 TELEPHONE RECORDER */ +const XK_phonographcopyright = 0x0afb /* U+2117 SOUND RECORDING COPYRIGHT */ +const XK_caret = 0x0afc /* U+2038 CARET */ +const XK_singlelowquotemark = 0x0afd /* U+201A SINGLE LOW-9 QUOTATION MARK */ +const XK_doublelowquotemark = 0x0afe /* U+201E DOUBLE LOW-9 QUOTATION MARK */ +const XK_cursor = 0x0aff +//endif /* XK_PUBLISHING */ + +/* + * APL + * Byte 3 = 0x0b + */ + +//ifdef XK_APL +const XK_leftcaret = 0x0ba3 /*(U+003C LESS-THAN SIGN)*/ +const XK_rightcaret = 0x0ba6 /*(U+003E GREATER-THAN SIGN)*/ +const XK_downcaret = 0x0ba8 /*(U+2228 LOGICAL OR)*/ +const XK_upcaret = 0x0ba9 /*(U+2227 LOGICAL AND)*/ +const XK_overbar = 0x0bc0 /*(U+00AF MACRON)*/ +const XK_downtack = 0x0bc2 /* U+22A4 DOWN TACK */ +const XK_upshoe = 0x0bc3 /*(U+2229 INTERSECTION)*/ +const XK_downstile = 0x0bc4 /* U+230A LEFT FLOOR */ +const XK_underbar = 0x0bc6 /*(U+005F LOW LINE)*/ +const XK_jot = 0x0bca /* U+2218 RING OPERATOR */ +const XK_quad = 0x0bcc /* U+2395 APL FUNCTIONAL SYMBOL QUAD */ +const XK_uptack = 0x0bce /* U+22A5 UP TACK */ +const XK_circle = 0x0bcf /* U+25CB WHITE CIRCLE */ +const XK_upstile = 0x0bd3 /* U+2308 LEFT CEILING */ +const XK_downshoe = 0x0bd6 /*(U+222A UNION)*/ +const XK_rightshoe = 0x0bd8 /*(U+2283 SUPERSET OF)*/ +const XK_leftshoe = 0x0bda /*(U+2282 SUBSET OF)*/ +const XK_lefttack = 0x0bdc /* U+22A3 LEFT TACK */ +const XK_righttack = 0x0bfc /* U+22A2 RIGHT TACK */ +//endif /* XK_APL */ + +/* + * Hebrew + * Byte 3 = 0x0c + */ + +//ifdef XK_HEBREW +const XK_hebrew_doublelowline = 0x0cdf /* U+2017 DOUBLE LOW LINE */ +const XK_hebrew_aleph = 0x0ce0 /* U+05D0 HEBREW LETTER ALEF */ +const XK_hebrew_bet = 0x0ce1 /* U+05D1 HEBREW LETTER BET */ +const XK_hebrew_beth = 0x0ce1 /* deprecated */ +const XK_hebrew_gimel = 0x0ce2 /* U+05D2 HEBREW LETTER GIMEL */ +const XK_hebrew_gimmel = 0x0ce2 /* deprecated */ +const XK_hebrew_dalet = 0x0ce3 /* U+05D3 HEBREW LETTER DALET */ +const XK_hebrew_daleth = 0x0ce3 /* deprecated */ +const XK_hebrew_he = 0x0ce4 /* U+05D4 HEBREW LETTER HE */ +const XK_hebrew_waw = 0x0ce5 /* U+05D5 HEBREW LETTER VAV */ +const XK_hebrew_zain = 0x0ce6 /* U+05D6 HEBREW LETTER ZAYIN */ +const XK_hebrew_zayin = 0x0ce6 /* deprecated */ +const XK_hebrew_chet = 0x0ce7 /* U+05D7 HEBREW LETTER HET */ +const XK_hebrew_het = 0x0ce7 /* deprecated */ +const XK_hebrew_tet = 0x0ce8 /* U+05D8 HEBREW LETTER TET */ +const XK_hebrew_teth = 0x0ce8 /* deprecated */ +const XK_hebrew_yod = 0x0ce9 /* U+05D9 HEBREW LETTER YOD */ +const XK_hebrew_finalkaph = 0x0cea /* U+05DA HEBREW LETTER FINAL KAF */ +const XK_hebrew_kaph = 0x0ceb /* U+05DB HEBREW LETTER KAF */ +const XK_hebrew_lamed = 0x0cec /* U+05DC HEBREW LETTER LAMED */ +const XK_hebrew_finalmem = 0x0ced /* U+05DD HEBREW LETTER FINAL MEM */ +const XK_hebrew_mem = 0x0cee /* U+05DE HEBREW LETTER MEM */ +const XK_hebrew_finalnun = 0x0cef /* U+05DF HEBREW LETTER FINAL NUN */ +const XK_hebrew_nun = 0x0cf0 /* U+05E0 HEBREW LETTER NUN */ +const XK_hebrew_samech = 0x0cf1 /* U+05E1 HEBREW LETTER SAMEKH */ +const XK_hebrew_samekh = 0x0cf1 /* deprecated */ +const XK_hebrew_ayin = 0x0cf2 /* U+05E2 HEBREW LETTER AYIN */ +const XK_hebrew_finalpe = 0x0cf3 /* U+05E3 HEBREW LETTER FINAL PE */ +const XK_hebrew_pe = 0x0cf4 /* U+05E4 HEBREW LETTER PE */ +const XK_hebrew_finalzade = 0x0cf5 /* U+05E5 HEBREW LETTER FINAL TSADI */ +const XK_hebrew_finalzadi = 0x0cf5 /* deprecated */ +const XK_hebrew_zade = 0x0cf6 /* U+05E6 HEBREW LETTER TSADI */ +const XK_hebrew_zadi = 0x0cf6 /* deprecated */ +const XK_hebrew_qoph = 0x0cf7 /* U+05E7 HEBREW LETTER QOF */ +const XK_hebrew_kuf = 0x0cf7 /* deprecated */ +const XK_hebrew_resh = 0x0cf8 /* U+05E8 HEBREW LETTER RESH */ +const XK_hebrew_shin = 0x0cf9 /* U+05E9 HEBREW LETTER SHIN */ +const XK_hebrew_taw = 0x0cfa /* U+05EA HEBREW LETTER TAV */ +const XK_hebrew_taf = 0x0cfa /* deprecated */ +const XK_Hebrew_switch = 0xff7e /* Alias for mode_switch */ +//endif /* XK_HEBREW */ + +/* + * Thai + * Byte 3 = 0x0d + */ + +//ifdef XK_THAI +const XK_Thai_kokai = 0x0da1 /* U+0E01 THAI CHARACTER KO KAI */ +const XK_Thai_khokhai = 0x0da2 /* U+0E02 THAI CHARACTER KHO KHAI */ +const XK_Thai_khokhuat = 0x0da3 /* U+0E03 THAI CHARACTER KHO KHUAT */ +const XK_Thai_khokhwai = 0x0da4 /* U+0E04 THAI CHARACTER KHO KHWAI */ +const XK_Thai_khokhon = 0x0da5 /* U+0E05 THAI CHARACTER KHO KHON */ +const XK_Thai_khorakhang = 0x0da6 /* U+0E06 THAI CHARACTER KHO RAKHANG */ +const XK_Thai_ngongu = 0x0da7 /* U+0E07 THAI CHARACTER NGO NGU */ +const XK_Thai_chochan = 0x0da8 /* U+0E08 THAI CHARACTER CHO CHAN */ +const XK_Thai_choching = 0x0da9 /* U+0E09 THAI CHARACTER CHO CHING */ +const XK_Thai_chochang = 0x0daa /* U+0E0A THAI CHARACTER CHO CHANG */ +const XK_Thai_soso = 0x0dab /* U+0E0B THAI CHARACTER SO SO */ +const XK_Thai_chochoe = 0x0dac /* U+0E0C THAI CHARACTER CHO CHOE */ +const XK_Thai_yoying = 0x0dad /* U+0E0D THAI CHARACTER YO YING */ +const XK_Thai_dochada = 0x0dae /* U+0E0E THAI CHARACTER DO CHADA */ +const XK_Thai_topatak = 0x0daf /* U+0E0F THAI CHARACTER TO PATAK */ +const XK_Thai_thothan = 0x0db0 /* U+0E10 THAI CHARACTER THO THAN */ +const XK_Thai_thonangmontho = 0x0db1 /* U+0E11 THAI CHARACTER THO NANGMONTHO */ +const XK_Thai_thophuthao = 0x0db2 /* U+0E12 THAI CHARACTER THO PHUTHAO */ +const XK_Thai_nonen = 0x0db3 /* U+0E13 THAI CHARACTER NO NEN */ +const XK_Thai_dodek = 0x0db4 /* U+0E14 THAI CHARACTER DO DEK */ +const XK_Thai_totao = 0x0db5 /* U+0E15 THAI CHARACTER TO TAO */ +const XK_Thai_thothung = 0x0db6 /* U+0E16 THAI CHARACTER THO THUNG */ +const XK_Thai_thothahan = 0x0db7 /* U+0E17 THAI CHARACTER THO THAHAN */ +const XK_Thai_thothong = 0x0db8 /* U+0E18 THAI CHARACTER THO THONG */ +const XK_Thai_nonu = 0x0db9 /* U+0E19 THAI CHARACTER NO NU */ +const XK_Thai_bobaimai = 0x0dba /* U+0E1A THAI CHARACTER BO BAIMAI */ +const XK_Thai_popla = 0x0dbb /* U+0E1B THAI CHARACTER PO PLA */ +const XK_Thai_phophung = 0x0dbc /* U+0E1C THAI CHARACTER PHO PHUNG */ +const XK_Thai_fofa = 0x0dbd /* U+0E1D THAI CHARACTER FO FA */ +const XK_Thai_phophan = 0x0dbe /* U+0E1E THAI CHARACTER PHO PHAN */ +const XK_Thai_fofan = 0x0dbf /* U+0E1F THAI CHARACTER FO FAN */ +const XK_Thai_phosamphao = 0x0dc0 /* U+0E20 THAI CHARACTER PHO SAMPHAO */ +const XK_Thai_moma = 0x0dc1 /* U+0E21 THAI CHARACTER MO MA */ +const XK_Thai_yoyak = 0x0dc2 /* U+0E22 THAI CHARACTER YO YAK */ +const XK_Thai_rorua = 0x0dc3 /* U+0E23 THAI CHARACTER RO RUA */ +const XK_Thai_ru = 0x0dc4 /* U+0E24 THAI CHARACTER RU */ +const XK_Thai_loling = 0x0dc5 /* U+0E25 THAI CHARACTER LO LING */ +const XK_Thai_lu = 0x0dc6 /* U+0E26 THAI CHARACTER LU */ +const XK_Thai_wowaen = 0x0dc7 /* U+0E27 THAI CHARACTER WO WAEN */ +const XK_Thai_sosala = 0x0dc8 /* U+0E28 THAI CHARACTER SO SALA */ +const XK_Thai_sorusi = 0x0dc9 /* U+0E29 THAI CHARACTER SO RUSI */ +const XK_Thai_sosua = 0x0dca /* U+0E2A THAI CHARACTER SO SUA */ +const XK_Thai_hohip = 0x0dcb /* U+0E2B THAI CHARACTER HO HIP */ +const XK_Thai_lochula = 0x0dcc /* U+0E2C THAI CHARACTER LO CHULA */ +const XK_Thai_oang = 0x0dcd /* U+0E2D THAI CHARACTER O ANG */ +const XK_Thai_honokhuk = 0x0dce /* U+0E2E THAI CHARACTER HO NOKHUK */ +const XK_Thai_paiyannoi = 0x0dcf /* U+0E2F THAI CHARACTER PAIYANNOI */ +const XK_Thai_saraa = 0x0dd0 /* U+0E30 THAI CHARACTER SARA A */ +const XK_Thai_maihanakat = 0x0dd1 /* U+0E31 THAI CHARACTER MAI HAN-AKAT */ +const XK_Thai_saraaa = 0x0dd2 /* U+0E32 THAI CHARACTER SARA AA */ +const XK_Thai_saraam = 0x0dd3 /* U+0E33 THAI CHARACTER SARA AM */ +const XK_Thai_sarai = 0x0dd4 /* U+0E34 THAI CHARACTER SARA I */ +const XK_Thai_saraii = 0x0dd5 /* U+0E35 THAI CHARACTER SARA II */ +const XK_Thai_saraue = 0x0dd6 /* U+0E36 THAI CHARACTER SARA UE */ +const XK_Thai_sarauee = 0x0dd7 /* U+0E37 THAI CHARACTER SARA UEE */ +const XK_Thai_sarau = 0x0dd8 /* U+0E38 THAI CHARACTER SARA U */ +const XK_Thai_sarauu = 0x0dd9 /* U+0E39 THAI CHARACTER SARA UU */ +const XK_Thai_phinthu = 0x0dda /* U+0E3A THAI CHARACTER PHINTHU */ +const XK_Thai_maihanakat_maitho = 0x0dde +const XK_Thai_baht = 0x0ddf /* U+0E3F THAI CURRENCY SYMBOL BAHT */ +const XK_Thai_sarae = 0x0de0 /* U+0E40 THAI CHARACTER SARA E */ +const XK_Thai_saraae = 0x0de1 /* U+0E41 THAI CHARACTER SARA AE */ +const XK_Thai_sarao = 0x0de2 /* U+0E42 THAI CHARACTER SARA O */ +const XK_Thai_saraaimaimuan = 0x0de3 /* U+0E43 THAI CHARACTER SARA AI MAIMUAN */ +const XK_Thai_saraaimaimalai = 0x0de4 /* U+0E44 THAI CHARACTER SARA AI MAIMALAI */ +const XK_Thai_lakkhangyao = 0x0de5 /* U+0E45 THAI CHARACTER LAKKHANGYAO */ +const XK_Thai_maiyamok = 0x0de6 /* U+0E46 THAI CHARACTER MAIYAMOK */ +const XK_Thai_maitaikhu = 0x0de7 /* U+0E47 THAI CHARACTER MAITAIKHU */ +const XK_Thai_maiek = 0x0de8 /* U+0E48 THAI CHARACTER MAI EK */ +const XK_Thai_maitho = 0x0de9 /* U+0E49 THAI CHARACTER MAI THO */ +const XK_Thai_maitri = 0x0dea /* U+0E4A THAI CHARACTER MAI TRI */ +const XK_Thai_maichattawa = 0x0deb /* U+0E4B THAI CHARACTER MAI CHATTAWA */ +const XK_Thai_thanthakhat = 0x0dec /* U+0E4C THAI CHARACTER THANTHAKHAT */ +const XK_Thai_nikhahit = 0x0ded /* U+0E4D THAI CHARACTER NIKHAHIT */ +const XK_Thai_leksun = 0x0df0 /* U+0E50 THAI DIGIT ZERO */ +const XK_Thai_leknung = 0x0df1 /* U+0E51 THAI DIGIT ONE */ +const XK_Thai_leksong = 0x0df2 /* U+0E52 THAI DIGIT TWO */ +const XK_Thai_leksam = 0x0df3 /* U+0E53 THAI DIGIT THREE */ +const XK_Thai_leksi = 0x0df4 /* U+0E54 THAI DIGIT FOUR */ +const XK_Thai_lekha = 0x0df5 /* U+0E55 THAI DIGIT FIVE */ +const XK_Thai_lekhok = 0x0df6 /* U+0E56 THAI DIGIT SIX */ +const XK_Thai_lekchet = 0x0df7 /* U+0E57 THAI DIGIT SEVEN */ +const XK_Thai_lekpaet = 0x0df8 /* U+0E58 THAI DIGIT EIGHT */ +const XK_Thai_lekkao = 0x0df9 /* U+0E59 THAI DIGIT NINE */ +//endif /* XK_THAI */ + +/* + * Korean + * Byte 3 = 0x0e + */ + +//ifdef XK_KOREAN + +const XK_Hangul = 0xff31 /* Hangul start/stop(toggle) */ +const XK_Hangul_Start = 0xff32 /* Hangul start */ +const XK_Hangul_End = 0xff33 /* Hangul end, English start */ +const XK_Hangul_Hanja = 0xff34 /* Start Hangul->Hanja Conversion */ +const XK_Hangul_Jamo = 0xff35 /* Hangul Jamo mode */ +const XK_Hangul_Romaja = 0xff36 /* Hangul Romaja mode */ +const XK_Hangul_Codeinput = 0xff37 /* Hangul code input mode */ +const XK_Hangul_Jeonja = 0xff38 /* Jeonja mode */ +const XK_Hangul_Banja = 0xff39 /* Banja mode */ +const XK_Hangul_PreHanja = 0xff3a /* Pre Hanja conversion */ +const XK_Hangul_PostHanja = 0xff3b /* Post Hanja conversion */ +const XK_Hangul_SingleCandidate = 0xff3c /* Single candidate */ +const XK_Hangul_MultipleCandidate = 0xff3d /* Multiple candidate */ +const XK_Hangul_PreviousCandidate = 0xff3e /* Previous candidate */ +const XK_Hangul_Special = 0xff3f /* Special symbols */ +const XK_Hangul_switch = 0xff7e /* Alias for mode_switch */ + +/* Hangul Consonant Characters */ +const XK_Hangul_Kiyeog = 0x0ea1 +const XK_Hangul_SsangKiyeog = 0x0ea2 +const XK_Hangul_KiyeogSios = 0x0ea3 +const XK_Hangul_Nieun = 0x0ea4 +const XK_Hangul_NieunJieuj = 0x0ea5 +const XK_Hangul_NieunHieuh = 0x0ea6 +const XK_Hangul_Dikeud = 0x0ea7 +const XK_Hangul_SsangDikeud = 0x0ea8 +const XK_Hangul_Rieul = 0x0ea9 +const XK_Hangul_RieulKiyeog = 0x0eaa +const XK_Hangul_RieulMieum = 0x0eab +const XK_Hangul_RieulPieub = 0x0eac +const XK_Hangul_RieulSios = 0x0ead +const XK_Hangul_RieulTieut = 0x0eae +const XK_Hangul_RieulPhieuf = 0x0eaf +const XK_Hangul_RieulHieuh = 0x0eb0 +const XK_Hangul_Mieum = 0x0eb1 +const XK_Hangul_Pieub = 0x0eb2 +const XK_Hangul_SsangPieub = 0x0eb3 +const XK_Hangul_PieubSios = 0x0eb4 +const XK_Hangul_Sios = 0x0eb5 +const XK_Hangul_SsangSios = 0x0eb6 +const XK_Hangul_Ieung = 0x0eb7 +const XK_Hangul_Jieuj = 0x0eb8 +const XK_Hangul_SsangJieuj = 0x0eb9 +const XK_Hangul_Cieuc = 0x0eba +const XK_Hangul_Khieuq = 0x0ebb +const XK_Hangul_Tieut = 0x0ebc +const XK_Hangul_Phieuf = 0x0ebd +const XK_Hangul_Hieuh = 0x0ebe + +/* Hangul Vowel Characters */ +const XK_Hangul_A = 0x0ebf +const XK_Hangul_AE = 0x0ec0 +const XK_Hangul_YA = 0x0ec1 +const XK_Hangul_YAE = 0x0ec2 +const XK_Hangul_EO = 0x0ec3 +const XK_Hangul_E = 0x0ec4 +const XK_Hangul_YEO = 0x0ec5 +const XK_Hangul_YE = 0x0ec6 +const XK_Hangul_O = 0x0ec7 +const XK_Hangul_WA = 0x0ec8 +const XK_Hangul_WAE = 0x0ec9 +const XK_Hangul_OE = 0x0eca +const XK_Hangul_YO = 0x0ecb +const XK_Hangul_U = 0x0ecc +const XK_Hangul_WEO = 0x0ecd +const XK_Hangul_WE = 0x0ece +const XK_Hangul_WI = 0x0ecf +const XK_Hangul_YU = 0x0ed0 +const XK_Hangul_EU = 0x0ed1 +const XK_Hangul_YI = 0x0ed2 +const XK_Hangul_I = 0x0ed3 + +/* Hangul syllable-final (JongSeong) Characters */ +const XK_Hangul_J_Kiyeog = 0x0ed4 +const XK_Hangul_J_SsangKiyeog = 0x0ed5 +const XK_Hangul_J_KiyeogSios = 0x0ed6 +const XK_Hangul_J_Nieun = 0x0ed7 +const XK_Hangul_J_NieunJieuj = 0x0ed8 +const XK_Hangul_J_NieunHieuh = 0x0ed9 +const XK_Hangul_J_Dikeud = 0x0eda +const XK_Hangul_J_Rieul = 0x0edb +const XK_Hangul_J_RieulKiyeog = 0x0edc +const XK_Hangul_J_RieulMieum = 0x0edd +const XK_Hangul_J_RieulPieub = 0x0ede +const XK_Hangul_J_RieulSios = 0x0edf +const XK_Hangul_J_RieulTieut = 0x0ee0 +const XK_Hangul_J_RieulPhieuf = 0x0ee1 +const XK_Hangul_J_RieulHieuh = 0x0ee2 +const XK_Hangul_J_Mieum = 0x0ee3 +const XK_Hangul_J_Pieub = 0x0ee4 +const XK_Hangul_J_PieubSios = 0x0ee5 +const XK_Hangul_J_Sios = 0x0ee6 +const XK_Hangul_J_SsangSios = 0x0ee7 +const XK_Hangul_J_Ieung = 0x0ee8 +const XK_Hangul_J_Jieuj = 0x0ee9 +const XK_Hangul_J_Cieuc = 0x0eea +const XK_Hangul_J_Khieuq = 0x0eeb +const XK_Hangul_J_Tieut = 0x0eec +const XK_Hangul_J_Phieuf = 0x0eed +const XK_Hangul_J_Hieuh = 0x0eee + +/* Ancient Hangul Consonant Characters */ +const XK_Hangul_RieulYeorinHieuh = 0x0eef +const XK_Hangul_SunkyeongeumMieum = 0x0ef0 +const XK_Hangul_SunkyeongeumPieub = 0x0ef1 +const XK_Hangul_PanSios = 0x0ef2 +const XK_Hangul_KkogjiDalrinIeung = 0x0ef3 +const XK_Hangul_SunkyeongeumPhieuf = 0x0ef4 +const XK_Hangul_YeorinHieuh = 0x0ef5 + +/* Ancient Hangul Vowel Characters */ +const XK_Hangul_AraeA = 0x0ef6 +const XK_Hangul_AraeAE = 0x0ef7 + +/* Ancient Hangul syllable-final (JongSeong) Characters */ +const XK_Hangul_J_PanSios = 0x0ef8 +const XK_Hangul_J_KkogjiDalrinIeung = 0x0ef9 +const XK_Hangul_J_YeorinHieuh = 0x0efa + +/* Korean currency symbol */ +const XK_Korean_Won = 0x0eff /*(U+20A9 WON SIGN)*/ + +//endif /* XK_KOREAN */ + +/* + * Armenian + */ + +//ifdef XK_ARMENIAN +const XK_Armenian_ligature_ew = 0x1000587 /* U+0587 ARMENIAN SMALL LIGATURE ECH YIWN */ +const XK_Armenian_full_stop = 0x1000589 /* U+0589 ARMENIAN FULL STOP */ +const XK_Armenian_verjaket = 0x1000589 /* U+0589 ARMENIAN FULL STOP */ +const XK_Armenian_separation_mark = 0x100055d /* U+055D ARMENIAN COMMA */ +const XK_Armenian_but = 0x100055d /* U+055D ARMENIAN COMMA */ +const XK_Armenian_hyphen = 0x100058a /* U+058A ARMENIAN HYPHEN */ +const XK_Armenian_yentamna = 0x100058a /* U+058A ARMENIAN HYPHEN */ +const XK_Armenian_exclam = 0x100055c /* U+055C ARMENIAN EXCLAMATION MARK */ +const XK_Armenian_amanak = 0x100055c /* U+055C ARMENIAN EXCLAMATION MARK */ +const XK_Armenian_accent = 0x100055b /* U+055B ARMENIAN EMPHASIS MARK */ +const XK_Armenian_shesht = 0x100055b /* U+055B ARMENIAN EMPHASIS MARK */ +const XK_Armenian_question = 0x100055e /* U+055E ARMENIAN QUESTION MARK */ +const XK_Armenian_paruyk = 0x100055e /* U+055E ARMENIAN QUESTION MARK */ +const XK_Armenian_AYB = 0x1000531 /* U+0531 ARMENIAN CAPITAL LETTER AYB */ +const XK_Armenian_ayb = 0x1000561 /* U+0561 ARMENIAN SMALL LETTER AYB */ +const XK_Armenian_BEN = 0x1000532 /* U+0532 ARMENIAN CAPITAL LETTER BEN */ +const XK_Armenian_ben = 0x1000562 /* U+0562 ARMENIAN SMALL LETTER BEN */ +const XK_Armenian_GIM = 0x1000533 /* U+0533 ARMENIAN CAPITAL LETTER GIM */ +const XK_Armenian_gim = 0x1000563 /* U+0563 ARMENIAN SMALL LETTER GIM */ +const XK_Armenian_DA = 0x1000534 /* U+0534 ARMENIAN CAPITAL LETTER DA */ +const XK_Armenian_da = 0x1000564 /* U+0564 ARMENIAN SMALL LETTER DA */ +const XK_Armenian_YECH = 0x1000535 /* U+0535 ARMENIAN CAPITAL LETTER ECH */ +const XK_Armenian_yech = 0x1000565 /* U+0565 ARMENIAN SMALL LETTER ECH */ +const XK_Armenian_ZA = 0x1000536 /* U+0536 ARMENIAN CAPITAL LETTER ZA */ +const XK_Armenian_za = 0x1000566 /* U+0566 ARMENIAN SMALL LETTER ZA */ +const XK_Armenian_E = 0x1000537 /* U+0537 ARMENIAN CAPITAL LETTER EH */ +const XK_Armenian_e = 0x1000567 /* U+0567 ARMENIAN SMALL LETTER EH */ +const XK_Armenian_AT = 0x1000538 /* U+0538 ARMENIAN CAPITAL LETTER ET */ +const XK_Armenian_at = 0x1000568 /* U+0568 ARMENIAN SMALL LETTER ET */ +const XK_Armenian_TO = 0x1000539 /* U+0539 ARMENIAN CAPITAL LETTER TO */ +const XK_Armenian_to = 0x1000569 /* U+0569 ARMENIAN SMALL LETTER TO */ +const XK_Armenian_ZHE = 0x100053a /* U+053A ARMENIAN CAPITAL LETTER ZHE */ +const XK_Armenian_zhe = 0x100056a /* U+056A ARMENIAN SMALL LETTER ZHE */ +const XK_Armenian_INI = 0x100053b /* U+053B ARMENIAN CAPITAL LETTER INI */ +const XK_Armenian_ini = 0x100056b /* U+056B ARMENIAN SMALL LETTER INI */ +const XK_Armenian_LYUN = 0x100053c /* U+053C ARMENIAN CAPITAL LETTER LIWN */ +const XK_Armenian_lyun = 0x100056c /* U+056C ARMENIAN SMALL LETTER LIWN */ +const XK_Armenian_KHE = 0x100053d /* U+053D ARMENIAN CAPITAL LETTER XEH */ +const XK_Armenian_khe = 0x100056d /* U+056D ARMENIAN SMALL LETTER XEH */ +const XK_Armenian_TSA = 0x100053e /* U+053E ARMENIAN CAPITAL LETTER CA */ +const XK_Armenian_tsa = 0x100056e /* U+056E ARMENIAN SMALL LETTER CA */ +const XK_Armenian_KEN = 0x100053f /* U+053F ARMENIAN CAPITAL LETTER KEN */ +const XK_Armenian_ken = 0x100056f /* U+056F ARMENIAN SMALL LETTER KEN */ +const XK_Armenian_HO = 0x1000540 /* U+0540 ARMENIAN CAPITAL LETTER HO */ +const XK_Armenian_ho = 0x1000570 /* U+0570 ARMENIAN SMALL LETTER HO */ +const XK_Armenian_DZA = 0x1000541 /* U+0541 ARMENIAN CAPITAL LETTER JA */ +const XK_Armenian_dza = 0x1000571 /* U+0571 ARMENIAN SMALL LETTER JA */ +const XK_Armenian_GHAT = 0x1000542 /* U+0542 ARMENIAN CAPITAL LETTER GHAD */ +const XK_Armenian_ghat = 0x1000572 /* U+0572 ARMENIAN SMALL LETTER GHAD */ +const XK_Armenian_TCHE = 0x1000543 /* U+0543 ARMENIAN CAPITAL LETTER CHEH */ +const XK_Armenian_tche = 0x1000573 /* U+0573 ARMENIAN SMALL LETTER CHEH */ +const XK_Armenian_MEN = 0x1000544 /* U+0544 ARMENIAN CAPITAL LETTER MEN */ +const XK_Armenian_men = 0x1000574 /* U+0574 ARMENIAN SMALL LETTER MEN */ +const XK_Armenian_HI = 0x1000545 /* U+0545 ARMENIAN CAPITAL LETTER YI */ +const XK_Armenian_hi = 0x1000575 /* U+0575 ARMENIAN SMALL LETTER YI */ +const XK_Armenian_NU = 0x1000546 /* U+0546 ARMENIAN CAPITAL LETTER NOW */ +const XK_Armenian_nu = 0x1000576 /* U+0576 ARMENIAN SMALL LETTER NOW */ +const XK_Armenian_SHA = 0x1000547 /* U+0547 ARMENIAN CAPITAL LETTER SHA */ +const XK_Armenian_sha = 0x1000577 /* U+0577 ARMENIAN SMALL LETTER SHA */ +const XK_Armenian_VO = 0x1000548 /* U+0548 ARMENIAN CAPITAL LETTER VO */ +const XK_Armenian_vo = 0x1000578 /* U+0578 ARMENIAN SMALL LETTER VO */ +const XK_Armenian_CHA = 0x1000549 /* U+0549 ARMENIAN CAPITAL LETTER CHA */ +const XK_Armenian_cha = 0x1000579 /* U+0579 ARMENIAN SMALL LETTER CHA */ +const XK_Armenian_PE = 0x100054a /* U+054A ARMENIAN CAPITAL LETTER PEH */ +const XK_Armenian_pe = 0x100057a /* U+057A ARMENIAN SMALL LETTER PEH */ +const XK_Armenian_JE = 0x100054b /* U+054B ARMENIAN CAPITAL LETTER JHEH */ +const XK_Armenian_je = 0x100057b /* U+057B ARMENIAN SMALL LETTER JHEH */ +const XK_Armenian_RA = 0x100054c /* U+054C ARMENIAN CAPITAL LETTER RA */ +const XK_Armenian_ra = 0x100057c /* U+057C ARMENIAN SMALL LETTER RA */ +const XK_Armenian_SE = 0x100054d /* U+054D ARMENIAN CAPITAL LETTER SEH */ +const XK_Armenian_se = 0x100057d /* U+057D ARMENIAN SMALL LETTER SEH */ +const XK_Armenian_VEV = 0x100054e /* U+054E ARMENIAN CAPITAL LETTER VEW */ +const XK_Armenian_vev = 0x100057e /* U+057E ARMENIAN SMALL LETTER VEW */ +const XK_Armenian_TYUN = 0x100054f /* U+054F ARMENIAN CAPITAL LETTER TIWN */ +const XK_Armenian_tyun = 0x100057f /* U+057F ARMENIAN SMALL LETTER TIWN */ +const XK_Armenian_RE = 0x1000550 /* U+0550 ARMENIAN CAPITAL LETTER REH */ +const XK_Armenian_re = 0x1000580 /* U+0580 ARMENIAN SMALL LETTER REH */ +const XK_Armenian_TSO = 0x1000551 /* U+0551 ARMENIAN CAPITAL LETTER CO */ +const XK_Armenian_tso = 0x1000581 /* U+0581 ARMENIAN SMALL LETTER CO */ +const XK_Armenian_VYUN = 0x1000552 /* U+0552 ARMENIAN CAPITAL LETTER YIWN */ +const XK_Armenian_vyun = 0x1000582 /* U+0582 ARMENIAN SMALL LETTER YIWN */ +const XK_Armenian_PYUR = 0x1000553 /* U+0553 ARMENIAN CAPITAL LETTER PIWR */ +const XK_Armenian_pyur = 0x1000583 /* U+0583 ARMENIAN SMALL LETTER PIWR */ +const XK_Armenian_KE = 0x1000554 /* U+0554 ARMENIAN CAPITAL LETTER KEH */ +const XK_Armenian_ke = 0x1000584 /* U+0584 ARMENIAN SMALL LETTER KEH */ +const XK_Armenian_O = 0x1000555 /* U+0555 ARMENIAN CAPITAL LETTER OH */ +const XK_Armenian_o = 0x1000585 /* U+0585 ARMENIAN SMALL LETTER OH */ +const XK_Armenian_FE = 0x1000556 /* U+0556 ARMENIAN CAPITAL LETTER FEH */ +const XK_Armenian_fe = 0x1000586 /* U+0586 ARMENIAN SMALL LETTER FEH */ +const XK_Armenian_apostrophe = 0x100055a /* U+055A ARMENIAN APOSTROPHE */ +//endif /* XK_ARMENIAN */ + +/* + * Georgian + */ + +//ifdef XK_GEORGIAN +const XK_Georgian_an = 0x10010d0 /* U+10D0 GEORGIAN LETTER AN */ +const XK_Georgian_ban = 0x10010d1 /* U+10D1 GEORGIAN LETTER BAN */ +const XK_Georgian_gan = 0x10010d2 /* U+10D2 GEORGIAN LETTER GAN */ +const XK_Georgian_don = 0x10010d3 /* U+10D3 GEORGIAN LETTER DON */ +const XK_Georgian_en = 0x10010d4 /* U+10D4 GEORGIAN LETTER EN */ +const XK_Georgian_vin = 0x10010d5 /* U+10D5 GEORGIAN LETTER VIN */ +const XK_Georgian_zen = 0x10010d6 /* U+10D6 GEORGIAN LETTER ZEN */ +const XK_Georgian_tan = 0x10010d7 /* U+10D7 GEORGIAN LETTER TAN */ +const XK_Georgian_in = 0x10010d8 /* U+10D8 GEORGIAN LETTER IN */ +const XK_Georgian_kan = 0x10010d9 /* U+10D9 GEORGIAN LETTER KAN */ +const XK_Georgian_las = 0x10010da /* U+10DA GEORGIAN LETTER LAS */ +const XK_Georgian_man = 0x10010db /* U+10DB GEORGIAN LETTER MAN */ +const XK_Georgian_nar = 0x10010dc /* U+10DC GEORGIAN LETTER NAR */ +const XK_Georgian_on = 0x10010dd /* U+10DD GEORGIAN LETTER ON */ +const XK_Georgian_par = 0x10010de /* U+10DE GEORGIAN LETTER PAR */ +const XK_Georgian_zhar = 0x10010df /* U+10DF GEORGIAN LETTER ZHAR */ +const XK_Georgian_rae = 0x10010e0 /* U+10E0 GEORGIAN LETTER RAE */ +const XK_Georgian_san = 0x10010e1 /* U+10E1 GEORGIAN LETTER SAN */ +const XK_Georgian_tar = 0x10010e2 /* U+10E2 GEORGIAN LETTER TAR */ +const XK_Georgian_un = 0x10010e3 /* U+10E3 GEORGIAN LETTER UN */ +const XK_Georgian_phar = 0x10010e4 /* U+10E4 GEORGIAN LETTER PHAR */ +const XK_Georgian_khar = 0x10010e5 /* U+10E5 GEORGIAN LETTER KHAR */ +const XK_Georgian_ghan = 0x10010e6 /* U+10E6 GEORGIAN LETTER GHAN */ +const XK_Georgian_qar = 0x10010e7 /* U+10E7 GEORGIAN LETTER QAR */ +const XK_Georgian_shin = 0x10010e8 /* U+10E8 GEORGIAN LETTER SHIN */ +const XK_Georgian_chin = 0x10010e9 /* U+10E9 GEORGIAN LETTER CHIN */ +const XK_Georgian_can = 0x10010ea /* U+10EA GEORGIAN LETTER CAN */ +const XK_Georgian_jil = 0x10010eb /* U+10EB GEORGIAN LETTER JIL */ +const XK_Georgian_cil = 0x10010ec /* U+10EC GEORGIAN LETTER CIL */ +const XK_Georgian_char = 0x10010ed /* U+10ED GEORGIAN LETTER CHAR */ +const XK_Georgian_xan = 0x10010ee /* U+10EE GEORGIAN LETTER XAN */ +const XK_Georgian_jhan = 0x10010ef /* U+10EF GEORGIAN LETTER JHAN */ +const XK_Georgian_hae = 0x10010f0 /* U+10F0 GEORGIAN LETTER HAE */ +const XK_Georgian_he = 0x10010f1 /* U+10F1 GEORGIAN LETTER HE */ +const XK_Georgian_hie = 0x10010f2 /* U+10F2 GEORGIAN LETTER HIE */ +const XK_Georgian_we = 0x10010f3 /* U+10F3 GEORGIAN LETTER WE */ +const XK_Georgian_har = 0x10010f4 /* U+10F4 GEORGIAN LETTER HAR */ +const XK_Georgian_hoe = 0x10010f5 /* U+10F5 GEORGIAN LETTER HOE */ +const XK_Georgian_fi = 0x10010f6 /* U+10F6 GEORGIAN LETTER FI */ +//endif /* XK_GEORGIAN */ + +/* + * Azeri (and other Turkic or Caucasian languages) + */ + +//ifdef XK_CAUCASUS +/* latin */ +const XK_Xabovedot = 0x1001e8a /* U+1E8A LATIN CAPITAL LETTER X WITH DOT ABOVE */ +const XK_Ibreve = 0x100012c /* U+012C LATIN CAPITAL LETTER I WITH BREVE */ +const XK_Zstroke = 0x10001b5 /* U+01B5 LATIN CAPITAL LETTER Z WITH STROKE */ +const XK_Gcaron = 0x10001e6 /* U+01E6 LATIN CAPITAL LETTER G WITH CARON */ +const XK_Ocaron = 0x10001d1 /* U+01D2 LATIN CAPITAL LETTER O WITH CARON */ +const XK_Obarred = 0x100019f /* U+019F LATIN CAPITAL LETTER O WITH MIDDLE TILDE */ +const XK_xabovedot = 0x1001e8b /* U+1E8B LATIN SMALL LETTER X WITH DOT ABOVE */ +const XK_ibreve = 0x100012d /* U+012D LATIN SMALL LETTER I WITH BREVE */ +const XK_zstroke = 0x10001b6 /* U+01B6 LATIN SMALL LETTER Z WITH STROKE */ +const XK_gcaron = 0x10001e7 /* U+01E7 LATIN SMALL LETTER G WITH CARON */ +const XK_ocaron = 0x10001d2 /* U+01D2 LATIN SMALL LETTER O WITH CARON */ +const XK_obarred = 0x1000275 /* U+0275 LATIN SMALL LETTER BARRED O */ +const XK_SCHWA = 0x100018f /* U+018F LATIN CAPITAL LETTER SCHWA */ +const XK_schwa = 0x1000259 /* U+0259 LATIN SMALL LETTER SCHWA */ +const XK_EZH = 0x10001b7 /* U+01B7 LATIN CAPITAL LETTER EZH */ +const XK_ezh = 0x1000292 /* U+0292 LATIN SMALL LETTER EZH */ +/* those are not really Caucasus */ +/* For Inupiak */ +const XK_Lbelowdot = 0x1001e36 /* U+1E36 LATIN CAPITAL LETTER L WITH DOT BELOW */ +const XK_lbelowdot = 0x1001e37 /* U+1E37 LATIN SMALL LETTER L WITH DOT BELOW */ +//endif /* XK_CAUCASUS */ + +/* + * Vietnamese + */ + +//ifdef XK_VIETNAMESE +const XK_Abelowdot = 0x1001ea0 /* U+1EA0 LATIN CAPITAL LETTER A WITH DOT BELOW */ +const XK_abelowdot = 0x1001ea1 /* U+1EA1 LATIN SMALL LETTER A WITH DOT BELOW */ +const XK_Ahook = 0x1001ea2 /* U+1EA2 LATIN CAPITAL LETTER A WITH HOOK ABOVE */ +const XK_ahook = 0x1001ea3 /* U+1EA3 LATIN SMALL LETTER A WITH HOOK ABOVE */ +const XK_Acircumflexacute = 0x1001ea4 /* U+1EA4 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */ +const XK_acircumflexacute = 0x1001ea5 /* U+1EA5 LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE */ +const XK_Acircumflexgrave = 0x1001ea6 /* U+1EA6 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */ +const XK_acircumflexgrave = 0x1001ea7 /* U+1EA7 LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE */ +const XK_Acircumflexhook = 0x1001ea8 /* U+1EA8 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */ +const XK_acircumflexhook = 0x1001ea9 /* U+1EA9 LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */ +const XK_Acircumflextilde = 0x1001eaa /* U+1EAA LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE */ +const XK_acircumflextilde = 0x1001eab /* U+1EAB LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE */ +const XK_Acircumflexbelowdot = 0x1001eac /* U+1EAC LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */ +const XK_acircumflexbelowdot = 0x1001ead /* U+1EAD LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW */ +const XK_Abreveacute = 0x1001eae /* U+1EAE LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */ +const XK_abreveacute = 0x1001eaf /* U+1EAF LATIN SMALL LETTER A WITH BREVE AND ACUTE */ +const XK_Abrevegrave = 0x1001eb0 /* U+1EB0 LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */ +const XK_abrevegrave = 0x1001eb1 /* U+1EB1 LATIN SMALL LETTER A WITH BREVE AND GRAVE */ +const XK_Abrevehook = 0x1001eb2 /* U+1EB2 LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE */ +const XK_abrevehook = 0x1001eb3 /* U+1EB3 LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE */ +const XK_Abrevetilde = 0x1001eb4 /* U+1EB4 LATIN CAPITAL LETTER A WITH BREVE AND TILDE */ +const XK_abrevetilde = 0x1001eb5 /* U+1EB5 LATIN SMALL LETTER A WITH BREVE AND TILDE */ +const XK_Abrevebelowdot = 0x1001eb6 /* U+1EB6 LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */ +const XK_abrevebelowdot = 0x1001eb7 /* U+1EB7 LATIN SMALL LETTER A WITH BREVE AND DOT BELOW */ +const XK_Ebelowdot = 0x1001eb8 /* U+1EB8 LATIN CAPITAL LETTER E WITH DOT BELOW */ +const XK_ebelowdot = 0x1001eb9 /* U+1EB9 LATIN SMALL LETTER E WITH DOT BELOW */ +const XK_Ehook = 0x1001eba /* U+1EBA LATIN CAPITAL LETTER E WITH HOOK ABOVE */ +const XK_ehook = 0x1001ebb /* U+1EBB LATIN SMALL LETTER E WITH HOOK ABOVE */ +const XK_Etilde = 0x1001ebc /* U+1EBC LATIN CAPITAL LETTER E WITH TILDE */ +const XK_etilde = 0x1001ebd /* U+1EBD LATIN SMALL LETTER E WITH TILDE */ +const XK_Ecircumflexacute = 0x1001ebe /* U+1EBE LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */ +const XK_ecircumflexacute = 0x1001ebf /* U+1EBF LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE */ +const XK_Ecircumflexgrave = 0x1001ec0 /* U+1EC0 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */ +const XK_ecircumflexgrave = 0x1001ec1 /* U+1EC1 LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE */ +const XK_Ecircumflexhook = 0x1001ec2 /* U+1EC2 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */ +const XK_ecircumflexhook = 0x1001ec3 /* U+1EC3 LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */ +const XK_Ecircumflextilde = 0x1001ec4 /* U+1EC4 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */ +const XK_ecircumflextilde = 0x1001ec5 /* U+1EC5 LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE */ +const XK_Ecircumflexbelowdot = 0x1001ec6 /* U+1EC6 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */ +const XK_ecircumflexbelowdot = 0x1001ec7 /* U+1EC7 LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW */ +const XK_Ihook = 0x1001ec8 /* U+1EC8 LATIN CAPITAL LETTER I WITH HOOK ABOVE */ +const XK_ihook = 0x1001ec9 /* U+1EC9 LATIN SMALL LETTER I WITH HOOK ABOVE */ +const XK_Ibelowdot = 0x1001eca /* U+1ECA LATIN CAPITAL LETTER I WITH DOT BELOW */ +const XK_ibelowdot = 0x1001ecb /* U+1ECB LATIN SMALL LETTER I WITH DOT BELOW */ +const XK_Obelowdot = 0x1001ecc /* U+1ECC LATIN CAPITAL LETTER O WITH DOT BELOW */ +const XK_obelowdot = 0x1001ecd /* U+1ECD LATIN SMALL LETTER O WITH DOT BELOW */ +const XK_Ohook = 0x1001ece /* U+1ECE LATIN CAPITAL LETTER O WITH HOOK ABOVE */ +const XK_ohook = 0x1001ecf /* U+1ECF LATIN SMALL LETTER O WITH HOOK ABOVE */ +const XK_Ocircumflexacute = 0x1001ed0 /* U+1ED0 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */ +const XK_ocircumflexacute = 0x1001ed1 /* U+1ED1 LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE */ +const XK_Ocircumflexgrave = 0x1001ed2 /* U+1ED2 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */ +const XK_ocircumflexgrave = 0x1001ed3 /* U+1ED3 LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE */ +const XK_Ocircumflexhook = 0x1001ed4 /* U+1ED4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */ +const XK_ocircumflexhook = 0x1001ed5 /* U+1ED5 LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */ +const XK_Ocircumflextilde = 0x1001ed6 /* U+1ED6 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */ +const XK_ocircumflextilde = 0x1001ed7 /* U+1ED7 LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE */ +const XK_Ocircumflexbelowdot = 0x1001ed8 /* U+1ED8 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */ +const XK_ocircumflexbelowdot = 0x1001ed9 /* U+1ED9 LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW */ +const XK_Ohornacute = 0x1001eda /* U+1EDA LATIN CAPITAL LETTER O WITH HORN AND ACUTE */ +const XK_ohornacute = 0x1001edb /* U+1EDB LATIN SMALL LETTER O WITH HORN AND ACUTE */ +const XK_Ohorngrave = 0x1001edc /* U+1EDC LATIN CAPITAL LETTER O WITH HORN AND GRAVE */ +const XK_ohorngrave = 0x1001edd /* U+1EDD LATIN SMALL LETTER O WITH HORN AND GRAVE */ +const XK_Ohornhook = 0x1001ede /* U+1EDE LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE */ +const XK_ohornhook = 0x1001edf /* U+1EDF LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */ +const XK_Ohorntilde = 0x1001ee0 /* U+1EE0 LATIN CAPITAL LETTER O WITH HORN AND TILDE */ +const XK_ohorntilde = 0x1001ee1 /* U+1EE1 LATIN SMALL LETTER O WITH HORN AND TILDE */ +const XK_Ohornbelowdot = 0x1001ee2 /* U+1EE2 LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW */ +const XK_ohornbelowdot = 0x1001ee3 /* U+1EE3 LATIN SMALL LETTER O WITH HORN AND DOT BELOW */ +const XK_Ubelowdot = 0x1001ee4 /* U+1EE4 LATIN CAPITAL LETTER U WITH DOT BELOW */ +const XK_ubelowdot = 0x1001ee5 /* U+1EE5 LATIN SMALL LETTER U WITH DOT BELOW */ +const XK_Uhook = 0x1001ee6 /* U+1EE6 LATIN CAPITAL LETTER U WITH HOOK ABOVE */ +const XK_uhook = 0x1001ee7 /* U+1EE7 LATIN SMALL LETTER U WITH HOOK ABOVE */ +const XK_Uhornacute = 0x1001ee8 /* U+1EE8 LATIN CAPITAL LETTER U WITH HORN AND ACUTE */ +const XK_uhornacute = 0x1001ee9 /* U+1EE9 LATIN SMALL LETTER U WITH HORN AND ACUTE */ +const XK_Uhorngrave = 0x1001eea /* U+1EEA LATIN CAPITAL LETTER U WITH HORN AND GRAVE */ +const XK_uhorngrave = 0x1001eeb /* U+1EEB LATIN SMALL LETTER U WITH HORN AND GRAVE */ +const XK_Uhornhook = 0x1001eec /* U+1EEC LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE */ +const XK_uhornhook = 0x1001eed /* U+1EED LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE */ +const XK_Uhorntilde = 0x1001eee /* U+1EEE LATIN CAPITAL LETTER U WITH HORN AND TILDE */ +const XK_uhorntilde = 0x1001eef /* U+1EEF LATIN SMALL LETTER U WITH HORN AND TILDE */ +const XK_Uhornbelowdot = 0x1001ef0 /* U+1EF0 LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW */ +const XK_uhornbelowdot = 0x1001ef1 /* U+1EF1 LATIN SMALL LETTER U WITH HORN AND DOT BELOW */ +const XK_Ybelowdot = 0x1001ef4 /* U+1EF4 LATIN CAPITAL LETTER Y WITH DOT BELOW */ +const XK_ybelowdot = 0x1001ef5 /* U+1EF5 LATIN SMALL LETTER Y WITH DOT BELOW */ +const XK_Yhook = 0x1001ef6 /* U+1EF6 LATIN CAPITAL LETTER Y WITH HOOK ABOVE */ +const XK_yhook = 0x1001ef7 /* U+1EF7 LATIN SMALL LETTER Y WITH HOOK ABOVE */ +const XK_Ytilde = 0x1001ef8 /* U+1EF8 LATIN CAPITAL LETTER Y WITH TILDE */ +const XK_ytilde = 0x1001ef9 /* U+1EF9 LATIN SMALL LETTER Y WITH TILDE */ +const XK_Ohorn = 0x10001a0 /* U+01A0 LATIN CAPITAL LETTER O WITH HORN */ +const XK_ohorn = 0x10001a1 /* U+01A1 LATIN SMALL LETTER O WITH HORN */ +const XK_Uhorn = 0x10001af /* U+01AF LATIN CAPITAL LETTER U WITH HORN */ +const XK_uhorn = 0x10001b0 /* U+01B0 LATIN SMALL LETTER U WITH HORN */ + +//endif /* XK_VIETNAMESE */ + +//ifdef XK_CURRENCY +const XK_EcuSign = 0x10020a0 /* U+20A0 EURO-CURRENCY SIGN */ +const XK_ColonSign = 0x10020a1 /* U+20A1 COLON SIGN */ +const XK_CruzeiroSign = 0x10020a2 /* U+20A2 CRUZEIRO SIGN */ +const XK_FFrancSign = 0x10020a3 /* U+20A3 FRENCH FRANC SIGN */ +const XK_LiraSign = 0x10020a4 /* U+20A4 LIRA SIGN */ +const XK_MillSign = 0x10020a5 /* U+20A5 MILL SIGN */ +const XK_NairaSign = 0x10020a6 /* U+20A6 NAIRA SIGN */ +const XK_PesetaSign = 0x10020a7 /* U+20A7 PESETA SIGN */ +const XK_RupeeSign = 0x10020a8 /* U+20A8 RUPEE SIGN */ +const XK_WonSign = 0x10020a9 /* U+20A9 WON SIGN */ +const XK_NewSheqelSign = 0x10020aa /* U+20AA NEW SHEQEL SIGN */ +const XK_DongSign = 0x10020ab /* U+20AB DONG SIGN */ +const XK_EuroSign = 0x20ac /* U+20AC EURO SIGN */ +//endif /* XK_CURRENCY */ + +//ifdef XK_MATHEMATICAL +/* one, two and three are defined above. */ +const XK_zerosuperior = 0x1002070 /* U+2070 SUPERSCRIPT ZERO */ +const XK_foursuperior = 0x1002074 /* U+2074 SUPERSCRIPT FOUR */ +const XK_fivesuperior = 0x1002075 /* U+2075 SUPERSCRIPT FIVE */ +const XK_sixsuperior = 0x1002076 /* U+2076 SUPERSCRIPT SIX */ +const XK_sevensuperior = 0x1002077 /* U+2077 SUPERSCRIPT SEVEN */ +const XK_eightsuperior = 0x1002078 /* U+2078 SUPERSCRIPT EIGHT */ +const XK_ninesuperior = 0x1002079 /* U+2079 SUPERSCRIPT NINE */ +const XK_zerosubscript = 0x1002080 /* U+2080 SUBSCRIPT ZERO */ +const XK_onesubscript = 0x1002081 /* U+2081 SUBSCRIPT ONE */ +const XK_twosubscript = 0x1002082 /* U+2082 SUBSCRIPT TWO */ +const XK_threesubscript = 0x1002083 /* U+2083 SUBSCRIPT THREE */ +const XK_foursubscript = 0x1002084 /* U+2084 SUBSCRIPT FOUR */ +const XK_fivesubscript = 0x1002085 /* U+2085 SUBSCRIPT FIVE */ +const XK_sixsubscript = 0x1002086 /* U+2086 SUBSCRIPT SIX */ +const XK_sevensubscript = 0x1002087 /* U+2087 SUBSCRIPT SEVEN */ +const XK_eightsubscript = 0x1002088 /* U+2088 SUBSCRIPT EIGHT */ +const XK_ninesubscript = 0x1002089 /* U+2089 SUBSCRIPT NINE */ +const XK_partdifferential = 0x1002202 /* U+2202 PARTIAL DIFFERENTIAL */ +const XK_emptyset = 0x1002205 /* U+2205 NULL SET */ +const XK_elementof = 0x1002208 /* U+2208 ELEMENT OF */ +const XK_notelementof = 0x1002209 /* U+2209 NOT AN ELEMENT OF */ +const XK_containsas = 0x100220B /* U+220B CONTAINS AS MEMBER */ +const XK_squareroot = 0x100221A /* U+221A SQUARE ROOT */ +const XK_cuberoot = 0x100221B /* U+221B CUBE ROOT */ +const XK_fourthroot = 0x100221C /* U+221C FOURTH ROOT */ +const XK_dintegral = 0x100222C /* U+222C DOUBLE INTEGRAL */ +const XK_tintegral = 0x100222D /* U+222D TRIPLE INTEGRAL */ +const XK_because = 0x1002235 /* U+2235 BECAUSE */ +const XK_approxeq = 0x1002248 /* U+2245 ALMOST EQUAL TO */ +const XK_notapproxeq = 0x1002247 /* U+2247 NOT ALMOST EQUAL TO */ +const XK_notidentical = 0x1002262 /* U+2262 NOT IDENTICAL TO */ +const XK_stricteq = 0x1002263 /* U+2263 STRICTLY EQUIVALENT TO */ +//endif /* XK_MATHEMATICAL */ + +//ifdef XK_BRAILLE +const XK_braille_dot_1 = 0xfff1 +const XK_braille_dot_2 = 0xfff2 +const XK_braille_dot_3 = 0xfff3 +const XK_braille_dot_4 = 0xfff4 +const XK_braille_dot_5 = 0xfff5 +const XK_braille_dot_6 = 0xfff6 +const XK_braille_dot_7 = 0xfff7 +const XK_braille_dot_8 = 0xfff8 +const XK_braille_dot_9 = 0xfff9 +const XK_braille_dot_10 = 0xfffa +const XK_braille_blank = 0x1002800 /* U+2800 BRAILLE PATTERN BLANK */ +const XK_braille_dots_1 = 0x1002801 /* U+2801 BRAILLE PATTERN DOTS-1 */ +const XK_braille_dots_2 = 0x1002802 /* U+2802 BRAILLE PATTERN DOTS-2 */ +const XK_braille_dots_12 = 0x1002803 /* U+2803 BRAILLE PATTERN DOTS-12 */ +const XK_braille_dots_3 = 0x1002804 /* U+2804 BRAILLE PATTERN DOTS-3 */ +const XK_braille_dots_13 = 0x1002805 /* U+2805 BRAILLE PATTERN DOTS-13 */ +const XK_braille_dots_23 = 0x1002806 /* U+2806 BRAILLE PATTERN DOTS-23 */ +const XK_braille_dots_123 = 0x1002807 /* U+2807 BRAILLE PATTERN DOTS-123 */ +const XK_braille_dots_4 = 0x1002808 /* U+2808 BRAILLE PATTERN DOTS-4 */ +const XK_braille_dots_14 = 0x1002809 /* U+2809 BRAILLE PATTERN DOTS-14 */ +const XK_braille_dots_24 = 0x100280a /* U+280a BRAILLE PATTERN DOTS-24 */ +const XK_braille_dots_124 = 0x100280b /* U+280b BRAILLE PATTERN DOTS-124 */ +const XK_braille_dots_34 = 0x100280c /* U+280c BRAILLE PATTERN DOTS-34 */ +const XK_braille_dots_134 = 0x100280d /* U+280d BRAILLE PATTERN DOTS-134 */ +const XK_braille_dots_234 = 0x100280e /* U+280e BRAILLE PATTERN DOTS-234 */ +const XK_braille_dots_1234 = 0x100280f /* U+280f BRAILLE PATTERN DOTS-1234 */ +const XK_braille_dots_5 = 0x1002810 /* U+2810 BRAILLE PATTERN DOTS-5 */ +const XK_braille_dots_15 = 0x1002811 /* U+2811 BRAILLE PATTERN DOTS-15 */ +const XK_braille_dots_25 = 0x1002812 /* U+2812 BRAILLE PATTERN DOTS-25 */ +const XK_braille_dots_125 = 0x1002813 /* U+2813 BRAILLE PATTERN DOTS-125 */ +const XK_braille_dots_35 = 0x1002814 /* U+2814 BRAILLE PATTERN DOTS-35 */ +const XK_braille_dots_135 = 0x1002815 /* U+2815 BRAILLE PATTERN DOTS-135 */ +const XK_braille_dots_235 = 0x1002816 /* U+2816 BRAILLE PATTERN DOTS-235 */ +const XK_braille_dots_1235 = 0x1002817 /* U+2817 BRAILLE PATTERN DOTS-1235 */ +const XK_braille_dots_45 = 0x1002818 /* U+2818 BRAILLE PATTERN DOTS-45 */ +const XK_braille_dots_145 = 0x1002819 /* U+2819 BRAILLE PATTERN DOTS-145 */ +const XK_braille_dots_245 = 0x100281a /* U+281a BRAILLE PATTERN DOTS-245 */ +const XK_braille_dots_1245 = 0x100281b /* U+281b BRAILLE PATTERN DOTS-1245 */ +const XK_braille_dots_345 = 0x100281c /* U+281c BRAILLE PATTERN DOTS-345 */ +const XK_braille_dots_1345 = 0x100281d /* U+281d BRAILLE PATTERN DOTS-1345 */ +const XK_braille_dots_2345 = 0x100281e /* U+281e BRAILLE PATTERN DOTS-2345 */ +const XK_braille_dots_12345 = 0x100281f /* U+281f BRAILLE PATTERN DOTS-12345 */ +const XK_braille_dots_6 = 0x1002820 /* U+2820 BRAILLE PATTERN DOTS-6 */ +const XK_braille_dots_16 = 0x1002821 /* U+2821 BRAILLE PATTERN DOTS-16 */ +const XK_braille_dots_26 = 0x1002822 /* U+2822 BRAILLE PATTERN DOTS-26 */ +const XK_braille_dots_126 = 0x1002823 /* U+2823 BRAILLE PATTERN DOTS-126 */ +const XK_braille_dots_36 = 0x1002824 /* U+2824 BRAILLE PATTERN DOTS-36 */ +const XK_braille_dots_136 = 0x1002825 /* U+2825 BRAILLE PATTERN DOTS-136 */ +const XK_braille_dots_236 = 0x1002826 /* U+2826 BRAILLE PATTERN DOTS-236 */ +const XK_braille_dots_1236 = 0x1002827 /* U+2827 BRAILLE PATTERN DOTS-1236 */ +const XK_braille_dots_46 = 0x1002828 /* U+2828 BRAILLE PATTERN DOTS-46 */ +const XK_braille_dots_146 = 0x1002829 /* U+2829 BRAILLE PATTERN DOTS-146 */ +const XK_braille_dots_246 = 0x100282a /* U+282a BRAILLE PATTERN DOTS-246 */ +const XK_braille_dots_1246 = 0x100282b /* U+282b BRAILLE PATTERN DOTS-1246 */ +const XK_braille_dots_346 = 0x100282c /* U+282c BRAILLE PATTERN DOTS-346 */ +const XK_braille_dots_1346 = 0x100282d /* U+282d BRAILLE PATTERN DOTS-1346 */ +const XK_braille_dots_2346 = 0x100282e /* U+282e BRAILLE PATTERN DOTS-2346 */ +const XK_braille_dots_12346 = 0x100282f /* U+282f BRAILLE PATTERN DOTS-12346 */ +const XK_braille_dots_56 = 0x1002830 /* U+2830 BRAILLE PATTERN DOTS-56 */ +const XK_braille_dots_156 = 0x1002831 /* U+2831 BRAILLE PATTERN DOTS-156 */ +const XK_braille_dots_256 = 0x1002832 /* U+2832 BRAILLE PATTERN DOTS-256 */ +const XK_braille_dots_1256 = 0x1002833 /* U+2833 BRAILLE PATTERN DOTS-1256 */ +const XK_braille_dots_356 = 0x1002834 /* U+2834 BRAILLE PATTERN DOTS-356 */ +const XK_braille_dots_1356 = 0x1002835 /* U+2835 BRAILLE PATTERN DOTS-1356 */ +const XK_braille_dots_2356 = 0x1002836 /* U+2836 BRAILLE PATTERN DOTS-2356 */ +const XK_braille_dots_12356 = 0x1002837 /* U+2837 BRAILLE PATTERN DOTS-12356 */ +const XK_braille_dots_456 = 0x1002838 /* U+2838 BRAILLE PATTERN DOTS-456 */ +const XK_braille_dots_1456 = 0x1002839 /* U+2839 BRAILLE PATTERN DOTS-1456 */ +const XK_braille_dots_2456 = 0x100283a /* U+283a BRAILLE PATTERN DOTS-2456 */ +const XK_braille_dots_12456 = 0x100283b /* U+283b BRAILLE PATTERN DOTS-12456 */ +const XK_braille_dots_3456 = 0x100283c /* U+283c BRAILLE PATTERN DOTS-3456 */ +const XK_braille_dots_13456 = 0x100283d /* U+283d BRAILLE PATTERN DOTS-13456 */ +const XK_braille_dots_23456 = 0x100283e /* U+283e BRAILLE PATTERN DOTS-23456 */ +const XK_braille_dots_123456 = 0x100283f /* U+283f BRAILLE PATTERN DOTS-123456 */ +const XK_braille_dots_7 = 0x1002840 /* U+2840 BRAILLE PATTERN DOTS-7 */ +const XK_braille_dots_17 = 0x1002841 /* U+2841 BRAILLE PATTERN DOTS-17 */ +const XK_braille_dots_27 = 0x1002842 /* U+2842 BRAILLE PATTERN DOTS-27 */ +const XK_braille_dots_127 = 0x1002843 /* U+2843 BRAILLE PATTERN DOTS-127 */ +const XK_braille_dots_37 = 0x1002844 /* U+2844 BRAILLE PATTERN DOTS-37 */ +const XK_braille_dots_137 = 0x1002845 /* U+2845 BRAILLE PATTERN DOTS-137 */ +const XK_braille_dots_237 = 0x1002846 /* U+2846 BRAILLE PATTERN DOTS-237 */ +const XK_braille_dots_1237 = 0x1002847 /* U+2847 BRAILLE PATTERN DOTS-1237 */ +const XK_braille_dots_47 = 0x1002848 /* U+2848 BRAILLE PATTERN DOTS-47 */ +const XK_braille_dots_147 = 0x1002849 /* U+2849 BRAILLE PATTERN DOTS-147 */ +const XK_braille_dots_247 = 0x100284a /* U+284a BRAILLE PATTERN DOTS-247 */ +const XK_braille_dots_1247 = 0x100284b /* U+284b BRAILLE PATTERN DOTS-1247 */ +const XK_braille_dots_347 = 0x100284c /* U+284c BRAILLE PATTERN DOTS-347 */ +const XK_braille_dots_1347 = 0x100284d /* U+284d BRAILLE PATTERN DOTS-1347 */ +const XK_braille_dots_2347 = 0x100284e /* U+284e BRAILLE PATTERN DOTS-2347 */ +const XK_braille_dots_12347 = 0x100284f /* U+284f BRAILLE PATTERN DOTS-12347 */ +const XK_braille_dots_57 = 0x1002850 /* U+2850 BRAILLE PATTERN DOTS-57 */ +const XK_braille_dots_157 = 0x1002851 /* U+2851 BRAILLE PATTERN DOTS-157 */ +const XK_braille_dots_257 = 0x1002852 /* U+2852 BRAILLE PATTERN DOTS-257 */ +const XK_braille_dots_1257 = 0x1002853 /* U+2853 BRAILLE PATTERN DOTS-1257 */ +const XK_braille_dots_357 = 0x1002854 /* U+2854 BRAILLE PATTERN DOTS-357 */ +const XK_braille_dots_1357 = 0x1002855 /* U+2855 BRAILLE PATTERN DOTS-1357 */ +const XK_braille_dots_2357 = 0x1002856 /* U+2856 BRAILLE PATTERN DOTS-2357 */ +const XK_braille_dots_12357 = 0x1002857 /* U+2857 BRAILLE PATTERN DOTS-12357 */ +const XK_braille_dots_457 = 0x1002858 /* U+2858 BRAILLE PATTERN DOTS-457 */ +const XK_braille_dots_1457 = 0x1002859 /* U+2859 BRAILLE PATTERN DOTS-1457 */ +const XK_braille_dots_2457 = 0x100285a /* U+285a BRAILLE PATTERN DOTS-2457 */ +const XK_braille_dots_12457 = 0x100285b /* U+285b BRAILLE PATTERN DOTS-12457 */ +const XK_braille_dots_3457 = 0x100285c /* U+285c BRAILLE PATTERN DOTS-3457 */ +const XK_braille_dots_13457 = 0x100285d /* U+285d BRAILLE PATTERN DOTS-13457 */ +const XK_braille_dots_23457 = 0x100285e /* U+285e BRAILLE PATTERN DOTS-23457 */ +const XK_braille_dots_123457 = 0x100285f /* U+285f BRAILLE PATTERN DOTS-123457 */ +const XK_braille_dots_67 = 0x1002860 /* U+2860 BRAILLE PATTERN DOTS-67 */ +const XK_braille_dots_167 = 0x1002861 /* U+2861 BRAILLE PATTERN DOTS-167 */ +const XK_braille_dots_267 = 0x1002862 /* U+2862 BRAILLE PATTERN DOTS-267 */ +const XK_braille_dots_1267 = 0x1002863 /* U+2863 BRAILLE PATTERN DOTS-1267 */ +const XK_braille_dots_367 = 0x1002864 /* U+2864 BRAILLE PATTERN DOTS-367 */ +const XK_braille_dots_1367 = 0x1002865 /* U+2865 BRAILLE PATTERN DOTS-1367 */ +const XK_braille_dots_2367 = 0x1002866 /* U+2866 BRAILLE PATTERN DOTS-2367 */ +const XK_braille_dots_12367 = 0x1002867 /* U+2867 BRAILLE PATTERN DOTS-12367 */ +const XK_braille_dots_467 = 0x1002868 /* U+2868 BRAILLE PATTERN DOTS-467 */ +const XK_braille_dots_1467 = 0x1002869 /* U+2869 BRAILLE PATTERN DOTS-1467 */ +const XK_braille_dots_2467 = 0x100286a /* U+286a BRAILLE PATTERN DOTS-2467 */ +const XK_braille_dots_12467 = 0x100286b /* U+286b BRAILLE PATTERN DOTS-12467 */ +const XK_braille_dots_3467 = 0x100286c /* U+286c BRAILLE PATTERN DOTS-3467 */ +const XK_braille_dots_13467 = 0x100286d /* U+286d BRAILLE PATTERN DOTS-13467 */ +const XK_braille_dots_23467 = 0x100286e /* U+286e BRAILLE PATTERN DOTS-23467 */ +const XK_braille_dots_123467 = 0x100286f /* U+286f BRAILLE PATTERN DOTS-123467 */ +const XK_braille_dots_567 = 0x1002870 /* U+2870 BRAILLE PATTERN DOTS-567 */ +const XK_braille_dots_1567 = 0x1002871 /* U+2871 BRAILLE PATTERN DOTS-1567 */ +const XK_braille_dots_2567 = 0x1002872 /* U+2872 BRAILLE PATTERN DOTS-2567 */ +const XK_braille_dots_12567 = 0x1002873 /* U+2873 BRAILLE PATTERN DOTS-12567 */ +const XK_braille_dots_3567 = 0x1002874 /* U+2874 BRAILLE PATTERN DOTS-3567 */ +const XK_braille_dots_13567 = 0x1002875 /* U+2875 BRAILLE PATTERN DOTS-13567 */ +const XK_braille_dots_23567 = 0x1002876 /* U+2876 BRAILLE PATTERN DOTS-23567 */ +const XK_braille_dots_123567 = 0x1002877 /* U+2877 BRAILLE PATTERN DOTS-123567 */ +const XK_braille_dots_4567 = 0x1002878 /* U+2878 BRAILLE PATTERN DOTS-4567 */ +const XK_braille_dots_14567 = 0x1002879 /* U+2879 BRAILLE PATTERN DOTS-14567 */ +const XK_braille_dots_24567 = 0x100287a /* U+287a BRAILLE PATTERN DOTS-24567 */ +const XK_braille_dots_124567 = 0x100287b /* U+287b BRAILLE PATTERN DOTS-124567 */ +const XK_braille_dots_34567 = 0x100287c /* U+287c BRAILLE PATTERN DOTS-34567 */ +const XK_braille_dots_134567 = 0x100287d /* U+287d BRAILLE PATTERN DOTS-134567 */ +const XK_braille_dots_234567 = 0x100287e /* U+287e BRAILLE PATTERN DOTS-234567 */ +const XK_braille_dots_1234567 = 0x100287f /* U+287f BRAILLE PATTERN DOTS-1234567 */ +const XK_braille_dots_8 = 0x1002880 /* U+2880 BRAILLE PATTERN DOTS-8 */ +const XK_braille_dots_18 = 0x1002881 /* U+2881 BRAILLE PATTERN DOTS-18 */ +const XK_braille_dots_28 = 0x1002882 /* U+2882 BRAILLE PATTERN DOTS-28 */ +const XK_braille_dots_128 = 0x1002883 /* U+2883 BRAILLE PATTERN DOTS-128 */ +const XK_braille_dots_38 = 0x1002884 /* U+2884 BRAILLE PATTERN DOTS-38 */ +const XK_braille_dots_138 = 0x1002885 /* U+2885 BRAILLE PATTERN DOTS-138 */ +const XK_braille_dots_238 = 0x1002886 /* U+2886 BRAILLE PATTERN DOTS-238 */ +const XK_braille_dots_1238 = 0x1002887 /* U+2887 BRAILLE PATTERN DOTS-1238 */ +const XK_braille_dots_48 = 0x1002888 /* U+2888 BRAILLE PATTERN DOTS-48 */ +const XK_braille_dots_148 = 0x1002889 /* U+2889 BRAILLE PATTERN DOTS-148 */ +const XK_braille_dots_248 = 0x100288a /* U+288a BRAILLE PATTERN DOTS-248 */ +const XK_braille_dots_1248 = 0x100288b /* U+288b BRAILLE PATTERN DOTS-1248 */ +const XK_braille_dots_348 = 0x100288c /* U+288c BRAILLE PATTERN DOTS-348 */ +const XK_braille_dots_1348 = 0x100288d /* U+288d BRAILLE PATTERN DOTS-1348 */ +const XK_braille_dots_2348 = 0x100288e /* U+288e BRAILLE PATTERN DOTS-2348 */ +const XK_braille_dots_12348 = 0x100288f /* U+288f BRAILLE PATTERN DOTS-12348 */ +const XK_braille_dots_58 = 0x1002890 /* U+2890 BRAILLE PATTERN DOTS-58 */ +const XK_braille_dots_158 = 0x1002891 /* U+2891 BRAILLE PATTERN DOTS-158 */ +const XK_braille_dots_258 = 0x1002892 /* U+2892 BRAILLE PATTERN DOTS-258 */ +const XK_braille_dots_1258 = 0x1002893 /* U+2893 BRAILLE PATTERN DOTS-1258 */ +const XK_braille_dots_358 = 0x1002894 /* U+2894 BRAILLE PATTERN DOTS-358 */ +const XK_braille_dots_1358 = 0x1002895 /* U+2895 BRAILLE PATTERN DOTS-1358 */ +const XK_braille_dots_2358 = 0x1002896 /* U+2896 BRAILLE PATTERN DOTS-2358 */ +const XK_braille_dots_12358 = 0x1002897 /* U+2897 BRAILLE PATTERN DOTS-12358 */ +const XK_braille_dots_458 = 0x1002898 /* U+2898 BRAILLE PATTERN DOTS-458 */ +const XK_braille_dots_1458 = 0x1002899 /* U+2899 BRAILLE PATTERN DOTS-1458 */ +const XK_braille_dots_2458 = 0x100289a /* U+289a BRAILLE PATTERN DOTS-2458 */ +const XK_braille_dots_12458 = 0x100289b /* U+289b BRAILLE PATTERN DOTS-12458 */ +const XK_braille_dots_3458 = 0x100289c /* U+289c BRAILLE PATTERN DOTS-3458 */ +const XK_braille_dots_13458 = 0x100289d /* U+289d BRAILLE PATTERN DOTS-13458 */ +const XK_braille_dots_23458 = 0x100289e /* U+289e BRAILLE PATTERN DOTS-23458 */ +const XK_braille_dots_123458 = 0x100289f /* U+289f BRAILLE PATTERN DOTS-123458 */ +const XK_braille_dots_68 = 0x10028a0 /* U+28a0 BRAILLE PATTERN DOTS-68 */ +const XK_braille_dots_168 = 0x10028a1 /* U+28a1 BRAILLE PATTERN DOTS-168 */ +const XK_braille_dots_268 = 0x10028a2 /* U+28a2 BRAILLE PATTERN DOTS-268 */ +const XK_braille_dots_1268 = 0x10028a3 /* U+28a3 BRAILLE PATTERN DOTS-1268 */ +const XK_braille_dots_368 = 0x10028a4 /* U+28a4 BRAILLE PATTERN DOTS-368 */ +const XK_braille_dots_1368 = 0x10028a5 /* U+28a5 BRAILLE PATTERN DOTS-1368 */ +const XK_braille_dots_2368 = 0x10028a6 /* U+28a6 BRAILLE PATTERN DOTS-2368 */ +const XK_braille_dots_12368 = 0x10028a7 /* U+28a7 BRAILLE PATTERN DOTS-12368 */ +const XK_braille_dots_468 = 0x10028a8 /* U+28a8 BRAILLE PATTERN DOTS-468 */ +const XK_braille_dots_1468 = 0x10028a9 /* U+28a9 BRAILLE PATTERN DOTS-1468 */ +const XK_braille_dots_2468 = 0x10028aa /* U+28aa BRAILLE PATTERN DOTS-2468 */ +const XK_braille_dots_12468 = 0x10028ab /* U+28ab BRAILLE PATTERN DOTS-12468 */ +const XK_braille_dots_3468 = 0x10028ac /* U+28ac BRAILLE PATTERN DOTS-3468 */ +const XK_braille_dots_13468 = 0x10028ad /* U+28ad BRAILLE PATTERN DOTS-13468 */ +const XK_braille_dots_23468 = 0x10028ae /* U+28ae BRAILLE PATTERN DOTS-23468 */ +const XK_braille_dots_123468 = 0x10028af /* U+28af BRAILLE PATTERN DOTS-123468 */ +const XK_braille_dots_568 = 0x10028b0 /* U+28b0 BRAILLE PATTERN DOTS-568 */ +const XK_braille_dots_1568 = 0x10028b1 /* U+28b1 BRAILLE PATTERN DOTS-1568 */ +const XK_braille_dots_2568 = 0x10028b2 /* U+28b2 BRAILLE PATTERN DOTS-2568 */ +const XK_braille_dots_12568 = 0x10028b3 /* U+28b3 BRAILLE PATTERN DOTS-12568 */ +const XK_braille_dots_3568 = 0x10028b4 /* U+28b4 BRAILLE PATTERN DOTS-3568 */ +const XK_braille_dots_13568 = 0x10028b5 /* U+28b5 BRAILLE PATTERN DOTS-13568 */ +const XK_braille_dots_23568 = 0x10028b6 /* U+28b6 BRAILLE PATTERN DOTS-23568 */ +const XK_braille_dots_123568 = 0x10028b7 /* U+28b7 BRAILLE PATTERN DOTS-123568 */ +const XK_braille_dots_4568 = 0x10028b8 /* U+28b8 BRAILLE PATTERN DOTS-4568 */ +const XK_braille_dots_14568 = 0x10028b9 /* U+28b9 BRAILLE PATTERN DOTS-14568 */ +const XK_braille_dots_24568 = 0x10028ba /* U+28ba BRAILLE PATTERN DOTS-24568 */ +const XK_braille_dots_124568 = 0x10028bb /* U+28bb BRAILLE PATTERN DOTS-124568 */ +const XK_braille_dots_34568 = 0x10028bc /* U+28bc BRAILLE PATTERN DOTS-34568 */ +const XK_braille_dots_134568 = 0x10028bd /* U+28bd BRAILLE PATTERN DOTS-134568 */ +const XK_braille_dots_234568 = 0x10028be /* U+28be BRAILLE PATTERN DOTS-234568 */ +const XK_braille_dots_1234568 = 0x10028bf /* U+28bf BRAILLE PATTERN DOTS-1234568 */ +const XK_braille_dots_78 = 0x10028c0 /* U+28c0 BRAILLE PATTERN DOTS-78 */ +const XK_braille_dots_178 = 0x10028c1 /* U+28c1 BRAILLE PATTERN DOTS-178 */ +const XK_braille_dots_278 = 0x10028c2 /* U+28c2 BRAILLE PATTERN DOTS-278 */ +const XK_braille_dots_1278 = 0x10028c3 /* U+28c3 BRAILLE PATTERN DOTS-1278 */ +const XK_braille_dots_378 = 0x10028c4 /* U+28c4 BRAILLE PATTERN DOTS-378 */ +const XK_braille_dots_1378 = 0x10028c5 /* U+28c5 BRAILLE PATTERN DOTS-1378 */ +const XK_braille_dots_2378 = 0x10028c6 /* U+28c6 BRAILLE PATTERN DOTS-2378 */ +const XK_braille_dots_12378 = 0x10028c7 /* U+28c7 BRAILLE PATTERN DOTS-12378 */ +const XK_braille_dots_478 = 0x10028c8 /* U+28c8 BRAILLE PATTERN DOTS-478 */ +const XK_braille_dots_1478 = 0x10028c9 /* U+28c9 BRAILLE PATTERN DOTS-1478 */ +const XK_braille_dots_2478 = 0x10028ca /* U+28ca BRAILLE PATTERN DOTS-2478 */ +const XK_braille_dots_12478 = 0x10028cb /* U+28cb BRAILLE PATTERN DOTS-12478 */ +const XK_braille_dots_3478 = 0x10028cc /* U+28cc BRAILLE PATTERN DOTS-3478 */ +const XK_braille_dots_13478 = 0x10028cd /* U+28cd BRAILLE PATTERN DOTS-13478 */ +const XK_braille_dots_23478 = 0x10028ce /* U+28ce BRAILLE PATTERN DOTS-23478 */ +const XK_braille_dots_123478 = 0x10028cf /* U+28cf BRAILLE PATTERN DOTS-123478 */ +const XK_braille_dots_578 = 0x10028d0 /* U+28d0 BRAILLE PATTERN DOTS-578 */ +const XK_braille_dots_1578 = 0x10028d1 /* U+28d1 BRAILLE PATTERN DOTS-1578 */ +const XK_braille_dots_2578 = 0x10028d2 /* U+28d2 BRAILLE PATTERN DOTS-2578 */ +const XK_braille_dots_12578 = 0x10028d3 /* U+28d3 BRAILLE PATTERN DOTS-12578 */ +const XK_braille_dots_3578 = 0x10028d4 /* U+28d4 BRAILLE PATTERN DOTS-3578 */ +const XK_braille_dots_13578 = 0x10028d5 /* U+28d5 BRAILLE PATTERN DOTS-13578 */ +const XK_braille_dots_23578 = 0x10028d6 /* U+28d6 BRAILLE PATTERN DOTS-23578 */ +const XK_braille_dots_123578 = 0x10028d7 /* U+28d7 BRAILLE PATTERN DOTS-123578 */ +const XK_braille_dots_4578 = 0x10028d8 /* U+28d8 BRAILLE PATTERN DOTS-4578 */ +const XK_braille_dots_14578 = 0x10028d9 /* U+28d9 BRAILLE PATTERN DOTS-14578 */ +const XK_braille_dots_24578 = 0x10028da /* U+28da BRAILLE PATTERN DOTS-24578 */ +const XK_braille_dots_124578 = 0x10028db /* U+28db BRAILLE PATTERN DOTS-124578 */ +const XK_braille_dots_34578 = 0x10028dc /* U+28dc BRAILLE PATTERN DOTS-34578 */ +const XK_braille_dots_134578 = 0x10028dd /* U+28dd BRAILLE PATTERN DOTS-134578 */ +const XK_braille_dots_234578 = 0x10028de /* U+28de BRAILLE PATTERN DOTS-234578 */ +const XK_braille_dots_1234578 = 0x10028df /* U+28df BRAILLE PATTERN DOTS-1234578 */ +const XK_braille_dots_678 = 0x10028e0 /* U+28e0 BRAILLE PATTERN DOTS-678 */ +const XK_braille_dots_1678 = 0x10028e1 /* U+28e1 BRAILLE PATTERN DOTS-1678 */ +const XK_braille_dots_2678 = 0x10028e2 /* U+28e2 BRAILLE PATTERN DOTS-2678 */ +const XK_braille_dots_12678 = 0x10028e3 /* U+28e3 BRAILLE PATTERN DOTS-12678 */ +const XK_braille_dots_3678 = 0x10028e4 /* U+28e4 BRAILLE PATTERN DOTS-3678 */ +const XK_braille_dots_13678 = 0x10028e5 /* U+28e5 BRAILLE PATTERN DOTS-13678 */ +const XK_braille_dots_23678 = 0x10028e6 /* U+28e6 BRAILLE PATTERN DOTS-23678 */ +const XK_braille_dots_123678 = 0x10028e7 /* U+28e7 BRAILLE PATTERN DOTS-123678 */ +const XK_braille_dots_4678 = 0x10028e8 /* U+28e8 BRAILLE PATTERN DOTS-4678 */ +const XK_braille_dots_14678 = 0x10028e9 /* U+28e9 BRAILLE PATTERN DOTS-14678 */ +const XK_braille_dots_24678 = 0x10028ea /* U+28ea BRAILLE PATTERN DOTS-24678 */ +const XK_braille_dots_124678 = 0x10028eb /* U+28eb BRAILLE PATTERN DOTS-124678 */ +const XK_braille_dots_34678 = 0x10028ec /* U+28ec BRAILLE PATTERN DOTS-34678 */ +const XK_braille_dots_134678 = 0x10028ed /* U+28ed BRAILLE PATTERN DOTS-134678 */ +const XK_braille_dots_234678 = 0x10028ee /* U+28ee BRAILLE PATTERN DOTS-234678 */ +const XK_braille_dots_1234678 = 0x10028ef /* U+28ef BRAILLE PATTERN DOTS-1234678 */ +const XK_braille_dots_5678 = 0x10028f0 /* U+28f0 BRAILLE PATTERN DOTS-5678 */ +const XK_braille_dots_15678 = 0x10028f1 /* U+28f1 BRAILLE PATTERN DOTS-15678 */ +const XK_braille_dots_25678 = 0x10028f2 /* U+28f2 BRAILLE PATTERN DOTS-25678 */ +const XK_braille_dots_125678 = 0x10028f3 /* U+28f3 BRAILLE PATTERN DOTS-125678 */ +const XK_braille_dots_35678 = 0x10028f4 /* U+28f4 BRAILLE PATTERN DOTS-35678 */ +const XK_braille_dots_135678 = 0x10028f5 /* U+28f5 BRAILLE PATTERN DOTS-135678 */ +const XK_braille_dots_235678 = 0x10028f6 /* U+28f6 BRAILLE PATTERN DOTS-235678 */ +const XK_braille_dots_1235678 = 0x10028f7 /* U+28f7 BRAILLE PATTERN DOTS-1235678 */ +const XK_braille_dots_45678 = 0x10028f8 /* U+28f8 BRAILLE PATTERN DOTS-45678 */ +const XK_braille_dots_145678 = 0x10028f9 /* U+28f9 BRAILLE PATTERN DOTS-145678 */ +const XK_braille_dots_245678 = 0x10028fa /* U+28fa BRAILLE PATTERN DOTS-245678 */ +const XK_braille_dots_1245678 = 0x10028fb /* U+28fb BRAILLE PATTERN DOTS-1245678 */ +const XK_braille_dots_345678 = 0x10028fc /* U+28fc BRAILLE PATTERN DOTS-345678 */ +const XK_braille_dots_1345678 = 0x10028fd /* U+28fd BRAILLE PATTERN DOTS-1345678 */ +const XK_braille_dots_2345678 = 0x10028fe /* U+28fe BRAILLE PATTERN DOTS-2345678 */ +const XK_braille_dots_12345678 = 0x10028ff /* U+28ff BRAILLE PATTERN DOTS-12345678 */ +//endif /* XK_BRAILLE */ + +/* + * Sinhala (http://unicode.org/charts/PDF/U0D80.pdf) + * http://www.nongnu.org/sinhala/doc/transliteration/sinhala-transliteration_6.html + */ + +//ifdef XK_SINHALA +const XK_Sinh_ng = 0x1000d82 /* U+0D82 SINHALA ANUSVARAYA */ +const XK_Sinh_h2 = 0x1000d83 /* U+0D83 SINHALA VISARGAYA */ +const XK_Sinh_a = 0x1000d85 /* U+0D85 SINHALA AYANNA */ +const XK_Sinh_aa = 0x1000d86 /* U+0D86 SINHALA AAYANNA */ +const XK_Sinh_ae = 0x1000d87 /* U+0D87 SINHALA AEYANNA */ +const XK_Sinh_aee = 0x1000d88 /* U+0D88 SINHALA AEEYANNA */ +const XK_Sinh_i = 0x1000d89 /* U+0D89 SINHALA IYANNA */ +const XK_Sinh_ii = 0x1000d8a /* U+0D8A SINHALA IIYANNA */ +const XK_Sinh_u = 0x1000d8b /* U+0D8B SINHALA UYANNA */ +const XK_Sinh_uu = 0x1000d8c /* U+0D8C SINHALA UUYANNA */ +const XK_Sinh_ri = 0x1000d8d /* U+0D8D SINHALA IRUYANNA */ +const XK_Sinh_rii = 0x1000d8e /* U+0D8E SINHALA IRUUYANNA */ +const XK_Sinh_lu = 0x1000d8f /* U+0D8F SINHALA ILUYANNA */ +const XK_Sinh_luu = 0x1000d90 /* U+0D90 SINHALA ILUUYANNA */ +const XK_Sinh_e = 0x1000d91 /* U+0D91 SINHALA EYANNA */ +const XK_Sinh_ee = 0x1000d92 /* U+0D92 SINHALA EEYANNA */ +const XK_Sinh_ai = 0x1000d93 /* U+0D93 SINHALA AIYANNA */ +const XK_Sinh_o = 0x1000d94 /* U+0D94 SINHALA OYANNA */ +const XK_Sinh_oo = 0x1000d95 /* U+0D95 SINHALA OOYANNA */ +const XK_Sinh_au = 0x1000d96 /* U+0D96 SINHALA AUYANNA */ +const XK_Sinh_ka = 0x1000d9a /* U+0D9A SINHALA KAYANNA */ +const XK_Sinh_kha = 0x1000d9b /* U+0D9B SINHALA MAHA. KAYANNA */ +const XK_Sinh_ga = 0x1000d9c /* U+0D9C SINHALA GAYANNA */ +const XK_Sinh_gha = 0x1000d9d /* U+0D9D SINHALA MAHA. GAYANNA */ +const XK_Sinh_ng2 = 0x1000d9e /* U+0D9E SINHALA KANTAJA NAASIKYAYA */ +const XK_Sinh_nga = 0x1000d9f /* U+0D9F SINHALA SANYAKA GAYANNA */ +const XK_Sinh_ca = 0x1000da0 /* U+0DA0 SINHALA CAYANNA */ +const XK_Sinh_cha = 0x1000da1 /* U+0DA1 SINHALA MAHA. CAYANNA */ +const XK_Sinh_ja = 0x1000da2 /* U+0DA2 SINHALA JAYANNA */ +const XK_Sinh_jha = 0x1000da3 /* U+0DA3 SINHALA MAHA. JAYANNA */ +const XK_Sinh_nya = 0x1000da4 /* U+0DA4 SINHALA TAALUJA NAASIKYAYA */ +const XK_Sinh_jnya = 0x1000da5 /* U+0DA5 SINHALA TAALUJA SANYOOGA NAASIKYAYA */ +const XK_Sinh_nja = 0x1000da6 /* U+0DA6 SINHALA SANYAKA JAYANNA */ +const XK_Sinh_tta = 0x1000da7 /* U+0DA7 SINHALA TTAYANNA */ +const XK_Sinh_ttha = 0x1000da8 /* U+0DA8 SINHALA MAHA. TTAYANNA */ +const XK_Sinh_dda = 0x1000da9 /* U+0DA9 SINHALA DDAYANNA */ +const XK_Sinh_ddha = 0x1000daa /* U+0DAA SINHALA MAHA. DDAYANNA */ +const XK_Sinh_nna = 0x1000dab /* U+0DAB SINHALA MUURDHAJA NAYANNA */ +const XK_Sinh_ndda = 0x1000dac /* U+0DAC SINHALA SANYAKA DDAYANNA */ +const XK_Sinh_tha = 0x1000dad /* U+0DAD SINHALA TAYANNA */ +const XK_Sinh_thha = 0x1000dae /* U+0DAE SINHALA MAHA. TAYANNA */ +const XK_Sinh_dha = 0x1000daf /* U+0DAF SINHALA DAYANNA */ +const XK_Sinh_dhha = 0x1000db0 /* U+0DB0 SINHALA MAHA. DAYANNA */ +const XK_Sinh_na = 0x1000db1 /* U+0DB1 SINHALA DANTAJA NAYANNA */ +const XK_Sinh_ndha = 0x1000db3 /* U+0DB3 SINHALA SANYAKA DAYANNA */ +const XK_Sinh_pa = 0x1000db4 /* U+0DB4 SINHALA PAYANNA */ +const XK_Sinh_pha = 0x1000db5 /* U+0DB5 SINHALA MAHA. PAYANNA */ +const XK_Sinh_ba = 0x1000db6 /* U+0DB6 SINHALA BAYANNA */ +const XK_Sinh_bha = 0x1000db7 /* U+0DB7 SINHALA MAHA. BAYANNA */ +const XK_Sinh_ma = 0x1000db8 /* U+0DB8 SINHALA MAYANNA */ +const XK_Sinh_mba = 0x1000db9 /* U+0DB9 SINHALA AMBA BAYANNA */ +const XK_Sinh_ya = 0x1000dba /* U+0DBA SINHALA YAYANNA */ +const XK_Sinh_ra = 0x1000dbb /* U+0DBB SINHALA RAYANNA */ +const XK_Sinh_la = 0x1000dbd /* U+0DBD SINHALA DANTAJA LAYANNA */ +const XK_Sinh_va = 0x1000dc0 /* U+0DC0 SINHALA VAYANNA */ +const XK_Sinh_sha = 0x1000dc1 /* U+0DC1 SINHALA TAALUJA SAYANNA */ +const XK_Sinh_ssha = 0x1000dc2 /* U+0DC2 SINHALA MUURDHAJA SAYANNA */ +const XK_Sinh_sa = 0x1000dc3 /* U+0DC3 SINHALA DANTAJA SAYANNA */ +const XK_Sinh_ha = 0x1000dc4 /* U+0DC4 SINHALA HAYANNA */ +const XK_Sinh_lla = 0x1000dc5 /* U+0DC5 SINHALA MUURDHAJA LAYANNA */ +const XK_Sinh_fa = 0x1000dc6 /* U+0DC6 SINHALA FAYANNA */ +const XK_Sinh_al = 0x1000dca /* U+0DCA SINHALA AL-LAKUNA */ +const XK_Sinh_aa2 = 0x1000dcf /* U+0DCF SINHALA AELA-PILLA */ +const XK_Sinh_ae2 = 0x1000dd0 /* U+0DD0 SINHALA AEDA-PILLA */ +const XK_Sinh_aee2 = 0x1000dd1 /* U+0DD1 SINHALA DIGA AEDA-PILLA */ +const XK_Sinh_i2 = 0x1000dd2 /* U+0DD2 SINHALA IS-PILLA */ +const XK_Sinh_ii2 = 0x1000dd3 /* U+0DD3 SINHALA DIGA IS-PILLA */ +const XK_Sinh_u2 = 0x1000dd4 /* U+0DD4 SINHALA PAA-PILLA */ +const XK_Sinh_uu2 = 0x1000dd6 /* U+0DD6 SINHALA DIGA PAA-PILLA */ +const XK_Sinh_ru2 = 0x1000dd8 /* U+0DD8 SINHALA GAETTA-PILLA */ +const XK_Sinh_e2 = 0x1000dd9 /* U+0DD9 SINHALA KOMBUVA */ +const XK_Sinh_ee2 = 0x1000dda /* U+0DDA SINHALA DIGA KOMBUVA */ +const XK_Sinh_ai2 = 0x1000ddb /* U+0DDB SINHALA KOMBU DEKA */ +const XK_Sinh_o2 = 0x1000ddc /* U+0DDC SINHALA KOMBUVA HAA AELA-PILLA*/ +const XK_Sinh_oo2 = 0x1000ddd /* U+0DDD SINHALA KOMBUVA HAA DIGA AELA-PILLA*/ +const XK_Sinh_au2 = 0x1000dde /* U+0DDE SINHALA KOMBUVA HAA GAYANUKITTA */ +const XK_Sinh_lu2 = 0x1000ddf /* U+0DDF SINHALA GAYANUKITTA */ +const XK_Sinh_ruu2 = 0x1000df2 /* U+0DF2 SINHALA DIGA GAETTA-PILLA */ +const XK_Sinh_luu2 = 0x1000df3 /* U+0DF3 SINHALA DIGA GAYANUKITTA */ +const XK_Sinh_kunddaliya = 0x1000df4 /* U+0DF4 SINHALA KUNDDALIYA */ +//endif /* XK_SINHALA */ diff --git a/internal/desktop/xorg/keysymdef.sh b/internal/desktop/xorg/keysymdef.sh new file mode 100755 index 00000000..90d933d9 --- /dev/null +++ b/internal/desktop/xorg/keysymdef.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +wget https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h +sed -i -E 's/\#define (XK_[a-zA-Z_0-9]+\s+)(0x[0-9a-f]+)/const \1 = \2/g' keysymdef.h +sed -i -E 's/^\#/\/\//g' keysymdef.h +echo "package xorg" | cat - keysymdef.h > keysymdef.go && rm keysymdef.h diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index 827b9149..cb865a99 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -19,6 +19,8 @@ import ( "demodesk/neko/internal/types" ) +//go:generate ./keysymdef.sh + type KbdMod uint8 const ( From b261217cbed36e83eab507b32f9b9ed433ff6747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 30 Jan 2022 01:22:07 +0100 Subject: [PATCH 652/876] add KeyPress func. --- internal/desktop/xorg.go | 18 ++++++++++++++++++ internal/types/desktop.go | 1 + 2 files changed, 19 insertions(+) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 047068d1..ce6c28db 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -4,6 +4,7 @@ import ( "image" "os/exec" "regexp" + "time" "demodesk/neko/internal/desktop/xorg" "demodesk/neko/internal/types" @@ -37,6 +38,23 @@ func (manager *DesktopManagerCtx) KeyUp(code uint32) error { return xorg.KeyUp(code) } +func (manager *DesktopManagerCtx) KeyPress(codes ...uint32) error { + xorg.ResetKeys() + defer xorg.ResetKeys() + + for _, code := range codes { + if err := xorg.KeyDown(code); err != nil { + return err + } + } + + if len(codes) > 1 { + time.Sleep(10 * time.Millisecond) + } + + return nil +} + func (manager *DesktopManagerCtx) ResetKeys() { xorg.ResetKeys() } diff --git a/internal/types/desktop.go b/internal/types/desktop.go index ea724433..f55c877a 100644 --- a/internal/types/desktop.go +++ b/internal/types/desktop.go @@ -54,6 +54,7 @@ type DesktopManager interface { KeyDown(code uint32) error ButtonUp(code uint32) error KeyUp(code uint32) error + KeyPress(codes ...uint32) error ResetKeys() ScreenConfigurations() map[int]ScreenConfiguration SetScreenSize(ScreenSize) error From 0d6335ebcd06377d8d66a804db72c04591961bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 30 Jan 2022 01:23:05 +0100 Subject: [PATCH 653/876] fileChooserDialog use keypress. --- internal/desktop/filechooserdialog.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index b10f76a8..339168a4 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -3,7 +3,8 @@ package desktop import ( "errors" "os/exec" - "time" + + "demodesk/neko/internal/desktop/xorg" ) // name of the window that is being controlled @@ -76,13 +77,8 @@ func (manager *DesktopManagerCtx) CloseFileChooserDialog() { // custom press Alt + F4 // because xdotool is failing to send proper Alt+F4 - manager.ResetKeys() //nolint - manager.KeyDown(65513) // Alt - //nolint - manager.KeyDown(65473) // F4 - time.Sleep(10 * time.Millisecond) - manager.ResetKeys() + manager.KeyPress(xorg.XK_Alt_L, xorg.XK_F4) mu.Unlock() } From fcc85aa9d67a70ee2e215d1339aa2eb1b713d788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 30 Jan 2022 01:25:04 +0100 Subject: [PATCH 654/876] desktop control websocket. --- internal/types/event/events.go | 15 ++++-- internal/types/message/messages.go | 3 +- internal/websocket/handler/control.go | 67 +++++++++++++++++++++++++++ internal/websocket/handler/handler.go | 21 +++++++++ 4 files changed, 100 insertions(+), 6 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 04eb4b2e..35ec3534 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -29,10 +29,17 @@ const ( CONTROL_HOST = "control/host" CONTROL_RELEASE = "control/release" CONTROL_REQUEST = "control/request" - CONTROL_MOVE = "control/move" // TODO: New. (fallback) - CONTROL_SCROLL = "control/scroll" // TODO: New. (fallback) - CONTROL_KEYDOWN = "control/keydown" // TODO: New. (fallback) - CONTROL_KEYUP = "control/keyup" // TODO: New. (fallback) + // mouse + CONTROL_MOVE = "control/move" // TODO: New. (fallback) + CONTROL_SCROLL = "control/scroll" // TODO: New. (fallback) + // keyboard + CONTROL_KEYPRESS = "control/keypress" + CONTROL_KEYDOWN = "control/keydown" + CONTROL_KEYUP = "control/keyup" + // actions + CONTROL_COPY = "control/copy" + CONTROL_PASTE = "control/paste" + CONTROL_SELECT_ALL = "control/select_all" ) const ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index f4845a3a..7b8373d7 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -114,9 +114,8 @@ type ControlScroll struct { Y int16 `json:"y"` } -// TODO: New. type ControlKey struct { - Key uint32 `json:"key"` + Keysym uint32 `json:"keysym"` } ///////////////////////////// diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index ebc678e3..ff910348 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -3,6 +3,7 @@ package handler import ( "errors" + "demodesk/neko/internal/desktop/xorg" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" @@ -53,3 +54,69 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { h.sessions.SetHost(session) return nil } + +func (h *MessageHandlerCtx) controlKeyPress(session types.Session, payload *message.ControlKey) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + + if !session.IsHost() { + logger.Debug().Msg("is not the host") + return nil + } + + return h.desktop.KeyPress(payload.Keysym) +} + +func (h *MessageHandlerCtx) controlKeyDown(session types.Session, payload *message.ControlKey) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + + if !session.IsHost() { + logger.Debug().Msg("is not the host") + return nil + } + + return h.desktop.KeyDown(payload.Keysym) +} + +func (h *MessageHandlerCtx) controlKeyUp(session types.Session, payload *message.ControlKey) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + + if !session.IsHost() { + logger.Debug().Msg("is not the host") + return nil + } + + return h.desktop.KeyUp(payload.Keysym) +} + +func (h *MessageHandlerCtx) controlCopy(session types.Session) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + + if !session.IsHost() { + logger.Debug().Msg("is not the host") + return nil + } + + return h.desktop.KeyPress(xorg.XK_Control_L, xorg.XK_c) +} + +func (h *MessageHandlerCtx) controlPaste(session types.Session) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + + if !session.IsHost() { + logger.Debug().Msg("is not the host") + return nil + } + + return h.desktop.KeyPress(xorg.XK_Control_L, xorg.XK_v) +} + +func (h *MessageHandlerCtx) controlSelectAll(session types.Session) error { + logger := h.logger.With().Str("session_id", session.ID()).Logger() + + if !session.IsHost() { + logger.Debug().Msg("is not the host") + return nil + } + + return h.desktop.KeyPress(xorg.XK_Control_L, xorg.XK_a) +} diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 67a5bf85..d2d1b40d 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -82,6 +82,27 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM err = h.controlRelease(session) case event.CONTROL_REQUEST: err = h.controlRequest(session) + case event.CONTROL_KEYPRESS: + payload := &message.ControlKey{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlKeyPress(session, payload) + }) + case event.CONTROL_KEYDOWN: + payload := &message.ControlKey{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlKeyDown(session, payload) + }) + case event.CONTROL_KEYUP: + payload := &message.ControlKey{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlKeyUp(session, payload) + }) + case event.CONTROL_COPY: + err = h.controlCopy(session) + case event.CONTROL_PASTE: + err = h.controlPaste(session) + case event.CONTROL_SELECT_ALL: + err = h.controlSelectAll(session) // Screen Events case event.SCREEN_SET: From f6eb8d03155afc3d7c4f83757e5e8631cb85e24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 30 Jan 2022 17:47:28 +0100 Subject: [PATCH 655/876] ws handler simplify logging. --- internal/websocket/handler/handler.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index d2d1b40d..a98e7867 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -34,11 +34,6 @@ type MessageHandlerCtx struct { } func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketMessage) bool { - logger := h.logger.With(). - Str("event", data.Event). - Str("session_id", session.ID()). - Logger() - var err error switch data.Event { // System Events @@ -146,7 +141,10 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM } if err != nil { - logger.Warn().Err(err).Msg("message handler has failed") + h.logger.Warn().Err(err). + Str("event", data.Event). + Str("session_id", session.ID()). + Msg("message handler has failed") } return true From e8c7ab421a45508ef0b7a3083991dff514f79ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 30 Jan 2022 17:52:50 +0100 Subject: [PATCH 656/876] control actions with requests. --- internal/websocket/handler/control.go | 64 +++++++++++---------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index ff910348..1413d165 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -9,17 +9,20 @@ import ( "demodesk/neko/internal/types/message" ) -func (h *MessageHandlerCtx) controlRelease(session types.Session) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() +var ( + ErrIsNotAllowedToHost = errors.New("is not allowed to host") + ErrIsNotTheHost = errors.New("is not the host") + ErrIsAlreadyTheHost = errors.New("is already the host") + ErrIsAlreadyHosted = errors.New("is already hosted") +) +func (h *MessageHandlerCtx) controlRelease(session types.Session) error { if !session.Profile().CanHost { - logger.Debug().Msg("is not allowed to host") - return nil + return ErrIsNotAllowedToHost } if !session.IsHost() { - logger.Debug().Msg("is not the host") - return nil + return ErrIsNotTheHost } h.desktop.ResetKeys() @@ -30,11 +33,11 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { func (h *MessageHandlerCtx) controlRequest(session types.Session) error { if !session.Profile().CanHost { - return errors.New("is not allowed to host") + return ErrIsNotAllowedToHost } if session.IsHost() { - return errors.New("is already the host") + return ErrIsAlreadyTheHost } if !h.sessions.ImplicitHosting() { @@ -47,75 +50,58 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { HostID: host.ID(), }) - return nil + return ErrIsAlreadyHosted } } h.sessions.SetHost(session) + return nil } func (h *MessageHandlerCtx) controlKeyPress(session types.Session, payload *message.ControlKey) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - - if !session.IsHost() { - logger.Debug().Msg("is not the host") - return nil + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err } return h.desktop.KeyPress(payload.Keysym) } func (h *MessageHandlerCtx) controlKeyDown(session types.Session, payload *message.ControlKey) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - - if !session.IsHost() { - logger.Debug().Msg("is not the host") - return nil + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err } return h.desktop.KeyDown(payload.Keysym) } func (h *MessageHandlerCtx) controlKeyUp(session types.Session, payload *message.ControlKey) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - - if !session.IsHost() { - logger.Debug().Msg("is not the host") - return nil + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err } return h.desktop.KeyUp(payload.Keysym) } func (h *MessageHandlerCtx) controlCopy(session types.Session) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - - if !session.IsHost() { - logger.Debug().Msg("is not the host") - return nil + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err } return h.desktop.KeyPress(xorg.XK_Control_L, xorg.XK_c) } func (h *MessageHandlerCtx) controlPaste(session types.Session) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - - if !session.IsHost() { - logger.Debug().Msg("is not the host") - return nil + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err } return h.desktop.KeyPress(xorg.XK_Control_L, xorg.XK_v) } func (h *MessageHandlerCtx) controlSelectAll(session types.Session) error { - logger := h.logger.With().Str("session_id", session.ID()).Logger() - - if !session.IsHost() { - logger.Debug().Msg("is not the host") - return nil + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err } return h.desktop.KeyPress(xorg.XK_Control_L, xorg.XK_a) From 26ab7fa12d3d2ddd7951b70d5f7228147937af39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 30 Jan 2022 17:53:22 +0100 Subject: [PATCH 657/876] add control cut. --- internal/types/event/events.go | 1 + internal/websocket/handler/control.go | 8 ++++++++ internal/websocket/handler/handler.go | 2 ++ 3 files changed, 11 insertions(+) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 35ec3534..74b43f80 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -37,6 +37,7 @@ const ( CONTROL_KEYDOWN = "control/keydown" CONTROL_KEYUP = "control/keyup" // actions + CONTROL_CUT = "control/cut" CONTROL_COPY = "control/copy" CONTROL_PASTE = "control/paste" CONTROL_SELECT_ALL = "control/select_all" diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 1413d165..3f56edae 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -83,6 +83,14 @@ func (h *MessageHandlerCtx) controlKeyUp(session types.Session, payload *message return h.desktop.KeyUp(payload.Keysym) } +func (h *MessageHandlerCtx) controlCut(session types.Session) error { + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err + } + + return h.desktop.KeyPress(xorg.XK_Control_L, xorg.XK_x) +} + func (h *MessageHandlerCtx) controlCopy(session types.Session) error { if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index a98e7867..02469ed3 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -92,6 +92,8 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM err = utils.Unmarshal(payload, data.Payload, func() error { return h.controlKeyUp(session, payload) }) + case event.CONTROL_CUT: + err = h.controlCut(session) case event.CONTROL_COPY: err = h.controlCopy(session) case event.CONTROL_PASTE: From c2cf9277dceb8cd6aba1dbfb1ec975b508e89678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 22 Jan 2022 17:58:05 +0100 Subject: [PATCH 658/876] emit /recevie samples on demand. --- internal/capture/screencast.go | 76 +++++++++++++++++++--------------- internal/capture/streamsink.go | 62 +++++++++++---------------- 2 files changed, 67 insertions(+), 71 deletions(-) diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index aa8d44ba..657133e3 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -25,10 +25,8 @@ type ScreencastManagerCtx struct { pipelineStr string pipelineMu sync.Mutex - image types.Sample - sample chan types.Sample - sampleStop chan struct{} - sampleUpdate chan struct{} + image types.Sample + tickerStop chan struct{} enabled bool started bool @@ -42,18 +40,16 @@ func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { Logger() manager := &ScreencastManagerCtx{ - logger: logger, - pipelineStr: pipelineStr, - sampleStop: make(chan struct{}), - sampleUpdate: make(chan struct{}), - enabled: enabled, - started: false, + logger: logger, + pipelineStr: pipelineStr, + tickerStop: make(chan struct{}), + enabled: enabled, + started: false, } manager.wg.Add(1) go func() { - manager.logger.Debug().Msg("started emitting samples") defer manager.wg.Done() ticker := time.NewTicker(screencastTimeout) @@ -61,15 +57,10 @@ func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { for { select { - case <-manager.sampleStop: - manager.logger.Debug().Msg("stopped emitting samples") + case <-manager.tickerStop: return - case <-manager.sampleUpdate: - manager.logger.Debug().Msg("update emitting samples") - case sample := <-manager.sample: - manager.image = sample case <-ticker.C: - if manager.started && !atomic.CompareAndSwapInt32(&manager.expired, 0, 1) { + if manager.Started() && !atomic.CompareAndSwapInt32(&manager.expired, 0, 1) { manager.stop() } } @@ -84,7 +75,7 @@ func (manager *ScreencastManagerCtx) shutdown() { manager.destroyPipeline() - close(manager.sampleStop) + close(manager.tickerStop) manager.wg.Wait() } @@ -105,22 +96,13 @@ func (manager *ScreencastManagerCtx) Started() bool { func (manager *ScreencastManagerCtx) Image() ([]byte, error) { atomic.StoreInt32(&manager.expired, 0) - if !manager.started { - err := manager.start() - if err != nil { - return nil, err - } - - select { - case sample := <-manager.sample: - return sample.Data, nil - case <-time.After(1 * time.Second): - return nil, errors.New("timeouted") - } + err := manager.start() + if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { + return nil, err } if manager.image.Data == nil { - return nil, errors.New("image sample not found") + return nil, errors.New("image data not found") } return manager.image.Data, nil @@ -173,8 +155,34 @@ func (manager *ScreencastManagerCtx) createPipeline() error { manager.pipeline.AttachAppsink("appsink") manager.pipeline.Play() - manager.sample = manager.pipeline.Sample - manager.sampleUpdate <- struct{}{} + // get first image + var ok bool + select { + case manager.image, ok = <-manager.pipeline.Sample: + if !ok { + return errors.New("unable to get first image") + } + case <-time.After(1 * time.Second): + return errors.New("timeouted while waiting for first image") + } + + manager.wg.Add(1) + + go func() { + manager.logger.Debug().Msg("started receiving images") + defer manager.wg.Done() + + for { + image, ok := <-manager.pipeline.Sample + if !ok { + manager.logger.Debug().Msg("stopped receiving images") + return + } + + manager.image = image + } + }() + return nil } diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index 39b164a6..d012611f 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -25,10 +25,6 @@ type StreamSinkManagerCtx struct { pipelineMu sync.Mutex pipelineStr func() string - sample chan types.Sample - sampleStop chan struct{} - sampleUpdate chan struct{} - listeners map[uintptr]*func(sample types.Sample) listenersMu sync.Mutex } @@ -40,37 +36,12 @@ func streamSinkNew(codec codec.RTPCodec, pipelineStr func() string, video_id str Str("video_id", video_id).Logger() manager := &StreamSinkManagerCtx{ - logger: logger, - codec: codec, - pipelineStr: pipelineStr, - sampleStop: make(chan struct{}), - sampleUpdate: make(chan struct{}), - listeners: map[uintptr]*func(sample types.Sample){}, + logger: logger, + codec: codec, + pipelineStr: pipelineStr, + listeners: map[uintptr]*func(sample types.Sample){}, } - manager.wg.Add(1) - - go func() { - manager.logger.Debug().Msg("started emitting samples") - defer manager.wg.Done() - - for { - select { - case <-manager.sampleStop: - manager.logger.Debug().Msg("stopped emitting samples") - return - case <-manager.sampleUpdate: - manager.logger.Debug().Msg("update emitting samples") - case sample := <-manager.sample: - manager.listenersMu.Lock() - for _, emit := range manager.listeners { - (*emit)(sample) - } - manager.listenersMu.Unlock() - } - } - }() - return manager } @@ -84,8 +55,6 @@ func (manager *StreamSinkManagerCtx) shutdown() { manager.listenersMu.Unlock() manager.destroyPipeline() - - close(manager.sampleStop) manager.wg.Wait() } @@ -249,8 +218,27 @@ func (manager *StreamSinkManagerCtx) createPipeline() error { manager.pipeline.AttachAppsink("appsink") manager.pipeline.Play() - manager.sample = manager.pipeline.Sample - manager.sampleUpdate <- struct{}{} + manager.wg.Add(1) + + go func() { + manager.logger.Debug().Msg("started emitting samples") + defer manager.wg.Done() + + for { + sample, ok := <-manager.pipeline.Sample + if !ok { + manager.logger.Debug().Msg("stopped emitting samples") + return + } + + manager.listenersMu.Lock() + for _, emit := range manager.listeners { + (*emit)(sample) + } + manager.listenersMu.Unlock() + } + }() + return nil } From 924be2050546cf9f9940bb5778cdf0d6745d4588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 9 Feb 2022 20:45:03 +0000 Subject: [PATCH 659/876] WebRTC TCP and UDP mux. --- internal/config/webrtc.go | 91 ++++++++++++++++++------------- internal/webrtc/manager.go | 38 +++++++++++++ internal/webrtc/peerconnection.go | 30 +++++++++- 3 files changed, 121 insertions(+), 38 deletions(-) diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index ab6d84ed..2024274c 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -1,7 +1,6 @@ package config import ( - "fmt" "strconv" "strings" @@ -13,12 +12,6 @@ import ( "demodesk/neko/internal/utils" ) -// default port range - min -const defEprMin = 59000 - -// default port range - max -const defEprMax = 59100 - // default stun server const defStunSrv = "stun:stun.l.google.com:19302" @@ -28,6 +21,8 @@ type WebRTC struct { ICEServers []types.ICEServer EphemeralMin uint16 EphemeralMax uint16 + TCPMux int + UDPMux int NAT1To1IPs []string IpRetrievalUrl string @@ -49,6 +44,21 @@ func (WebRTC) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().String("webrtc.epr", "", "limits the pool of ephemeral ports that ICE UDP connections can allocate from") + if err := viper.BindPFlag("webrtc.epr", cmd.PersistentFlags().Lookup("webrtc.epr")); err != nil { + return err + } + + cmd.PersistentFlags().Int("webrtc.tcpmux", 0, "single TCP mux port for all peers") + if err := viper.BindPFlag("webrtc.tcpmux", cmd.PersistentFlags().Lookup("webrtc.tcpmux")); err != nil { + return err + } + + cmd.PersistentFlags().Int("webrtc.udpmux", 0, "single UDP mux port for all peers, replaces EPR") + if err := viper.BindPFlag("webrtc.udpmux", cmd.PersistentFlags().Lookup("webrtc.udpmux")); err != nil { + return err + } + cmd.PersistentFlags().StringSlice("webrtc.nat1to1", []string{}, "sets a list of external IP addresses of 1:1 (D)NAT and a candidate type for which the external IP address is used") if err := viper.BindPFlag("webrtc.nat1to1", cmd.PersistentFlags().Lookup("webrtc.nat1to1")); err != nil { return err @@ -59,11 +69,6 @@ func (WebRTC) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().String("webrtc.epr", fmt.Sprintf("%d-%d", defEprMin, defEprMax), "limits the pool of ephemeral ports that ICE UDP connections can allocate from") - if err := viper.BindPFlag("webrtc.epr", cmd.PersistentFlags().Lookup("webrtc.epr")); err != nil { - return err - } - return nil } @@ -83,6 +88,43 @@ func (s *WebRTC) Set() { }) } + s.TCPMux = viper.GetInt("webrtc.tcpmux") + s.UDPMux = viper.GetInt("webrtc.udpmux") + + epr := viper.GetString("webrtc.epr") + if epr != "" { + ports := strings.SplitN(epr, "-", -1) + if len(ports) > 1 { + min, err := strconv.ParseUint(ports[0], 10, 16) + if err != nil { + log.Panic().Err(err).Msgf("unable to parse ephemeral min port") + } + + max, err := strconv.ParseUint(ports[1], 10, 16) + if err != nil { + log.Panic().Err(err).Msgf("unable to parse ephemeral max port") + } + + s.EphemeralMin = uint16(min) + s.EphemeralMax = uint16(max) + } + + if s.EphemeralMin > s.EphemeralMax { + log.Panic().Msgf("ephemeral min port cannot be bigger than max") + } + } + + if epr == "" && s.TCPMux == 0 && s.UDPMux == 0 { + // using default epr range + s.EphemeralMin = 59000 + s.EphemeralMax = 59100 + + log.Warn(). + Uint16("min", s.EphemeralMin). + Uint16("max", s.EphemeralMax). + Msgf("no TCP, UDP mux or epr specified, using default epr range") + } + s.NAT1To1IPs = viper.GetStringSlice("webrtc.nat1to1") s.IpRetrievalUrl = viper.GetString("webrtc.ip_retrieval_url") if s.IpRetrievalUrl != "" && len(s.NAT1To1IPs) == 0 { @@ -93,29 +135,4 @@ func (s *WebRTC) Set() { log.Warn().Err(err).Msgf("IP retrieval failed") } } - - min := uint16(defEprMin) - max := uint16(defEprMax) - - epr := viper.GetString("webrtc.epr") - ports := strings.SplitN(epr, "-", -1) - if len(ports) > 1 { - start, err := strconv.ParseUint(ports[0], 10, 16) - if err == nil { - min = uint16(start) - } - - end, err := strconv.ParseUint(ports[1], 10, 16) - if err == nil { - max = uint16(end) - } - } - - if min > max { - s.EphemeralMin = max - s.EphemeralMax = min - } else { - s.EphemeralMin = min - s.EphemeralMax = max - } } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 49a982a6..5d381925 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -2,9 +2,11 @@ package webrtc import ( "fmt" + "net" "strings" "time" + "github.com/pion/ice/v2" "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/rs/zerolog" @@ -16,6 +18,7 @@ import ( "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" "demodesk/neko/internal/webrtc/cursor" + "demodesk/neko/internal/webrtc/pionlog" ) // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds @@ -51,18 +54,53 @@ type WebRTCManagerCtx struct { curImage *cursor.ImageCtx curPosition *cursor.PositionCtx + tcpMux ice.TCPMux + udpMux ice.UDPMux + camStop, micStop *func() } func (manager *WebRTCManagerCtx) Start() { manager.curImage.Start() + logger := pionlog.New(manager.logger) + + // add TCP Mux listener + if manager.config.TCPMux > 0 { + tcpListener, err := net.ListenTCP("tcp", &net.TCPAddr{ + IP: net.IP{0, 0, 0, 0}, + Port: manager.config.TCPMux, + }) + + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to setup ice TCP mux") + } + + manager.tcpMux = webrtc.NewICETCPMux(logger.NewLogger("ice-tcp"), tcpListener, 32) + } + + // add UDP Mux listener + if manager.config.UDPMux > 0 { + udpListener, err := net.ListenUDP("udp", &net.UDPAddr{ + IP: net.IP{0, 0, 0, 0}, + Port: manager.config.UDPMux, + }) + + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to setup ice UDP mux") + } + + manager.udpMux = webrtc.NewICEUDPMux(logger.NewLogger("ice-udp"), udpListener) + } + manager.logger.Info(). Bool("icelite", manager.config.ICELite). Bool("icetrickle", manager.config.ICETrickle). Interface("iceservers", manager.config.ICEServers). Str("nat1to1", strings.Join(manager.config.NAT1To1IPs, ",")). Str("epr", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)). + Int("tcpmux", manager.config.TCPMux). + Int("udpmux", manager.config.UDPMux). Msg("webrtc starting") } diff --git a/internal/webrtc/peerconnection.go b/internal/webrtc/peerconnection.go index 15a93c2d..6a9683b0 100644 --- a/internal/webrtc/peerconnection.go +++ b/internal/webrtc/peerconnection.go @@ -23,11 +23,39 @@ func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logg LoggerFactory: pionlog.New(logger), } - _ = settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) settings.SetLite(manager.config.ICELite) + var networkType []webrtc.NetworkType + + // udp candidates + if manager.udpMux != nil { + settings.SetICEUDPMux(manager.udpMux) + networkType = append(networkType, + webrtc.NetworkTypeUDP4, + webrtc.NetworkTypeUDP6, + ) + } else if manager.config.EphemeralMax != 0 { + _ = settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) + networkType = append(networkType, + webrtc.NetworkTypeUDP4, + webrtc.NetworkTypeUDP6, + ) + } + + // tcp candidates + if manager.tcpMux != nil { + settings.SetICETCPMux(manager.tcpMux) + networkType = append(networkType, + webrtc.NetworkTypeTCP4, + webrtc.NetworkTypeTCP6, + ) + } + + // enable support for TCP and UDP ICE candidates + settings.SetNetworkTypes(networkType) + // create interceptor registry registry := &interceptor.Registry{} if err := webrtc.RegisterDefaultInterceptors(engine, registry); err != nil { From c83883fd1ea298967d20fba94804d0c8b8b6ab5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 9 Feb 2022 23:10:29 +0100 Subject: [PATCH 660/876] vscode debugging. --- .devcontainer/README.md | 17 ++++++++++++++++- .gitignore | 1 + .vscode/launch.json | 4 +++- .vscode/settings.json | 9 +-------- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.devcontainer/README.md b/.devcontainer/README.md index a6069f1c..1ddcb7f8 100644 --- a/.devcontainer/README.md +++ b/.devcontainer/README.md @@ -2,4 +2,19 @@ You need to run all dependencies with `deps` command before you start debugging. -Make sure your local IP is correct in `.vscode/launch.json`, +Create `.env.development` in repository root. Make sure your local IP is correct. + +```sh +NEKO_WEBRTC_NAT1TO1=10.0.0.8 +``` + +# without container + +- Make sure `pulseaudio` contains correct configuration. +- Specify `DISPLAY` that is being used by xorg. + +```sh +DISPLAY=:0 +NEKO_WEBRTC_NAT1TO1=10.0.0.8 +NEKO_SERVER_BIND=:3000 +``` diff --git a/.gitignore b/.gitignore index 5e85427e..d13f1364 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bin/ .idea +.env.development diff --git a/.vscode/launch.json b/.vscode/launch.json index 1cf4b94e..4973993a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,12 +7,14 @@ { "name": "launch", "type": "go", + "debugAdapter": "dlv-dap", "request": "launch", "mode": "debug", "program": "${workspaceFolder}/cmd/neko", "output": "${workspaceFolder}/bin/debug/neko", "cwd": "${workspaceFolder}/", - "args": ["serve", "-d", "--webrtc.nat1to1", "192.168.1.80"] + "args": ["serve", "-d", "-c", "dev/runtime/config.yml"], + "envFile": "${workspaceFolder}/.env.development" } ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index f30aa6f0..8645d8f0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,14 +3,7 @@ "go.inferGopath": false, "go.autocompleteUnimportedPackages": true, "go.delveConfig": { - "useApiV1": false, - "dlvLoadConfig": { - "followPointers": true, - "maxVariableRecurse": 3, - "maxStringLen": 400, - "maxArrayValues": 400, - "maxStructFields": -1 - } + "useApiV1": false }, "[go]": { "editor.formatOnSave": true, From 369d8f3ccfcf0c118843e6b13cd4ada1ea2ada69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 10 Feb 2022 00:12:30 +0100 Subject: [PATCH 661/876] peer webrtc connection check. --- internal/types/webrtc.go | 1 + internal/webrtc/peer.go | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index ce53b003..54a7c6e6 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -9,6 +9,7 @@ import ( var ( ErrWebRTCVideoNotFound = errors.New("webrtc video not found") ErrWebRTCDataChannelNotFound = errors.New("webrtc data channel not found") + ErrWebRTCConnectionNotFound = errors.New("webrtc connection not found") ) type ICEServer struct { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 97be3cb2..b338204d 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -5,6 +5,8 @@ import ( "github.com/pion/webrtc/v3" "github.com/rs/zerolog" + + "demodesk/neko/internal/types" ) type WebRTCPeerCtx struct { @@ -20,6 +22,10 @@ func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescript peer.mu.Lock() defer peer.mu.Unlock() + if peer.connection == nil { + return nil, types.ErrWebRTCConnectionNotFound + } + offer, err := peer.connection.CreateOffer(&webrtc.OfferOptions{ ICERestart: ICERestart, }) @@ -34,6 +40,10 @@ func (peer *WebRTCPeerCtx) CreateAnswer() (*webrtc.SessionDescription, error) { peer.mu.Lock() defer peer.mu.Unlock() + if peer.connection == nil { + return nil, types.ErrWebRTCConnectionNotFound + } + answer, err := peer.connection.CreateAnswer(nil) if err != nil { return nil, err @@ -65,6 +75,10 @@ func (peer *WebRTCPeerCtx) SetOffer(sdp string) error { peer.mu.Lock() defer peer.mu.Unlock() + if peer.connection == nil { + return types.ErrWebRTCConnectionNotFound + } + return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ SDP: sdp, Type: webrtc.SDPTypeOffer, @@ -75,6 +89,10 @@ func (peer *WebRTCPeerCtx) SetAnswer(sdp string) error { peer.mu.Lock() defer peer.mu.Unlock() + if peer.connection == nil { + return types.ErrWebRTCConnectionNotFound + } + return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ SDP: sdp, Type: webrtc.SDPTypeAnswer, @@ -85,6 +103,10 @@ func (peer *WebRTCPeerCtx) SetCandidate(candidate webrtc.ICECandidateInit) error peer.mu.Lock() defer peer.mu.Unlock() + if peer.connection == nil { + return types.ErrWebRTCConnectionNotFound + } + return peer.connection.AddICECandidate(candidate) } @@ -92,6 +114,10 @@ func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { peer.mu.Lock() defer peer.mu.Unlock() + if peer.connection == nil { + return types.ErrWebRTCConnectionNotFound + } + peer.logger.Info().Str("video_id", videoID).Msg("change video id") return peer.changeVideo(videoID) } From d20fa071e77cf92e848d65114c4c32268c46677a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 10 Feb 2022 23:39:52 +0100 Subject: [PATCH 662/876] register negotiation event after initial offer. --- internal/types/webrtc.go | 2 +- internal/webrtc/manager.go | 50 ++++++++++++++++++---------- internal/websocket/handler/signal.go | 7 +--- 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go index 54a7c6e6..12c92973 100644 --- a/internal/types/webrtc.go +++ b/internal/types/webrtc.go @@ -38,5 +38,5 @@ type WebRTCManager interface { ICEServers() []ICEServer - CreatePeer(session Session, videoID string) (WebRTCPeer, error) + CreatePeer(session Session, videoID string) (*webrtc.SessionDescription, error) } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 5d381925..d6debfe8 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -117,7 +117,7 @@ func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { return manager.config.ICEServers } -func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (types.WebRTCPeer, error) { +func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) { // add session id to logger context logger := manager.logger.With().Str("session_id", session.ID()).Logger() logger.Info().Msg("creating webrtc peer") @@ -295,22 +295,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin logger.Info().Interface("data-channel", dc).Msg("got remote data channel") }) - connection.OnNegotiationNeeded(func() { - logger.Warn().Msg("negotiation is needed") - - offer, err := peer.CreateOffer(false) - if err != nil { - logger.Err(err).Msg("sdp offer failed") - return - } - - session.Send( - event.SIGNAL_OFFER, - message.SignalDescription{ - SDP: offer.SDP, - }) - }) - connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: @@ -370,5 +354,35 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) session.SetWebRTCPeer(peer) - return peer, nil + + offer, err := peer.CreateOffer(false) + if err != nil { + return nil, err + } + + // on negotiation needed handler must be registered after creating initial + // offer, otherwise it can fire and intercept sucessful negotiation + + connection.OnNegotiationNeeded(func() { + logger.Warn().Msg("negotiation is needed") + + if connection.SignalingState() != webrtc.SignalingStateStable { + logger.Warn().Msg("connection isn't stable yet; postponing...") + return + } + + offer, err := peer.CreateOffer(false) + if err != nil { + logger.Err(err).Msg("sdp offer failed") + return + } + + session.Send( + event.SIGNAL_OFFER, + message.SignalDescription{ + SDP: offer.SDP, + }) + }) + + return offer, nil } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 88229265..2a49fa1e 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -19,12 +19,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag payload.Video = videos[0] } - peer, err := h.webrtc.CreatePeer(session, payload.Video) - if err != nil { - return err - } - - offer, err := peer.CreateOffer(false) + offer, err := h.webrtc.CreatePeer(session, payload.Video) if err != nil { return err } From 55a2b14aeac51e1633855fa8fbafecca64f0ad8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 12 Feb 2022 18:46:00 +0100 Subject: [PATCH 663/876] webrtc implement signal close. --- internal/session/session.go | 8 +++++++- internal/types/event/events.go | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/session/session.go b/internal/session/session.go index 8e9c4d77..6daaee81 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -6,6 +6,7 @@ import ( "github.com/rs/zerolog" "demodesk/neko/internal/types" + "demodesk/neko/internal/types/event" ) type SessionCtx struct { @@ -143,10 +144,15 @@ func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, conne } session.webrtcMu.Lock() - if webrtcPeer == session.webrtcPeer { + isCurrentPeer = webrtcPeer == session.webrtcPeer + if isCurrentPeer { session.webrtcPeer = nil } session.webrtcMu.Unlock() + + if isCurrentPeer { + session.Send(event.SIGNAL_CLOSE, nil) + } } func (session *SessionCtx) GetWebRTCPeer() types.WebRTCPeer { diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 74b43f80..b9c37202 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -15,6 +15,7 @@ const ( SIGNAL_PROVIDE = "signal/provide" SIGNAL_CANDIDATE = "signal/candidate" SIGNAL_VIDEO = "signal/video" + SIGNAL_CLOSE = "signal/close" ) const ( From d0686988363d8023d6a5e1eb3705623c7d41920e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 12 Feb 2022 18:55:56 +0100 Subject: [PATCH 664/876] update logging. --- internal/capture/gst/gst.go | 4 ++-- internal/session/session.go | 8 ++++++++ internal/webrtc/manager.go | 8 ++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index e0a50ae9..d2cb1781 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -139,7 +139,7 @@ func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.i log.Warn(). Str("module", "capture"). Str("submodule", "gstreamer"). - Int("pipeline-id", int(pipelineID)). + Int("pipeline_id", int(pipelineID)). Msgf("discarding sample, pipeline not found") } } @@ -153,6 +153,6 @@ func goPipelineLog(levelUnsafe *C.char, msgUnsafe *C.char, pipelineID C.int) { log.WithLevel(level). Str("module", "capture"). Str("submodule", "gstreamer"). - Int("pipeline-id", int(pipelineID)). + Int("pipeline_id", int(pipelineID)). Msg(msg) } diff --git a/internal/session/session.go b/internal/session/session.go index 6daaee81..4ae9249a 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -83,6 +83,10 @@ func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPe return } + session.logger.Info(). + Bool("connected", connected). + Msg("set websocket connected") + session.state.IsConnected = connected if connected { @@ -136,6 +140,10 @@ func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, conne return } + session.logger.Info(). + Bool("connected", connected). + Msg("set webrtc connected") + session.state.IsWatching = connected session.manager.emmiter.Emit("state_changed", session) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index d6debfe8..3f607a34 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -4,6 +4,7 @@ import ( "fmt" "net" "strings" + "sync/atomic" "time" "github.com/pion/ice/v2" @@ -48,6 +49,7 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con type WebRTCManagerCtx struct { logger zerolog.Logger config *config.WebRTC + peerId int32 desktop types.DesktopManager capture types.CaptureManager @@ -118,8 +120,10 @@ func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { } func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) { + id := atomic.AddInt32(&manager.peerId, 1) + // add session id to logger context - logger := manager.logger.With().Str("session_id", session.ID()).Logger() + logger := manager.logger.With().Str("session_id", session.ID()).Int32("peer_id", id).Logger() logger.Info().Msg("creating webrtc peer") // all audios must have the same codec @@ -292,7 +296,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) connection.OnDataChannel(func(dc *webrtc.DataChannel) { - logger.Info().Interface("data-channel", dc).Msg("got remote data channel") + logger.Info().Interface("data_channel", dc).Msg("got remote data channel") }) connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { From 89ba775a71b80d6fc19cc33543d83379c9212287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 12 Feb 2022 20:22:50 +0100 Subject: [PATCH 665/876] add pprof. --- internal/config/server.go | 7 +++++++ internal/http/debug.go | 36 ++++++++++++++++++++++++++++++++++++ internal/http/manager.go | 4 ++++ 3 files changed, 47 insertions(+) create mode 100644 internal/http/debug.go diff --git a/internal/config/server.go b/internal/config/server.go index c98e2337..b68df15a 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -12,6 +12,7 @@ type Server struct { Key string Bind string Static string + PProf bool CORS []string } @@ -36,6 +37,11 @@ func (Server) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("server.pprof", false, "enable pprof endpoint available at /debug/pprof") + if err := viper.BindPFlag("server.pprof", cmd.PersistentFlags().Lookup("server.pprof")); err != nil { + return err + } + cmd.PersistentFlags().StringSlice("server.cors", []string{"*"}, "list of allowed origins for CORS") if err := viper.BindPFlag("server.cors", cmd.PersistentFlags().Lookup("server.cors")); err != nil { return err @@ -49,6 +55,7 @@ func (s *Server) Set() { s.Key = viper.GetString("server.key") s.Bind = viper.GetString("server.bind") s.Static = viper.GetString("server.static") + s.PProf = viper.GetBool("server.pprof") s.CORS = viper.GetStringSlice("server.cors") in, _ := utils.ArrayIn("*", s.CORS) diff --git a/internal/http/debug.go b/internal/http/debug.go new file mode 100644 index 00000000..ef72b35a --- /dev/null +++ b/internal/http/debug.go @@ -0,0 +1,36 @@ +package http + +import ( + "net/http" + "net/http/pprof" + + "github.com/go-chi/chi" + + "demodesk/neko/internal/types" +) + +func pprofHandler(r types.Router) { + r.Get("/debug/pprof/", func(w http.ResponseWriter, r *http.Request) error { + pprof.Index(w, r) + return nil + }) + + r.Get("/debug/pprof/{action}", func(w http.ResponseWriter, r *http.Request) error { + action := chi.URLParam(r, "action") + + switch action { + case "cmdline": + pprof.Cmdline(w, r) + case "profile": + pprof.Profile(w, r) + case "symbol": + pprof.Symbol(w, r) + case "trace": + pprof.Trace(w, r) + default: + pprof.Handler(action).ServeHTTP(w, r) + } + + return nil + }) +} diff --git a/internal/http/manager.go b/internal/http/manager.go index 20169a2e..73c4ed25 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -57,6 +57,10 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c }) } + if config.PProf { + pprofHandler(router) + } + return &HttpManagerCtx{ logger: logger, config: config, From f32e7e707553a2af46681bf401d9dac6afaa1b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 14 Feb 2022 17:41:47 +0000 Subject: [PATCH 666/876] fix-races. --- internal/capture/screencast.go | 16 +++++++++++++--- internal/capture/streamsink.go | 3 ++- internal/webrtc/cursor/image.go | 27 ++++++++++++++++----------- internal/webrtc/cursor/position.go | 22 +++++++++++++--------- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 657133e3..e73705d8 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -26,6 +26,7 @@ type ScreencastManagerCtx struct { pipelineMu sync.Mutex image types.Sample + imageMu sync.Mutex tickerStop chan struct{} enabled bool @@ -101,6 +102,9 @@ func (manager *ScreencastManagerCtx) Image() ([]byte, error) { return nil, err } + manager.imageMu.Lock() + defer manager.imageMu.Unlock() + if manager.image.Data == nil { return nil, errors.New("image data not found") } @@ -156,30 +160,36 @@ func (manager *ScreencastManagerCtx) createPipeline() error { manager.pipeline.Play() // get first image - var ok bool select { - case manager.image, ok = <-manager.pipeline.Sample: + case image, ok := <-manager.pipeline.Sample: if !ok { return errors.New("unable to get first image") + } else { + manager.imageMu.Lock() + manager.image = image + manager.imageMu.Unlock() } case <-time.After(1 * time.Second): return errors.New("timeouted while waiting for first image") } manager.wg.Add(1) + pipeline := manager.pipeline go func() { manager.logger.Debug().Msg("started receiving images") defer manager.wg.Done() for { - image, ok := <-manager.pipeline.Sample + image, ok := <-pipeline.Sample if !ok { manager.logger.Debug().Msg("stopped receiving images") return } + manager.imageMu.Lock() manager.image = image + manager.imageMu.Unlock() } }() diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index d012611f..c5e3c9dc 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -219,13 +219,14 @@ func (manager *StreamSinkManagerCtx) createPipeline() error { manager.pipeline.Play() manager.wg.Add(1) + pipeline := manager.pipeline go func() { manager.logger.Debug().Msg("started emitting samples") defer manager.wg.Done() for { - sample, ok := <-manager.pipeline.Sample + sample, ok := <-pipeline.Sample if !ok { manager.logger.Debug().Msg("stopped emitting samples") return diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 3b151152..fe6d203c 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -22,12 +22,14 @@ func NewImage(desktop types.DesktopManager) *ImageCtx { } type ImageCtx struct { - logger zerolog.Logger - desktop types.DesktopManager - emitMu sync.Mutex - listeners map[uintptr]*func(entry *ImageEntry) - cacheMu sync.Mutex + logger zerolog.Logger + desktop types.DesktopManager + + listeners map[uintptr]*func(entry *ImageEntry) + listenersMu sync.Mutex + cache map[uint64]*ImageEntry + cacheMu sync.Mutex current *ImageEntry maxSerial uint64 } @@ -46,9 +48,12 @@ func (manager *ImageCtx) Start() { } manager.current = entry + + manager.listenersMu.Lock() for _, emit := range manager.listeners { (*emit)(entry) } + manager.listenersMu.Unlock() }) manager.logger.Info().Msg("starting") @@ -57,11 +62,11 @@ func (manager *ImageCtx) Start() { func (manager *ImageCtx) Shutdown() { manager.logger.Info().Msg("shutdown") - manager.emitMu.Lock() + manager.listenersMu.Lock() for key := range manager.listeners { delete(manager.listeners, key) } - manager.emitMu.Unlock() + manager.listenersMu.Unlock() } func (manager *ImageCtx) GetCached(serial uint64) (*ImageEntry, error) { @@ -101,8 +106,8 @@ func (manager *ImageCtx) Get() (*ImageEntry, error) { } func (manager *ImageCtx) AddListener(listener *func(entry *ImageEntry)) { - manager.emitMu.Lock() - defer manager.emitMu.Unlock() + manager.listenersMu.Lock() + defer manager.listenersMu.Unlock() if listener != nil { ptr := reflect.ValueOf(listener).Pointer() @@ -111,8 +116,8 @@ func (manager *ImageCtx) AddListener(listener *func(entry *ImageEntry)) { } func (manager *ImageCtx) RemoveListener(listener *func(entry *ImageEntry)) { - manager.emitMu.Lock() - defer manager.emitMu.Unlock() + manager.listenersMu.Lock() + defer manager.listenersMu.Unlock() if listener != nil { ptr := reflect.ValueOf(listener).Pointer() diff --git a/internal/webrtc/cursor/position.go b/internal/webrtc/cursor/position.go index 81b65eed..6c4ea7e2 100644 --- a/internal/webrtc/cursor/position.go +++ b/internal/webrtc/cursor/position.go @@ -16,30 +16,34 @@ func NewPosition() *PositionCtx { } type PositionCtx struct { - logger zerolog.Logger - emitMu sync.Mutex - listeners map[uintptr]*func(x, y int) + logger zerolog.Logger + + listeners map[uintptr]*func(x, y int) + listenersMu sync.Mutex } func (manager *PositionCtx) Shutdown() { manager.logger.Info().Msg("shutdown") - manager.emitMu.Lock() + manager.listenersMu.Lock() for key := range manager.listeners { delete(manager.listeners, key) } - manager.emitMu.Unlock() + manager.listenersMu.Unlock() } func (manager *PositionCtx) Set(x, y int) { + manager.listenersMu.Lock() + defer manager.listenersMu.Unlock() + for _, emit := range manager.listeners { (*emit)(x, y) } } func (manager *PositionCtx) AddListener(listener *func(x, y int)) { - manager.emitMu.Lock() - defer manager.emitMu.Unlock() + manager.listenersMu.Lock() + defer manager.listenersMu.Unlock() if listener != nil { ptr := reflect.ValueOf(listener).Pointer() @@ -48,8 +52,8 @@ func (manager *PositionCtx) AddListener(listener *func(x, y int)) { } func (manager *PositionCtx) RemoveListener(listener *func(x, y int)) { - manager.emitMu.Lock() - defer manager.emitMu.Unlock() + manager.listenersMu.Lock() + defer manager.listenersMu.Unlock() if listener != nil { ptr := reflect.ValueOf(listener).Pointer() From d108343ced6d4e32cb5bd0a0b88c66b1f5ec55a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 7 Mar 2022 10:05:02 +0000 Subject: [PATCH 667/876] Logs JSON output. --- cmd/root.go | 112 +++++++++++++++++++--------------- internal/config/root.go | 76 ++++++++++++++++++++--- internal/websocket/manager.go | 4 +- 3 files changed, 133 insertions(+), 59 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 79bc4096..187482ee 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -34,49 +34,10 @@ func init() { rootConfig := config.Root{} cobra.OnInitialize(func() { - ////// - // logs - ////// - console := zerolog.ConsoleWriter{Out: os.Stdout} - zerolog.TimeFieldFormat = zerolog.TimeFormatUnix - zerolog.SetGlobalLevel(zerolog.InfoLevel) - - logs := viper.GetBool("logs") - if !logs { - log.Logger = log.Output(console) - } else { - logsPath := filepath.Join(".", "logs") - if runtime.GOOS == "linux" { - logsPath = "/var/log/neko" - } - - if _, err := os.Stat(logsPath); os.IsNotExist(err) { - _ = os.Mkdir(logsPath, os.ModePerm) - } - - latest := filepath.Join(logsPath, "neko-latest.log") - if _, err := os.Stat(latest); err == nil { - err = os.Rename(latest, filepath.Join(logsPath, "neko."+time.Now().Format("2006-01-02T15-04-05Z07-00")+".log")) - if err != nil { - log.Panic().Err(err).Msg("failed to rotate log file") - } - } - - logf, err := os.OpenFile(latest, os.O_RDWR|os.O_CREATE, 0666) - if err != nil { - log.Panic().Err(err).Msg("failed to create log file") - } - - logger := diode.NewWriter(logf, 1000, 10*time.Millisecond, func(missed int) { - fmt.Printf("logger dropped %d messages", missed) - }) - - log.Logger = log.Output(io.MultiWriter(console, logger)) - } - ////// // configs ////// + config := viper.GetString("config") // Use config file from the flag. if config == "" { config = os.Getenv("NEKO_CONFIG") // Use config file from the environment variable. @@ -97,26 +58,81 @@ func init() { viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) viper.AutomaticEnv() // read in environment variables that match + // read config values err := viper.ReadInConfig() if err != nil && config != "" { - log.Err(err) + panic("unable to read config file: " + err.Error()) } // get full config file path config = viper.ConfigFileUsed() + // set root config values + rootConfig.Set() + ////// - // debug + // logs ////// - debug := viper.GetBool("debug") - if debug { - zerolog.SetGlobalLevel(zerolog.DebugLevel) + var logWriter io.Writer + + // log to a directory instead of stderr + if rootConfig.LogDir != "" { + if _, err := os.Stat(rootConfig.LogDir); os.IsNotExist(err) { + _ = os.Mkdir(rootConfig.LogDir, os.ModePerm) + } + + latest := filepath.Join(rootConfig.LogDir, "neko-latest.log") + if _, err := os.Stat(latest); err == nil { + err = os.Rename(latest, filepath.Join(rootConfig.LogDir, "neko."+time.Now().Format("2006-01-02T15-04-05Z07-00")+".log")) + if err != nil { + panic("failed to rotate log file: " + err.Error()) + } + } + + logf, err := os.OpenFile(latest, os.O_RDWR|os.O_CREATE, 0666) + if err != nil { + panic("failed to open log file: " + err.Error()) + } + + logWriter = diode.NewWriter(logf, 1000, 10*time.Millisecond, func(missed int) { + fmt.Printf("logger dropped %d messages", missed) + }) + } else { + logWriter = os.Stderr + } + + // log console output instead of json + if !rootConfig.LogJson { + logWriter = zerolog.ConsoleWriter{ + Out: logWriter, + NoColor: rootConfig.LogNocolor, + } + } + + // save new logger output + log.Logger = log.Output(logWriter) + + // set custom log level + if rootConfig.LogLevel != zerolog.NoLevel { + zerolog.SetGlobalLevel(rootConfig.LogLevel) + } + + // set custom log tiem format + if rootConfig.LogTime != "" { + zerolog.TimeFieldFormat = rootConfig.LogTime + } + + timeFormat := rootConfig.LogTime + if rootConfig.LogTime == zerolog.TimeFormatUnix { + timeFormat = "UNIX" } logger := log.With(). - Bool("debug", debug). - Bool("logs", logs). Str("config", config). + Str("log-level", zerolog.GlobalLevel().String()). + Bool("log-json", rootConfig.LogJson). + Str("log-time", timeFormat). + Str("log-dir", rootConfig.LogDir). Logger() if config == "" { @@ -128,8 +144,6 @@ func init() { logger.Info().Msg("preflight complete with config file") } } - - rootConfig.Set() }) if err := rootConfig.Init(root); err != nil { diff --git a/internal/config/root.go b/internal/config/root.go index b08534af..e9870eda 100644 --- a/internal/config/root.go +++ b/internal/config/root.go @@ -1,29 +1,58 @@ package config import ( + "os" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" ) type Root struct { - Debug bool - Logs bool Config string + + LogLevel zerolog.Level + LogTime string + LogJson bool + LogNocolor bool + LogDir string } func (Root) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().StringP("config", "c", "", "configuration file path") + if err := viper.BindPFlag("config", cmd.PersistentFlags().Lookup("config")); err != nil { + return err + } + + // just a shortcut cmd.PersistentFlags().BoolP("debug", "d", false, "enable debug mode") if err := viper.BindPFlag("debug", cmd.PersistentFlags().Lookup("debug")); err != nil { return err } - cmd.PersistentFlags().BoolP("logs", "l", false, "save logs to file") - if err := viper.BindPFlag("logs", cmd.PersistentFlags().Lookup("logs")); err != nil { + cmd.PersistentFlags().String("log.level", "info", "set log level (trace, debug, info, warn, error, fatal, panic, disabled)") + if err := viper.BindPFlag("log.level", cmd.PersistentFlags().Lookup("log.level")); err != nil { return err } - cmd.PersistentFlags().StringP("config", "c", "", "configuration file path") - if err := viper.BindPFlag("config", cmd.PersistentFlags().Lookup("config")); err != nil { + cmd.PersistentFlags().String("log.time", "unix", "time format used in logs (unix, unixms, unixmicro)") + if err := viper.BindPFlag("log.time", cmd.PersistentFlags().Lookup("log.time")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("log.json", false, "logs in JSON format") + if err := viper.BindPFlag("log.json", cmd.PersistentFlags().Lookup("log.json")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("log.nocolor", false, "no ANSI colors in non-JSON output") + if err := viper.BindPFlag("log.nocolor", cmd.PersistentFlags().Lookup("log.nocolor")); err != nil { + return err + } + + cmd.PersistentFlags().String("log.dir", "", "logging directory to store logs") + if err := viper.BindPFlag("log.dir", cmd.PersistentFlags().Lookup("log.dir")); err != nil { return err } @@ -31,7 +60,38 @@ func (Root) Init(cmd *cobra.Command) error { } func (s *Root) Set() { - s.Logs = viper.GetBool("logs") - s.Debug = viper.GetBool("debug") s.Config = viper.GetString("config") + + logLevel := viper.GetString("log.level") + level, err := zerolog.ParseLevel(logLevel) + if err != nil { + log.Warn().Msgf("unknown log level %s", logLevel) + } else { + s.LogLevel = level + } + + logTime := viper.GetString("log.time") + switch logTime { + case "unix": + s.LogTime = zerolog.TimeFormatUnix + case "unixms": + s.LogTime = zerolog.TimeFormatUnixMs + case "unixmicro": + s.LogTime = zerolog.TimeFormatUnixMicro + default: + log.Warn().Msgf("unknown log time %s", logTime) + } + + s.LogJson = viper.GetBool("log.json") + s.LogNocolor = viper.GetBool("log.nocolor") + s.LogDir = viper.GetString("log.dir") + + if viper.GetBool("debug") && s.LogLevel != zerolog.TraceLevel { + s.LogLevel = zerolog.DebugLevel + } + + // support for NO_COLOR env variable: https://no-color.org/ + if os.Getenv("NO_COLOR") != "" { + s.LogNocolor = true + } } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index f0aa2559..3ec44e40 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -105,7 +105,7 @@ func (manager *WebSocketManagerCtx) Start() { manager.sessions.Broadcast(event.CONTROL_HOST, payload, nil) - manager.logger.Debug(). + manager.logger.Info(). Bool("has_host", payload.HasHost). Str("host_id", payload.HostID). Msg("session host changed") @@ -117,7 +117,7 @@ func (manager *WebSocketManagerCtx) Start() { return } - manager.logger.Debug().Msg("sync clipboard") + manager.logger.Info().Msg("sync clipboard") data, err := manager.desktop.ClipboardGetText() if err != nil { From aa556b7839cc2d1d7f2f13623486070427f8c410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 9 Mar 2022 13:34:01 +0100 Subject: [PATCH 668/876] go mod tidy. --- go.mod | 2 +- go.sum | 77 ++++------------------------------------------------------ 2 files changed, 6 insertions(+), 73 deletions(-) diff --git a/go.mod b/go.mod index 97f48083..b9e07f2c 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/go-chi/cors v1.2.0 github.com/gorilla/websocket v1.4.2 github.com/kataras/go-events v0.0.2 + github.com/pion/ice/v2 v2.1.18 github.com/pion/interceptor v0.1.5 github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.9 @@ -27,7 +28,6 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pion/datachannel v1.5.2 // indirect github.com/pion/dtls/v2 v2.1.0 // indirect - github.com/pion/ice/v2 v2.1.18 // indirect github.com/pion/mdns v0.0.5 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtp v1.7.4 // indirect diff --git a/go.sum b/go.sum index 69638b57..0759b446 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,6 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU= cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= @@ -73,7 +71,6 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -97,7 +94,6 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -212,14 +208,11 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= @@ -233,26 +226,21 @@ github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iP github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -267,7 +255,6 @@ github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= @@ -300,17 +287,11 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -323,32 +304,22 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= -github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho= -github.com/pion/dtls/v2 v2.0.10 h1:wgys7gPR1NMbWjmjJ3CW7lkUGaun8djgH8nahpNLnxI= -github.com/pion/dtls/v2 v2.0.10/go.mod h1:00OxfeCRWHShcqT9jx8pKKmBWuTt0NCZoVPCaC4VKvU= github.com/pion/dtls/v2 v2.0.13/go.mod h1:OaE7eTM+ppaUhJ99OTO4aHl9uY6vPrT1gPY27uNTxRY= github.com/pion/dtls/v2 v2.1.0 h1:g6gtKVNLp6URDkv9OijFJl16kqGHzVzZG+Fa4A38GTY= github.com/pion/dtls/v2 v2.1.0/go.mod h1:qG3gA7ZPZemBqpEFqRKyURYdKEwFZQCGb7gv9T3ON3Y= -github.com/pion/ice/v2 v2.1.14 h1:nD9GZs3MiR1/dPa5EiMRMe8hLBG3/qqCdx/hTS2g8VE= -github.com/pion/ice/v2 v2.1.14/go.mod h1:ovgYHUmwYLlRvcCLI67PnQ5YGe+upXZbGgllBDG/ktU= github.com/pion/ice/v2 v2.1.18 h1:mDzd+iPKJmU30p4Kb+RPjK9olORLqJmQdiTUnVba50g= github.com/pion/ice/v2 v2.1.18/go.mod h1:9jDr0iIUg8P6+0Jq8QJ/eFSkX3JnsPd293TjCdkfpTs= -github.com/pion/interceptor v0.1.2 h1:1IfrJ+AQ0HhwxNl4hqh9hMvl1hBKiNhAAr7DrUHsC6s= -github.com/pion/interceptor v0.1.2/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= github.com/pion/interceptor v0.1.4/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= github.com/pion/interceptor v0.1.5 h1:DnuwpHQqfmeKMAkFdMBd57J8oYvxm5tnojEfGTLJ3sg= github.com/pion/interceptor v0.1.5/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= @@ -364,7 +335,6 @@ github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqN github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/rtp v1.7.4 h1:4dMbjb1SuynU5OpA3kz1zHK+u+eOCQjW3MAeVHf1ODA= github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/sctp v1.8.0 h1:6erMF2qmQwXr+0iB1lm0AUSmDr9LdmpaBzgSVAEgehw= github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA= github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= @@ -374,20 +344,14 @@ github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ= github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A= github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= -github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A= github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= -github.com/pion/transport v0.12.3 h1:vdBfvfU/0Wq8kd2yhUMSDB/x+O4Z9MYVl2fJ5BT4JZw= github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= github.com/pion/transport v0.13.0 h1:KWTA5ZrQogizzYwPEciGtHPLwpAjE91FgXnyu+Hv2uY= github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g= -github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= -github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= github.com/pion/turn/v2 v2.0.6 h1:AsXjSPR6Im15DMTB39NlfdTY9BQfieANPBjdg/aVNwY= github.com/pion/turn/v2 v2.0.6/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/webrtc/v3 v3.1.11 h1:8Q5BEsxvlDn3botM8U8n/Haln745FBa5TWgm8v2c2FA= -github.com/pion/webrtc/v3 v3.1.11/go.mod h1:h9pbP+CADYb/99s5rfjflEcBLgdVKm55Rm7heQ/gIvY= github.com/pion/webrtc/v3 v3.1.15 h1:JUNR95xdhcRliAaUQjnuttFPdxGxW/ixcwnHRjQFWOU= github.com/pion/webrtc/v3 v3.1.15/go.mod h1:2brQHPJl93QVgbcVElY5syrrEzx5PXCxjrQ5g7Hwky8= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -414,42 +378,29 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.26.0 h1:ORM4ibhEZeTeQlCojCK2kPz1ogAY4bGs4tD+SaAdGaE= -github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo= github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE= github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= +github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60= github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.9.0 h1:yR6EXjTp0y0cLN8OZg1CRZmOBdI88UcGkhgyJhu6nZk= -github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= @@ -471,11 +422,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -497,14 +445,10 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20211202192323-5770296d904e h1:MUP6MR3rJ7Gk9LEia0LP2ytiH6MuCfs7qYz+47jGdD8= -golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI= @@ -550,7 +494,6 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -582,23 +525,18 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c h1:WtYZ93XtWSO5KlOMgPZu7hXY9WhMZpprvlm5VwvAl8c= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d h1:1n1fc535VhN8SYtD4cDUyNlfpAF2ROMM9+11equK3hs= @@ -614,7 +552,6 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= @@ -703,10 +640,9 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -729,7 +665,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -740,7 +675,6 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -808,7 +742,6 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= @@ -820,6 +753,7 @@ google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdr google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -919,6 +853,7 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -940,8 +875,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= From 94c17e9a42999a7453893de242d3a9ea783331b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 20 Mar 2022 11:27:41 +0100 Subject: [PATCH 669/876] rename module to gitlab.com/demodesk/neko/server. --- cmd/neko/main.go | 6 +++--- cmd/root.go | 4 ++-- cmd/serve.go | 20 ++++++++++---------- go.mod | 2 +- internal/api/members/bluk.go | 4 ++-- internal/api/members/controler.go | 4 ++-- internal/api/members/handler.go | 6 +++--- internal/api/room/broadcast.go | 6 +++--- internal/api/room/clipboard.go | 4 ++-- internal/api/room/control.go | 4 ++-- internal/api/room/handler.go | 6 +++--- internal/api/room/keyboard.go | 4 ++-- internal/api/room/screen.go | 8 ++++---- internal/api/room/upload.go | 2 +- internal/api/router.go | 12 ++++++------ internal/api/session.go | 6 +++--- internal/capture/broadcast.go | 4 ++-- internal/capture/gst/gst.go | 2 +- internal/capture/manager.go | 6 +++--- internal/capture/screencast.go | 4 ++-- internal/capture/streamsink.go | 6 +++--- internal/capture/streamsrc.go | 6 +++--- internal/config/capture.go | 6 +++--- internal/config/member.go | 4 ++-- internal/config/server.go | 2 +- internal/config/webrtc.go | 4 ++-- internal/desktop/clipboard.go | 2 +- internal/desktop/drop.go | 2 +- internal/desktop/filechooserdialog.go | 2 +- internal/desktop/manager.go | 6 +++--- internal/desktop/xevent.go | 2 +- internal/desktop/xorg.go | 4 ++-- internal/desktop/xorg/xorg.go | 2 +- internal/http/auth/auth.go | 4 ++-- internal/http/debug.go | 2 +- internal/http/logger.go | 4 ++-- internal/http/manager.go | 4 ++-- internal/http/router.go | 6 +++--- internal/member/dummy/provider.go | 2 +- internal/member/file/provider.go | 2 +- internal/member/file/types.go | 2 +- internal/member/manager.go | 10 +++++----- internal/member/object/provider.go | 2 +- internal/member/object/types.go | 2 +- internal/session/auth.go | 2 +- internal/session/manager.go | 6 +++--- internal/session/session.go | 4 ++-- internal/types/capture.go | 2 +- internal/types/message/messages.go | 2 +- internal/webrtc/cursor/image.go | 4 ++-- internal/webrtc/handler.go | 4 ++-- internal/webrtc/manager.go | 14 +++++++------- internal/webrtc/peer.go | 2 +- internal/webrtc/peerconnection.go | 6 +++--- internal/webrtc/peerstreamtrack.go | 3 ++- internal/webrtc/send.go | 4 ++-- internal/websocket/filechooserdialog.go | 6 +++--- internal/websocket/handler/clipboard.go | 4 ++-- internal/websocket/handler/control.go | 8 ++++---- internal/websocket/handler/handler.go | 8 ++++---- internal/websocket/handler/keyboard.go | 4 ++-- internal/websocket/handler/screen.go | 6 +++--- internal/websocket/handler/send.go | 6 +++--- internal/websocket/handler/session.go | 6 +++--- internal/websocket/handler/signal.go | 6 +++--- internal/websocket/handler/system.go | 6 +++--- internal/websocket/manager.go | 10 +++++----- internal/websocket/peer.go | 6 +++--- 68 files changed, 166 insertions(+), 165 deletions(-) diff --git a/cmd/neko/main.go b/cmd/neko/main.go index 88018a1a..6d218b29 100644 --- a/cmd/neko/main.go +++ b/cmd/neko/main.go @@ -5,9 +5,9 @@ import ( "github.com/rs/zerolog/log" - "demodesk/neko" - "demodesk/neko/cmd" - "demodesk/neko/internal/utils" + neko "gitlab.com/demodesk/neko/server" + "gitlab.com/demodesk/neko/server/cmd" + "gitlab.com/demodesk/neko/server/internal/utils" ) func main() { diff --git a/cmd/root.go b/cmd/root.go index 187482ee..d51f8b0a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -15,8 +15,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko" - "demodesk/neko/internal/config" + neko "gitlab.com/demodesk/neko/server" + "gitlab.com/demodesk/neko/server/internal/config" ) func Execute() error { diff --git a/cmd/serve.go b/cmd/serve.go index fe645719..e7142157 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -8,16 +8,16 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "demodesk/neko/internal/api" - "demodesk/neko/internal/capture" - "demodesk/neko/internal/config" - "demodesk/neko/internal/desktop" - "demodesk/neko/internal/http" - "demodesk/neko/internal/member" - "demodesk/neko/internal/session" - "demodesk/neko/internal/webrtc" - "demodesk/neko/internal/websocket" - "demodesk/neko/modules" + "gitlab.com/demodesk/neko/server/internal/api" + "gitlab.com/demodesk/neko/server/internal/capture" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/desktop" + "gitlab.com/demodesk/neko/server/internal/http" + "gitlab.com/demodesk/neko/server/internal/member" + "gitlab.com/demodesk/neko/server/internal/session" + "gitlab.com/demodesk/neko/server/internal/webrtc" + "gitlab.com/demodesk/neko/server/internal/websocket" + "gitlab.com/demodesk/neko/server/modules" ) func init() { diff --git a/go.mod b/go.mod index b9e07f2c..5b39828d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module demodesk/neko +module gitlab.com/demodesk/neko/server go 1.17 diff --git a/internal/api/members/bluk.go b/internal/api/members/bluk.go index 808db44a..b979f15d 100644 --- a/internal/api/members/bluk.go +++ b/internal/api/members/bluk.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type MemberBulkUpdatePayload struct { diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 6b85f3a7..09e3f0b7 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -5,8 +5,8 @@ import ( "net/http" "strconv" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type MemberDataPayload struct { diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 276c3b40..84be7c99 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type key int diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index c7afef9f..26a99d86 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -3,9 +3,9 @@ package room import ( "net/http" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/utils" ) type BroadcastStatusPayload struct { diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 203282c4..ccca748b 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -7,8 +7,8 @@ import ( "net/http" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type ClipboardPayload struct { diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 400df38c..524294af 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -5,8 +5,8 @@ import ( "github.com/go-chi/chi" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/utils" ) type ControlStatusPayload struct { diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 254f722f..ab4680af 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type RoomHandler struct { diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 91cccab0..347ddccb 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -3,8 +3,8 @@ package room import ( "net/http" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type KeyboardMapData struct { diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 9cc54b96..2d61daff 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -4,10 +4,10 @@ import ( "net/http" "strconv" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/utils" ) type ScreenConfigurationPayload struct { diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 894bcead..7538a4e1 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/utils" ) // TODO: Extract file uploading to custom utility. diff --git a/internal/api/router.go b/internal/api/router.go index c64b9e68..c8b54e50 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -5,12 +5,12 @@ import ( "errors" "net/http" - "demodesk/neko/internal/api/members" - "demodesk/neko/internal/api/room" - "demodesk/neko/internal/config" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/api/members" + "gitlab.com/demodesk/neko/server/internal/api/room" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type ApiManagerCtx struct { diff --git a/internal/api/session.go b/internal/api/session.go index 7e97434d..048e42e5 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -3,9 +3,9 @@ package api import ( "net/http" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type SessionLoginPayload struct { diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 22dfe2f2..709f555e 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/capture/gst" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/capture/gst" + "gitlab.com/demodesk/neko/server/internal/types" ) type BroacastManagerCtx struct { diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index d2cb1781..60cb90f7 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -13,7 +13,7 @@ import ( "time" "unsafe" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 95bde947..ea2670d3 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/codec" ) type CaptureManagerCtx struct { diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index e73705d8..7d63e612 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/capture/gst" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/capture/gst" + "gitlab.com/demodesk/neko/server/internal/types" ) // timeout between intervals, when screencast pipeline is checked diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index c5e3c9dc..a6290be0 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/capture/gst" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/capture/gst" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/codec" ) var moveSinkListenerMu = sync.Mutex{} diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index 1c4b76bf..80baf72a 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -7,9 +7,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/capture/gst" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/capture/gst" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/codec" ) type StreamSrcManagerCtx struct { diff --git a/internal/config/capture.go b/internal/config/capture.go index 0b4289c9..caed4eaa 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/utils" ) type Capture struct { diff --git a/internal/config/member.go b/internal/config/member.go index 13c4261a..003ad154 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko/internal/member/file" - "demodesk/neko/internal/member/object" + "gitlab.com/demodesk/neko/server/internal/member/file" + "gitlab.com/demodesk/neko/server/internal/member/object" ) type Member struct { diff --git a/internal/config/server.go b/internal/config/server.go index b68df15a..eebe8925 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/utils" ) type Server struct { diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 2024274c..9396d2bb 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) // default stun server diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index 4cc6006e..5d681a06 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) { diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index ff9166d8..3d892937 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -3,7 +3,7 @@ package desktop import ( "time" - "demodesk/neko/internal/desktop/drop" + "gitlab.com/demodesk/neko/server/internal/desktop/drop" ) // repeat move event multiple times diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index 339168a4..d61892b3 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -4,7 +4,7 @@ import ( "errors" "os/exec" - "demodesk/neko/internal/desktop/xorg" + "gitlab.com/demodesk/neko/server/internal/desktop/xorg" ) // name of the window that is being controlled diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 2dc3771e..f65e5f35 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/desktop/xevent" - "demodesk/neko/internal/desktop/xorg" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/desktop/xevent" + "gitlab.com/demodesk/neko/server/internal/desktop/xorg" ) var mu = sync.Mutex{} diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index 4d67905f..110f4ed9 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -1,7 +1,7 @@ package desktop import ( - "demodesk/neko/internal/desktop/xevent" + "gitlab.com/demodesk/neko/server/internal/desktop/xevent" ) func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) { diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index ce6c28db..ee211bf2 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "demodesk/neko/internal/desktop/xorg" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/desktop/xorg" + "gitlab.com/demodesk/neko/server/internal/types" ) func (manager *DesktopManagerCtx) Move(x, y int) { diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index cb865a99..7fb671f9 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -16,7 +16,7 @@ import ( "image" "image/color" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) //go:generate ./keysymdef.sh diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index 2b350e63..e954d4af 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type key int diff --git a/internal/http/debug.go b/internal/http/debug.go index ef72b35a..a0a29be0 100644 --- a/internal/http/debug.go +++ b/internal/http/debug.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func pprofHandler(r types.Router) { diff --git a/internal/http/logger.go b/internal/http/logger.go index 2e946af1..c4dbc87b 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -8,8 +8,8 @@ import ( "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type logFormatter struct { diff --git a/internal/http/manager.go b/internal/http/manager.go index 73c4ed25..d8c6520d 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/types" ) type HttpManagerCtx struct { diff --git a/internal/http/router.go b/internal/http/router.go index 137b986e..932563a1 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type router struct { diff --git a/internal/member/dummy/provider.go b/internal/member/dummy/provider.go index 88bef7ca..72e59f4e 100644 --- a/internal/member/dummy/provider.go +++ b/internal/member/dummy/provider.go @@ -3,7 +3,7 @@ package dummy import ( "errors" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func New() types.MemberProvider { diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index 92a8c687..423f5b69 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -5,7 +5,7 @@ import ( "io" "os" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func New(config Config) types.MemberProvider { diff --git a/internal/member/file/types.go b/internal/member/file/types.go index 32ed0b0e..cf589aac 100644 --- a/internal/member/file/types.go +++ b/internal/member/file/types.go @@ -1,7 +1,7 @@ package file import ( - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) type MemberEntry struct { diff --git a/internal/member/manager.go b/internal/member/manager.go index 8696cf40..9f3ae0a7 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -7,11 +7,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/member/dummy" - "demodesk/neko/internal/member/file" - "demodesk/neko/internal/member/object" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/member/dummy" + "gitlab.com/demodesk/neko/server/internal/member/file" + "gitlab.com/demodesk/neko/server/internal/member/object" + "gitlab.com/demodesk/neko/server/internal/types" ) func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx { diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index 80b68b00..12d45287 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -1,7 +1,7 @@ package object import ( - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func New(config Config) types.MemberProvider { diff --git a/internal/member/object/types.go b/internal/member/object/types.go index e3b1b719..e35e1c99 100644 --- a/internal/member/object/types.go +++ b/internal/member/object/types.go @@ -1,7 +1,7 @@ package object import ( - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) type MemberEntry struct { diff --git a/internal/session/auth.go b/internal/session/auth.go index cc3be871..1593b1bb 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token string) { diff --git a/internal/session/manager.go b/internal/session/manager.go index 492e5fbd..54be1e47 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) func New(config *config.Session) *SessionManagerCtx { diff --git a/internal/session/session.go b/internal/session/session.go index 4ae9249a..42f4b8f4 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -5,8 +5,8 @@ import ( "github.com/rs/zerolog" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" ) type SessionCtx struct { diff --git a/internal/types/capture.go b/internal/types/capture.go index 35d19fe9..2d0126d5 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -10,7 +10,7 @@ import ( "github.com/PaesslerAG/gval" "github.com/pion/webrtc/v3/pkg/media" - "demodesk/neko/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/types/codec" ) var ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 7b8373d7..413bff64 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -3,7 +3,7 @@ package message import ( "github.com/pion/webrtc/v3" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) ///////////////////////////// diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index fe6d203c..3f1b8730 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) func NewImage(desktop types.DesktopManager) *ImageCtx { diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 68020977..1f93ca38 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "demodesk/neko/internal/types" - "demodesk/neko/internal/webrtc/payload" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/webrtc/payload" ) func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) error { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 3f607a34..ce7e76eb 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -13,13 +13,13 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/webrtc/cursor" - "demodesk/neko/internal/webrtc/pionlog" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/webrtc/cursor" + "gitlab.com/demodesk/neko/server/internal/webrtc/pionlog" ) // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index b338204d..0d01d8d9 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -6,7 +6,7 @@ import ( "github.com/pion/webrtc/v3" "github.com/rs/zerolog" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) type WebRTCPeerCtx struct { diff --git a/internal/webrtc/peerconnection.go b/internal/webrtc/peerconnection.go index 6a9683b0..c64f57a1 100644 --- a/internal/webrtc/peerconnection.go +++ b/internal/webrtc/peerconnection.go @@ -1,12 +1,12 @@ package webrtc import ( - "demodesk/neko/internal/types/codec" - "demodesk/neko/internal/webrtc/pionlog" - "github.com/pion/interceptor" "github.com/pion/webrtc/v3" "github.com/rs/zerolog" + + "gitlab.com/demodesk/neko/server/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/webrtc/pionlog" ) func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) { diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go index e204243a..59a3925c 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -1,7 +1,6 @@ package webrtc import ( - "demodesk/neko/internal/types" "errors" "io" "sync" @@ -9,6 +8,8 @@ import ( "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" + + "gitlab.com/demodesk/neko/server/internal/types" ) func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamSinkManager, logger zerolog.Logger) (*PeerStreamTrack, error) { diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index e2c9e0f2..e82edeea 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "demodesk/neko/internal/types" - "demodesk/neko/internal/webrtc/payload" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/webrtc/payload" ) func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index e753e786..f3c75639 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -1,9 +1,9 @@ package websocket import ( - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 123c00a7..93e65c1c 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 3f56edae..938e3e22 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -3,10 +3,10 @@ package handler import ( "errors" - "demodesk/neko/internal/desktop/xorg" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/desktop/xorg" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) var ( diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 02469ed3..52806c4c 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -4,10 +4,10 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/utils" ) func New( diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 457b3828..ce97666f 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error { diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index a526bc81..4b9f6118 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index 9c59b14d..6368717d 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error { diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 1d05dcc7..85ffd041 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -1,9 +1,9 @@ package handler import ( - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 2a49fa1e..d67e141b 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error { diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 59411779..d443483e 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) systemInit(session types.Session) error { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 3ec44e40..cb10dcac 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -10,11 +10,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" - "demodesk/neko/internal/websocket/handler" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/internal/websocket/handler" ) // send pings to peer with this period - must be less than pongWait diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 3d76a13a..7f1149f4 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) type WebSocketPeerCtx struct { From 8593d2d0fd2e26e1fd98302040ffa4cbfe505e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 20 Mar 2022 11:43:00 +0100 Subject: [PATCH 670/876] move shared code to pkg. --- cmd/neko/main.go | 2 +- internal/api/members/bluk.go | 4 ++-- internal/api/members/controler.go | 4 ++-- internal/api/members/handler.go | 6 +++--- internal/api/room/broadcast.go | 6 +++--- internal/api/room/clipboard.go | 4 ++-- internal/api/room/control.go | 4 ++-- internal/api/room/handler.go | 6 +++--- internal/api/room/keyboard.go | 4 ++-- internal/api/room/screen.go | 8 ++++---- internal/api/room/upload.go | 2 +- internal/api/router.go | 6 +++--- internal/api/session.go | 6 +++--- internal/capture/broadcast.go | 4 ++-- internal/capture/manager.go | 4 ++-- internal/capture/screencast.go | 4 ++-- internal/capture/streamsink.go | 6 +++--- internal/capture/streamsrc.go | 6 +++--- internal/config/capture.go | 6 +++--- internal/config/server.go | 2 +- internal/config/webrtc.go | 4 ++-- internal/desktop/clipboard.go | 2 +- internal/desktop/drop.go | 2 +- internal/desktop/filechooserdialog.go | 2 +- internal/desktop/manager.go | 4 ++-- internal/desktop/xevent.go | 2 +- internal/desktop/xorg.go | 4 ++-- internal/http/debug.go | 2 +- internal/http/logger.go | 4 ++-- internal/http/manager.go | 2 +- internal/http/router.go | 6 +++--- internal/member/dummy/provider.go | 2 +- internal/member/file/provider.go | 2 +- internal/member/file/types.go | 2 +- internal/member/manager.go | 2 +- internal/member/object/provider.go | 2 +- internal/member/object/types.go | 2 +- internal/session/auth.go | 2 +- internal/session/manager.go | 4 ++-- internal/session/session.go | 4 ++-- internal/webrtc/cursor/image.go | 4 ++-- internal/webrtc/handler.go | 2 +- internal/webrtc/manager.go | 8 ++++---- internal/webrtc/peer.go | 2 +- internal/webrtc/peerconnection.go | 2 +- internal/webrtc/peerstreamtrack.go | 2 +- internal/webrtc/send.go | 2 +- internal/websocket/filechooserdialog.go | 6 +++--- internal/websocket/handler/clipboard.go | 4 ++-- internal/websocket/handler/control.go | 8 ++++---- internal/websocket/handler/handler.go | 8 ++++---- internal/websocket/handler/keyboard.go | 4 ++-- internal/websocket/handler/screen.go | 6 +++--- internal/websocket/handler/send.go | 6 +++--- internal/websocket/handler/session.go | 6 +++--- internal/websocket/handler/signal.go | 6 +++--- internal/websocket/handler/system.go | 6 +++--- internal/websocket/manager.go | 8 ++++---- internal/websocket/peer.go | 6 +++--- {internal/http => pkg}/auth/auth.go | 4 ++-- {internal/desktop => pkg}/drop/drop.c | 0 {internal/desktop => pkg}/drop/drop.go | 0 {internal/desktop => pkg}/drop/drop.h | 0 {internal/capture => pkg}/gst/gst.c | 0 {internal/capture => pkg}/gst/gst.go | 4 ++-- {internal/capture => pkg}/gst/gst.h | 0 {internal => pkg}/types/api.go | 0 {internal => pkg}/types/capture.go | 2 +- {internal => pkg}/types/codec/codecs.go | 0 {internal => pkg}/types/desktop.go | 0 {internal => pkg}/types/event/events.go | 0 {internal => pkg}/types/http.go | 0 {internal => pkg}/types/member.go | 0 {internal => pkg}/types/message/messages.go | 2 +- {internal => pkg}/types/session.go | 0 {internal => pkg}/types/webrtc.go | 0 {internal => pkg}/types/websocket.go | 0 {internal => pkg}/utils/array.go | 0 {internal => pkg}/utils/color.go | 0 {internal => pkg}/utils/http.go | 0 {internal => pkg}/utils/image.go | 0 {internal => pkg}/utils/json.go | 0 {internal => pkg}/utils/request.go | 0 {internal => pkg}/utils/uid.go | 0 {internal => pkg}/utils/zip.go | 0 {internal/desktop => pkg}/xevent/xevent.c | 0 {internal/desktop => pkg}/xevent/xevent.go | 0 {internal/desktop => pkg}/xevent/xevent.h | 0 {internal/desktop => pkg}/xorg/keysymdef.go | 0 {internal/desktop => pkg}/xorg/keysymdef.sh | 0 {internal/desktop => pkg}/xorg/xorg.c | 0 {internal/desktop => pkg}/xorg/xorg.go | 7 +++---- {internal/desktop => pkg}/xorg/xorg.h | 0 93 files changed, 132 insertions(+), 133 deletions(-) rename {internal/http => pkg}/auth/auth.go (94%) rename {internal/desktop => pkg}/drop/drop.c (100%) rename {internal/desktop => pkg}/drop/drop.go (100%) rename {internal/desktop => pkg}/drop/drop.h (100%) rename {internal/capture => pkg}/gst/gst.c (100%) rename {internal/capture => pkg}/gst/gst.go (98%) rename {internal/capture => pkg}/gst/gst.h (100%) rename {internal => pkg}/types/api.go (100%) rename {internal => pkg}/types/capture.go (98%) rename {internal => pkg}/types/codec/codecs.go (100%) rename {internal => pkg}/types/desktop.go (100%) rename {internal => pkg}/types/event/events.go (100%) rename {internal => pkg}/types/http.go (100%) rename {internal => pkg}/types/member.go (100%) rename {internal => pkg}/types/message/messages.go (98%) rename {internal => pkg}/types/session.go (100%) rename {internal => pkg}/types/webrtc.go (100%) rename {internal => pkg}/types/websocket.go (100%) rename {internal => pkg}/utils/array.go (100%) rename {internal => pkg}/utils/color.go (100%) rename {internal => pkg}/utils/http.go (100%) rename {internal => pkg}/utils/image.go (100%) rename {internal => pkg}/utils/json.go (100%) rename {internal => pkg}/utils/request.go (100%) rename {internal => pkg}/utils/uid.go (100%) rename {internal => pkg}/utils/zip.go (100%) rename {internal/desktop => pkg}/xevent/xevent.c (100%) rename {internal/desktop => pkg}/xevent/xevent.go (100%) rename {internal/desktop => pkg}/xevent/xevent.h (100%) rename {internal/desktop => pkg}/xorg/keysymdef.go (100%) rename {internal/desktop => pkg}/xorg/keysymdef.sh (100%) rename {internal/desktop => pkg}/xorg/xorg.c (100%) rename {internal/desktop => pkg}/xorg/xorg.go (99%) rename {internal/desktop => pkg}/xorg/xorg.h (100%) diff --git a/cmd/neko/main.go b/cmd/neko/main.go index 6d218b29..47e1eadd 100644 --- a/cmd/neko/main.go +++ b/cmd/neko/main.go @@ -7,7 +7,7 @@ import ( neko "gitlab.com/demodesk/neko/server" "gitlab.com/demodesk/neko/server/cmd" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/utils" ) func main() { diff --git a/internal/api/members/bluk.go b/internal/api/members/bluk.go index b979f15d..36a6f5f8 100644 --- a/internal/api/members/bluk.go +++ b/internal/api/members/bluk.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type MemberBulkUpdatePayload struct { diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 09e3f0b7..6bb40db4 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -5,8 +5,8 @@ import ( "net/http" "strconv" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type MemberDataPayload struct { diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 84be7c99..b6a8c71c 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi" - "gitlab.com/demodesk/neko/server/internal/http/auth" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/auth" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type key int diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index 26a99d86..f0bd8664 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -3,9 +3,9 @@ package room import ( "net/http" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type BroadcastStatusPayload struct { diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index ccca748b..f0a8bfdd 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -7,8 +7,8 @@ import ( "net/http" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type ClipboardPayload struct { diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 524294af..cf0300e9 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -5,8 +5,8 @@ import ( "github.com/go-chi/chi" - "gitlab.com/demodesk/neko/server/internal/http/auth" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/auth" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type ControlStatusPayload struct { diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index ab4680af..4c425bf7 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "gitlab.com/demodesk/neko/server/internal/http/auth" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/auth" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type RoomHandler struct { diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 347ddccb..f75c9291 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -3,8 +3,8 @@ package room import ( "net/http" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type KeyboardMapData struct { diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 2d61daff..fc16ecc1 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -4,10 +4,10 @@ import ( "net/http" "strconv" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type ScreenConfigurationPayload struct { diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 7538a4e1..edb5cae4 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/utils" ) // TODO: Extract file uploading to custom utility. diff --git a/internal/api/router.go b/internal/api/router.go index c8b54e50..7c369bd6 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -8,9 +8,9 @@ import ( "gitlab.com/demodesk/neko/server/internal/api/members" "gitlab.com/demodesk/neko/server/internal/api/room" "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/http/auth" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/auth" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type ApiManagerCtx struct { diff --git a/internal/api/session.go b/internal/api/session.go index 048e42e5..f22cf199 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -3,9 +3,9 @@ package api import ( "net/http" - "gitlab.com/demodesk/neko/server/internal/http/auth" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/auth" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type SessionLoginPayload struct { diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 709f555e..7d26df65 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/capture/gst" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/gst" + "gitlab.com/demodesk/neko/server/pkg/types" ) type BroacastManagerCtx struct { diff --git a/internal/capture/manager.go b/internal/capture/manager.go index ea2670d3..d4496e9f 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog/log" "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/codec" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/codec" ) type CaptureManagerCtx struct { diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 7d63e612..82d59e18 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/capture/gst" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/gst" + "gitlab.com/demodesk/neko/server/pkg/types" ) // timeout between intervals, when screencast pipeline is checked diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index a6290be0..22d1f64e 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/capture/gst" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/codec" + "gitlab.com/demodesk/neko/server/pkg/gst" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/codec" ) var moveSinkListenerMu = sync.Mutex{} diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index 80baf72a..368f6e0f 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -7,9 +7,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/capture/gst" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/codec" + "gitlab.com/demodesk/neko/server/pkg/gst" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/codec" ) type StreamSrcManagerCtx struct { diff --git a/internal/config/capture.go b/internal/config/capture.go index caed4eaa..e0c8d110 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/codec" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/codec" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type Capture struct { diff --git a/internal/config/server.go b/internal/config/server.go index eebe8925..62200dd7 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type Server struct { diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 9396d2bb..50a2a642 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) // default stun server diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index 5d681a06..b9772142 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) { diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index 3d892937..4efd8420 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -3,7 +3,7 @@ package desktop import ( "time" - "gitlab.com/demodesk/neko/server/internal/desktop/drop" + "gitlab.com/demodesk/neko/server/pkg/drop" ) // repeat move event multiple times diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index d61892b3..5c4e5952 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -4,7 +4,7 @@ import ( "errors" "os/exec" - "gitlab.com/demodesk/neko/server/internal/desktop/xorg" + "gitlab.com/demodesk/neko/server/pkg/xorg" ) // name of the window that is being controlled diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index f65e5f35..289904bf 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -10,8 +10,8 @@ import ( "github.com/rs/zerolog/log" "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/desktop/xevent" - "gitlab.com/demodesk/neko/server/internal/desktop/xorg" + "gitlab.com/demodesk/neko/server/pkg/xevent" + "gitlab.com/demodesk/neko/server/pkg/xorg" ) var mu = sync.Mutex{} diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index 110f4ed9..8abcb03f 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -1,7 +1,7 @@ package desktop import ( - "gitlab.com/demodesk/neko/server/internal/desktop/xevent" + "gitlab.com/demodesk/neko/server/pkg/xevent" ) func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) { diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index ee211bf2..0de6b74b 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "gitlab.com/demodesk/neko/server/internal/desktop/xorg" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/xorg" ) func (manager *DesktopManagerCtx) Move(x, y int) { diff --git a/internal/http/debug.go b/internal/http/debug.go index a0a29be0..af63ded2 100644 --- a/internal/http/debug.go +++ b/internal/http/debug.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) func pprofHandler(r types.Router) { diff --git a/internal/http/logger.go b/internal/http/logger.go index c4dbc87b..3714568e 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -8,8 +8,8 @@ import ( "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type logFormatter struct { diff --git a/internal/http/manager.go b/internal/http/manager.go index d8c6520d..0ead57ef 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -10,7 +10,7 @@ import ( "github.com/rs/zerolog/log" "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) type HttpManagerCtx struct { diff --git a/internal/http/router.go b/internal/http/router.go index 932563a1..c91a3720 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/internal/http/auth" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/auth" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type router struct { diff --git a/internal/member/dummy/provider.go b/internal/member/dummy/provider.go index 72e59f4e..2f3cbee3 100644 --- a/internal/member/dummy/provider.go +++ b/internal/member/dummy/provider.go @@ -3,7 +3,7 @@ package dummy import ( "errors" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) func New() types.MemberProvider { diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index 423f5b69..1f1f6707 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -5,7 +5,7 @@ import ( "io" "os" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) func New(config Config) types.MemberProvider { diff --git a/internal/member/file/types.go b/internal/member/file/types.go index cf589aac..dc4a02d2 100644 --- a/internal/member/file/types.go +++ b/internal/member/file/types.go @@ -1,7 +1,7 @@ package file import ( - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) type MemberEntry struct { diff --git a/internal/member/manager.go b/internal/member/manager.go index 9f3ae0a7..83aeae0f 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -11,7 +11,7 @@ import ( "gitlab.com/demodesk/neko/server/internal/member/dummy" "gitlab.com/demodesk/neko/server/internal/member/file" "gitlab.com/demodesk/neko/server/internal/member/object" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx { diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index 12d45287..c3cef2a7 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -1,7 +1,7 @@ package object import ( - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) func New(config Config) types.MemberProvider { diff --git a/internal/member/object/types.go b/internal/member/object/types.go index e35e1c99..b29894fa 100644 --- a/internal/member/object/types.go +++ b/internal/member/object/types.go @@ -1,7 +1,7 @@ package object import ( - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) type MemberEntry struct { diff --git a/internal/session/auth.go b/internal/session/auth.go index 1593b1bb..50b749dd 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token string) { diff --git a/internal/session/manager.go b/internal/session/manager.go index 54be1e47..5593521f 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog/log" "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) func New(config *config.Session) *SessionManagerCtx { diff --git a/internal/session/session.go b/internal/session/session.go index 42f4b8f4..c885aeed 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -5,8 +5,8 @@ import ( "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" ) type SessionCtx struct { diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 3f1b8730..4411e324 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) func NewImage(desktop types.DesktopManager) *ImageCtx { diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 1f93ca38..88cbe74d 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "gitlab.com/demodesk/neko/server/internal/types" "gitlab.com/demodesk/neko/server/internal/webrtc/payload" + "gitlab.com/demodesk/neko/server/pkg/types" ) func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) error { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index ce7e76eb..8684369c 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -14,12 +14,12 @@ import ( "github.com/rs/zerolog/log" "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/codec" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" "gitlab.com/demodesk/neko/server/internal/webrtc/cursor" "gitlab.com/demodesk/neko/server/internal/webrtc/pionlog" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/codec" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" ) // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 0d01d8d9..e18a27bd 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -6,7 +6,7 @@ import ( "github.com/pion/webrtc/v3" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) type WebRTCPeerCtx struct { diff --git a/internal/webrtc/peerconnection.go b/internal/webrtc/peerconnection.go index c64f57a1..6554d113 100644 --- a/internal/webrtc/peerconnection.go +++ b/internal/webrtc/peerconnection.go @@ -5,8 +5,8 @@ import ( "github.com/pion/webrtc/v3" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/internal/types/codec" "gitlab.com/demodesk/neko/server/internal/webrtc/pionlog" + "gitlab.com/demodesk/neko/server/pkg/types/codec" ) func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) { diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go index 59a3925c..a45e347d 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -9,7 +9,7 @@ import ( "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamSinkManager, logger zerolog.Logger) (*PeerStreamTrack, error) { diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index e82edeea..f42f5867 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "gitlab.com/demodesk/neko/server/internal/types" "gitlab.com/demodesk/neko/server/internal/webrtc/payload" + "gitlab.com/demodesk/neko/server/pkg/types" ) func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index f3c75639..0c02d082 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -1,9 +1,9 @@ package websocket import ( - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" ) func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 93e65c1c..5b9eac9d 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 938e3e22..96a20de0 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -3,10 +3,10 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/internal/desktop/xorg" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" + "gitlab.com/demodesk/neko/server/pkg/xorg" ) var ( diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 52806c4c..9c5a8a26 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -4,10 +4,10 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" + "gitlab.com/demodesk/neko/server/pkg/utils" ) func New( diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index ce97666f..e8124fb3 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error { diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 4b9f6118..01a2c256 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index 6368717d..df4f873b 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error { diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 85ffd041..64346807 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -1,9 +1,9 @@ package handler import ( - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index d67e141b..f04b31a8 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error { diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index d443483e..f4ae2dd8 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) systemInit(session types.Session) error { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index cb10dcac..067a3fc3 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -10,11 +10,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" - "gitlab.com/demodesk/neko/server/internal/utils" "gitlab.com/demodesk/neko/server/internal/websocket/handler" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" + "gitlab.com/demodesk/neko/server/pkg/utils" ) // send pings to peer with this period - must be less than pongWait diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 7f1149f4..6ba83ce6 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/types/event" - "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/types/event" + "gitlab.com/demodesk/neko/server/pkg/types/message" ) type WebSocketPeerCtx struct { diff --git a/internal/http/auth/auth.go b/pkg/auth/auth.go similarity index 94% rename from internal/http/auth/auth.go rename to pkg/auth/auth.go index e954d4af..9c558577 100644 --- a/internal/http/auth/auth.go +++ b/pkg/auth/auth.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "gitlab.com/demodesk/neko/server/internal/types" - "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/utils" ) type key int diff --git a/internal/desktop/drop/drop.c b/pkg/drop/drop.c similarity index 100% rename from internal/desktop/drop/drop.c rename to pkg/drop/drop.c diff --git a/internal/desktop/drop/drop.go b/pkg/drop/drop.go similarity index 100% rename from internal/desktop/drop/drop.go rename to pkg/drop/drop.go diff --git a/internal/desktop/drop/drop.h b/pkg/drop/drop.h similarity index 100% rename from internal/desktop/drop/drop.h rename to pkg/drop/drop.h diff --git a/internal/capture/gst/gst.c b/pkg/gst/gst.c similarity index 100% rename from internal/capture/gst/gst.c rename to pkg/gst/gst.c diff --git a/internal/capture/gst/gst.go b/pkg/gst/gst.go similarity index 98% rename from internal/capture/gst/gst.go rename to pkg/gst/gst.go index 60cb90f7..dc1a1c04 100644 --- a/internal/capture/gst/gst.go +++ b/pkg/gst/gst.go @@ -13,10 +13,10 @@ import ( "time" "unsafe" - "gitlab.com/demodesk/neko/server/internal/types" - "github.com/rs/zerolog" "github.com/rs/zerolog/log" + + "gitlab.com/demodesk/neko/server/pkg/types" ) type Pipeline struct { diff --git a/internal/capture/gst/gst.h b/pkg/gst/gst.h similarity index 100% rename from internal/capture/gst/gst.h rename to pkg/gst/gst.h diff --git a/internal/types/api.go b/pkg/types/api.go similarity index 100% rename from internal/types/api.go rename to pkg/types/api.go diff --git a/internal/types/capture.go b/pkg/types/capture.go similarity index 98% rename from internal/types/capture.go rename to pkg/types/capture.go index 2d0126d5..a2bf961b 100644 --- a/internal/types/capture.go +++ b/pkg/types/capture.go @@ -10,7 +10,7 @@ import ( "github.com/PaesslerAG/gval" "github.com/pion/webrtc/v3/pkg/media" - "gitlab.com/demodesk/neko/server/internal/types/codec" + "gitlab.com/demodesk/neko/server/pkg/types/codec" ) var ( diff --git a/internal/types/codec/codecs.go b/pkg/types/codec/codecs.go similarity index 100% rename from internal/types/codec/codecs.go rename to pkg/types/codec/codecs.go diff --git a/internal/types/desktop.go b/pkg/types/desktop.go similarity index 100% rename from internal/types/desktop.go rename to pkg/types/desktop.go diff --git a/internal/types/event/events.go b/pkg/types/event/events.go similarity index 100% rename from internal/types/event/events.go rename to pkg/types/event/events.go diff --git a/internal/types/http.go b/pkg/types/http.go similarity index 100% rename from internal/types/http.go rename to pkg/types/http.go diff --git a/internal/types/member.go b/pkg/types/member.go similarity index 100% rename from internal/types/member.go rename to pkg/types/member.go diff --git a/internal/types/message/messages.go b/pkg/types/message/messages.go similarity index 98% rename from internal/types/message/messages.go rename to pkg/types/message/messages.go index 413bff64..a46d67b4 100644 --- a/internal/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -3,7 +3,7 @@ package message import ( "github.com/pion/webrtc/v3" - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) ///////////////////////////// diff --git a/internal/types/session.go b/pkg/types/session.go similarity index 100% rename from internal/types/session.go rename to pkg/types/session.go diff --git a/internal/types/webrtc.go b/pkg/types/webrtc.go similarity index 100% rename from internal/types/webrtc.go rename to pkg/types/webrtc.go diff --git a/internal/types/websocket.go b/pkg/types/websocket.go similarity index 100% rename from internal/types/websocket.go rename to pkg/types/websocket.go diff --git a/internal/utils/array.go b/pkg/utils/array.go similarity index 100% rename from internal/utils/array.go rename to pkg/utils/array.go diff --git a/internal/utils/color.go b/pkg/utils/color.go similarity index 100% rename from internal/utils/color.go rename to pkg/utils/color.go diff --git a/internal/utils/http.go b/pkg/utils/http.go similarity index 100% rename from internal/utils/http.go rename to pkg/utils/http.go diff --git a/internal/utils/image.go b/pkg/utils/image.go similarity index 100% rename from internal/utils/image.go rename to pkg/utils/image.go diff --git a/internal/utils/json.go b/pkg/utils/json.go similarity index 100% rename from internal/utils/json.go rename to pkg/utils/json.go diff --git a/internal/utils/request.go b/pkg/utils/request.go similarity index 100% rename from internal/utils/request.go rename to pkg/utils/request.go diff --git a/internal/utils/uid.go b/pkg/utils/uid.go similarity index 100% rename from internal/utils/uid.go rename to pkg/utils/uid.go diff --git a/internal/utils/zip.go b/pkg/utils/zip.go similarity index 100% rename from internal/utils/zip.go rename to pkg/utils/zip.go diff --git a/internal/desktop/xevent/xevent.c b/pkg/xevent/xevent.c similarity index 100% rename from internal/desktop/xevent/xevent.c rename to pkg/xevent/xevent.c diff --git a/internal/desktop/xevent/xevent.go b/pkg/xevent/xevent.go similarity index 100% rename from internal/desktop/xevent/xevent.go rename to pkg/xevent/xevent.go diff --git a/internal/desktop/xevent/xevent.h b/pkg/xevent/xevent.h similarity index 100% rename from internal/desktop/xevent/xevent.h rename to pkg/xevent/xevent.h diff --git a/internal/desktop/xorg/keysymdef.go b/pkg/xorg/keysymdef.go similarity index 100% rename from internal/desktop/xorg/keysymdef.go rename to pkg/xorg/keysymdef.go diff --git a/internal/desktop/xorg/keysymdef.sh b/pkg/xorg/keysymdef.sh similarity index 100% rename from internal/desktop/xorg/keysymdef.sh rename to pkg/xorg/keysymdef.sh diff --git a/internal/desktop/xorg/xorg.c b/pkg/xorg/xorg.c similarity index 100% rename from internal/desktop/xorg/xorg.c rename to pkg/xorg/xorg.c diff --git a/internal/desktop/xorg/xorg.go b/pkg/xorg/xorg.go similarity index 99% rename from internal/desktop/xorg/xorg.go rename to pkg/xorg/xorg.go index 7fb671f9..94a8126c 100644 --- a/internal/desktop/xorg/xorg.go +++ b/pkg/xorg/xorg.go @@ -9,14 +9,13 @@ import "C" import ( "fmt" + "image" + "image/color" "sync" "time" "unsafe" - "image" - "image/color" - - "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/pkg/types" ) //go:generate ./keysymdef.sh diff --git a/internal/desktop/xorg/xorg.h b/pkg/xorg/xorg.h similarity index 100% rename from internal/desktop/xorg/xorg.h rename to pkg/xorg/xorg.h From 192095da86597acc9d9017c8e5c94d8f92a4c7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 23 Mar 2022 12:07:56 +0100 Subject: [PATCH 671/876] upgrade dependencies. --- go.mod | 30 ++--- go.sum | 384 ++++++--------------------------------------------------- 2 files changed, 52 insertions(+), 362 deletions(-) diff --git a/go.mod b/go.mod index 5b39828d..920ac9dc 100644 --- a/go.mod +++ b/go.mod @@ -6,15 +6,15 @@ require ( github.com/PaesslerAG/gval v1.1.2 github.com/go-chi/chi v1.5.4 github.com/go-chi/cors v1.2.0 - github.com/gorilla/websocket v1.4.2 - github.com/kataras/go-events v0.0.2 - github.com/pion/ice/v2 v2.1.18 - github.com/pion/interceptor v0.1.5 + github.com/gorilla/websocket v1.5.0 + github.com/kataras/go-events v0.0.3 + github.com/pion/ice/v2 v2.2.2 + github.com/pion/interceptor v0.1.10 github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.9 - github.com/pion/webrtc/v3 v3.1.15 + github.com/pion/webrtc/v3 v3.1.27 github.com/rs/zerolog v1.26.1 - github.com/spf13/cobra v1.3.0 + github.com/spf13/cobra v1.4.0 github.com/spf13/viper v1.10.1 ) @@ -23,31 +23,31 @@ require ( github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/magiconair/properties v1.8.5 // indirect + github.com/magiconair/properties v1.8.6 // indirect github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pion/datachannel v1.5.2 // indirect - github.com/pion/dtls/v2 v2.1.0 // indirect + github.com/pion/dtls/v2 v2.1.3 // indirect github.com/pion/mdns v0.0.5 // indirect github.com/pion/randutil v0.1.0 // indirect - github.com/pion/rtp v1.7.4 // indirect + github.com/pion/rtp v1.7.9 // indirect github.com/pion/sctp v1.8.2 // indirect github.com/pion/sdp/v3 v3.0.4 // indirect github.com/pion/srtp/v2 v2.0.5 // indirect github.com/pion/stun v0.3.5 // indirect github.com/pion/transport v0.13.0 // indirect - github.com/pion/turn/v2 v2.0.6 // indirect + github.com/pion/turn/v2 v2.0.8 // indirect github.com/pion/udp v0.1.1 // indirect - github.com/spf13/afero v1.8.0 // indirect + github.com/spf13/afero v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.2.0 // indirect - golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect - golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 // indirect + golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect + golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - gopkg.in/ini.v1 v1.66.2 // indirect + gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 0759b446..8bcffe51 100644 --- a/go.sum +++ b/go.sum @@ -17,18 +17,6 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -37,7 +25,6 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -51,48 +38,18 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PaesslerAG/gval v1.1.2 h1:EROKxV4/fAKWb0Qoj7NOxmHZA7gcpjOV9XgiRZMRCUU= github.com/PaesslerAG/gval v1.1.2/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -103,20 +60,11 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE= @@ -124,20 +72,12 @@ github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vz github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -145,8 +85,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -162,9 +100,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -175,15 +111,11 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -194,112 +126,39 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= -github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4= +github.com/kataras/go-events v0.0.3/go.mod h1:bFBgtzwwzrag7kQmGuU1ZaVxhK2qseYPQomXoVEMsj4= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -309,20 +168,16 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= -github.com/pion/dtls/v2 v2.0.13/go.mod h1:OaE7eTM+ppaUhJ99OTO4aHl9uY6vPrT1gPY27uNTxRY= -github.com/pion/dtls/v2 v2.1.0 h1:g6gtKVNLp6URDkv9OijFJl16kqGHzVzZG+Fa4A38GTY= -github.com/pion/dtls/v2 v2.1.0/go.mod h1:qG3gA7ZPZemBqpEFqRKyURYdKEwFZQCGb7gv9T3ON3Y= -github.com/pion/ice/v2 v2.1.18 h1:mDzd+iPKJmU30p4Kb+RPjK9olORLqJmQdiTUnVba50g= -github.com/pion/ice/v2 v2.1.18/go.mod h1:9jDr0iIUg8P6+0Jq8QJ/eFSkX3JnsPd293TjCdkfpTs= -github.com/pion/interceptor v0.1.4/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= -github.com/pion/interceptor v0.1.5 h1:DnuwpHQqfmeKMAkFdMBd57J8oYvxm5tnojEfGTLJ3sg= -github.com/pion/interceptor v0.1.5/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= +github.com/pion/dtls/v2 v2.1.3 h1:3UF7udADqous+M2R5Uo2q/YaP4EzUoWKdfX2oscCUio= +github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus= +github.com/pion/ice/v2 v2.2.2 h1:UfmAslxZ0u0itVjA4x7aw7WeQIv22FdF8VjW9cM+74g= +github.com/pion/ice/v2 v2.2.2/go.mod h1:vLI7dFqxw8zMSb9J+ca74XU7JjLhddgfQB9+BbTydCo= +github.com/pion/interceptor v0.1.10 h1:DJ2GjMGm4XGIQgMJxuEpdaExdY/6RdngT7Uh4oVmquU= +github.com/pion/interceptor v0.1.10/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= @@ -333,8 +188,9 @@ github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U= github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo= github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.7.4 h1:4dMbjb1SuynU5OpA3kz1zHK+u+eOCQjW3MAeVHf1ODA= github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.7.9 h1:17W5Mt2IM3MVfOh7yRfzXbbKXYzBZxV8eG4KKAy+0bg= +github.com/pion/rtp v1.7.9/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA= github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= @@ -348,111 +204,67 @@ github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6 github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= github.com/pion/transport v0.13.0 h1:KWTA5ZrQogizzYwPEciGtHPLwpAjE91FgXnyu+Hv2uY= github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g= -github.com/pion/turn/v2 v2.0.6 h1:AsXjSPR6Im15DMTB39NlfdTY9BQfieANPBjdg/aVNwY= -github.com/pion/turn/v2 v2.0.6/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= +github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw= +github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/webrtc/v3 v3.1.15 h1:JUNR95xdhcRliAaUQjnuttFPdxGxW/ixcwnHRjQFWOU= -github.com/pion/webrtc/v3 v3.1.15/go.mod h1:2brQHPJl93QVgbcVElY5syrrEzx5PXCxjrQ5g7Hwky8= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pion/webrtc/v3 v3.1.27 h1:yQ6TuHKJR/vro3nLZMfPv+WGf7T1/4ItaQeuzIZLXs4= +github.com/pion/webrtc/v3 v3.1.27/go.mod h1:hdduI+Rx0cpGvva18j0gKy/Iak611WPyhUIXs5W/FuI= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60= -github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= -github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI= -golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s= +golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -476,7 +288,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -488,12 +299,9 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -501,11 +309,9 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -523,24 +329,18 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d h1:1n1fc535VhN8SYtD4cDUyNlfpAF2ROMM9+11equK3hs= -golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -550,14 +350,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -569,36 +361,24 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -617,42 +397,23 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -672,7 +433,6 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -697,7 +457,6 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -707,14 +466,8 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -740,20 +493,6 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -784,7 +523,6 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -797,35 +535,7 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -839,22 +549,9 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -867,29 +564,22 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= +gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From f549171ded911a3077240b4ca1a5c9b90fcd1bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 24 Mar 2022 21:48:51 +0100 Subject: [PATCH 672/876] opus useinbandfec. --- pkg/types/codec/codecs.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/types/codec/codecs.go b/pkg/types/codec/codecs.go index 00071c04..cc8b9bd7 100644 --- a/pkg/types/codec/codecs.go +++ b/pkg/types/codec/codecs.go @@ -119,12 +119,12 @@ func Opus() RTPCodec { MimeType: webrtc.MimeTypeOpus, ClockRate: 48000, Channels: 2, - SDPFmtpLine: "", + SDPFmtpLine: "useinbandfec=1", RTCPFeedback: []webrtc.RTCPFeedback{}, }, // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html // gstreamer1.0-plugins-base - Pipeline: "opusenc bitrate=128000", + Pipeline: "opusenc inband-fec=true bitrate=128000", } } From d004ddd68f85f1585624f9472aeacfbd49cb0681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 26 Mar 2022 23:20:38 +0100 Subject: [PATCH 673/876] private mode implementation. --- internal/api/room/handler.go | 29 ++++++++++++++++-- internal/api/room/screen.go | 14 +++++++++ internal/session/manager.go | 42 +++++++++++++++++++++++++++ internal/session/session.go | 9 ++++++ internal/webrtc/manager.go | 21 ++++++++++++++ internal/webrtc/peer.go | 14 +++++++++ internal/webrtc/peerstreamtrack.go | 22 ++++++++++---- internal/websocket/handler/control.go | 4 +-- internal/websocket/handler/signal.go | 5 ++++ pkg/auth/auth.go | 4 +++ pkg/types/session.go | 5 ++++ pkg/types/webrtc.go | 2 ++ 12 files changed, 160 insertions(+), 11 deletions(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 4c425bf7..ef9cc525 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -4,6 +4,8 @@ import ( "context" "net/http" + "github.com/rs/zerolog/log" + "gitlab.com/demodesk/neko/server/pkg/auth" "gitlab.com/demodesk/neko/server/pkg/types" "gitlab.com/demodesk/neko/server/pkg/utils" @@ -13,6 +15,8 @@ type RoomHandler struct { sessions types.SessionManager desktop types.DesktopManager capture types.CaptureManager + + privateModeImage []byte } func New( @@ -20,13 +24,32 @@ func New( desktop types.DesktopManager, capture types.CaptureManager, ) *RoomHandler { - // Init - - return &RoomHandler{ + h := &RoomHandler{ sessions: sessions, desktop: desktop, capture: capture, } + + // generate fallback image for private mode when needed + sessions.OnPrivateModeChanged(func(isPrivateMode bool) { + if !isPrivateMode { + log.Debug().Msg("clearing private mode fallback image") + h.privateModeImage = nil + return + } + + img := h.desktop.GetScreenshotImage() + bytes, err := utils.CreateJPGImage(img, 90) + if err != nil { + log.Err(err).Msg("could not generate private mode fallback image") + return + } + + log.Debug().Msg("using private mode fallback image") + h.privateModeImage = bytes + }) + + return h } func (h *RoomHandler) Route(r types.Router) { diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index fc16ecc1..9be8c20b 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -4,6 +4,7 @@ import ( "net/http" "strconv" + "gitlab.com/demodesk/neko/server/pkg/auth" "gitlab.com/demodesk/neko/server/pkg/types" "gitlab.com/demodesk/neko/server/pkg/types/event" "gitlab.com/demodesk/neko/server/pkg/types/message" @@ -81,6 +82,19 @@ func (h *RoomHandler) screenShotGet(w http.ResponseWriter, r *http.Request) erro } func (h *RoomHandler) screenCastGet(w http.ResponseWriter, r *http.Request) error { + // display fallback image when private mode is enabled even if screencast is not + if session, ok := auth.GetSession(r); ok && session.PrivateModeEnabled() { + if h.privateModeImage != nil { + w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") + w.Header().Set("Content-Type", "image/jpeg") + + _, err := w.Write(h.privateModeImage) + return err + } + + return utils.HttpBadRequest("private mode is enabled but no fallback image available") + } + screencast := h.capture.Screencast() if !screencast.Enabled() { return utils.HttpBadRequest("screencast pipeline is not enabled") diff --git a/internal/session/manager.go b/internal/session/manager.go index 5593521f..b0eed57a 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -56,6 +56,9 @@ type SessionManagerCtx struct { host types.Session hostMu sync.Mutex + privateMode bool + privateModeMu sync.Mutex + cursors map[types.Session][]types.Cursor cursorsMu sync.Mutex @@ -197,6 +200,39 @@ func (manager *SessionManagerCtx) ClearHost() { manager.SetHost(nil) } +// --- +// private mode +// --- + +func (manager *SessionManagerCtx) SetPrivateMode(isPrivateMode bool) { + manager.privateModeMu.Lock() + + // only if value changed + if manager.privateMode == isPrivateMode { + manager.privateModeMu.Unlock() + return + } + + // update webrtc paused state for all sessions + for _, session := range manager.List() { + if webrtcPeer := session.GetWebRTCPeer(); webrtcPeer != nil { + webrtcPeer.SetPaused(isPrivateMode && !session.Profile().IsAdmin) + } + } + + manager.privateMode = isPrivateMode + manager.privateModeMu.Unlock() + + manager.emmiter.Emit("private_mode_changed", isPrivateMode) +} + +func (manager *SessionManagerCtx) PrivateMode() bool { + manager.privateModeMu.Lock() + defer manager.privateModeMu.Unlock() + + return manager.privateMode +} + // --- // cursors // --- @@ -326,6 +362,12 @@ func (manager *SessionManagerCtx) OnHostChanged(listener func(session types.Sess }) } +func (manager *SessionManagerCtx) OnPrivateModeChanged(listener func(isPrivateMode bool)) { + manager.emmiter.On("private_mode_changed", func(payload ...interface{}) { + listener(payload[0].(bool)) + }) +} + // --- // config // --- diff --git a/internal/session/session.go b/internal/session/session.go index c885aeed..4e46c917 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -44,6 +44,11 @@ func (session *SessionCtx) profileChanged() { if (!session.profile.CanConnect || !session.profile.CanLogin) && session.state.IsConnected { session.GetWebSocketPeer().Destroy("profile changed") } + + // update webrtc paused state + if webrtcPeer := session.GetWebRTCPeer(); webrtcPeer != nil { + webrtcPeer.SetPaused(session.PrivateModeEnabled()) + } } func (session *SessionCtx) State() types.SessionState { @@ -54,6 +59,10 @@ func (session *SessionCtx) IsHost() bool { return session.manager.GetHost() == session } +func (session *SessionCtx) PrivateModeEnabled() bool { + return session.manager.PrivateMode() && !session.profile.IsAdmin +} + func (session *SessionCtx) SetCursor(cursor types.Cursor) { if session.manager.InactiveCursors() && session.profile.SendsInactiveCursor { session.manager.SetCursor(cursor, session) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 8684369c..4a121cd3 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -200,6 +200,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return videoTrack.SetStream(videoStream) }, + setPaused: func(isPaused bool) { + videoTrack.SetPaused(isPaused) + audioTrack.SetPaused(isPaused) + + // TODO: Send fresh cursor position & image when unpausing. + }, iceTrickle: manager.config.ICETrickle, } @@ -314,12 +320,22 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) cursorImage := func(entry *cursor.ImageEntry) { + // TODO: Refactor. + if videoTrack.paused { + return + } + if err := peer.SendCursorImage(entry.Cursor, entry.Image); err != nil { logger.Err(err).Msg("could not send cursor image") } } cursorPosition := func(x, y int) { + // TODO: Refactor. + if videoTrack.paused { + return + } + if session.IsHost() { return } @@ -352,6 +368,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { + // TODO: Refactor. + if videoTrack.paused { + return + } + if err := manager.handle(message.Data, session); err != nil { logger.Err(err).Msg("data handle failed") } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index e18a27bd..7bb3c668 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -15,6 +15,7 @@ type WebRTCPeerCtx struct { connection *webrtc.PeerConnection dataChannel *webrtc.DataChannel changeVideo func(videoID string) error + setPaused func(isPaused bool) iceTrickle bool } @@ -122,6 +123,19 @@ func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { return peer.changeVideo(videoID) } +func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { + peer.mu.Lock() + defer peer.mu.Unlock() + + if peer.connection == nil { + return types.ErrWebRTCConnectionNotFound + } + + peer.logger.Info().Bool("is_paused", isPaused).Msg("set paused") + peer.setPaused(isPaused) + return nil +} + func (peer *WebRTCPeerCtx) Destroy() { peer.mu.Lock() defer peer.mu.Unlock() diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go index a45e347d..b77cab2a 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -26,12 +26,17 @@ func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamSinkManag peer := &PeerStreamTrack{ logger: logger, track: track, - listener: func(sample types.Sample) { - err := track.WriteSample(media.Sample(sample)) - if err != nil && errors.Is(err, io.ErrClosedPipe) { - logger.Warn().Err(err).Msg("pipeline failed to write") - } - }, + } + + peer.listener = func(sample types.Sample) { + if peer.paused { + return + } + + err := track.WriteSample(media.Sample(sample)) + if err != nil && errors.Is(err, io.ErrClosedPipe) { + logger.Warn().Err(err).Msg("pipeline failed to write") + } } err = peer.SetStream(stream) @@ -41,6 +46,7 @@ func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamSinkManag type PeerStreamTrack struct { logger zerolog.Logger track *webrtc.TrackLocalStaticSample + paused bool listener func(sample types.Sample) stream types.StreamSinkManager @@ -92,3 +98,7 @@ func (peer *PeerStreamTrack) AddToConnection(connection *webrtc.PeerConnection) return nil } + +func (peer *PeerStreamTrack) SetPaused(paused bool) { + peer.paused = paused +} diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 96a20de0..364852ea 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -17,7 +17,7 @@ var ( ) func (h *MessageHandlerCtx) controlRelease(session types.Session) error { - if !session.Profile().CanHost { + if !session.Profile().CanHost || session.PrivateModeEnabled() { return ErrIsNotAllowedToHost } @@ -32,7 +32,7 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error { } func (h *MessageHandlerCtx) controlRequest(session types.Session) error { - if !session.Profile().CanHost { + if !session.Profile().CanHost || session.PrivateModeEnabled() { return ErrIsNotAllowedToHost } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index f04b31a8..1b61e0ea 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -24,6 +24,11 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag return err } + // set webrtc as paused if session has private mode enabled + if webrtcPeer := session.GetWebRTCPeer(); webrtcPeer != nil && session.PrivateModeEnabled() { + webrtcPeer.SetPaused(true) + } + session.Send( event.SIGNAL_PROVIDE, message.SignalProvide{ diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 9c558577..98620387 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -54,6 +54,10 @@ func CanHostOnly(w http.ResponseWriter, r *http.Request) (context.Context, error return nil, utils.HttpForbidden("session cannot host") } + if session.PrivateModeEnabled() { + return nil, utils.HttpUnprocessableEntity("private mode is enabled") + } + return nil, nil } diff --git a/pkg/types/session.go b/pkg/types/session.go index 8bc0f3a4..f3c3a39d 100644 --- a/pkg/types/session.go +++ b/pkg/types/session.go @@ -27,6 +27,7 @@ type Session interface { Profile() MemberProfile State() SessionState IsHost() bool + PrivateModeEnabled() bool // cursor SetCursor(cursor Cursor) @@ -55,6 +56,9 @@ type SessionManager interface { GetHost() Session ClearHost() + SetPrivateMode(isPrivateMode bool) + PrivateMode() bool + SetCursor(cursor Cursor, session Session) PopCursors() map[Session][]Cursor @@ -69,6 +73,7 @@ type SessionManager interface { OnProfileChanged(listener func(session Session)) OnStateChanged(listener func(session Session)) OnHostChanged(listener func(session Session)) + OnPrivateModeChanged(listener func(isPrivateMode bool)) ImplicitHosting() bool InactiveCursors() bool diff --git a/pkg/types/webrtc.go b/pkg/types/webrtc.go index 12c92973..ab323431 100644 --- a/pkg/types/webrtc.go +++ b/pkg/types/webrtc.go @@ -26,6 +26,8 @@ type WebRTCPeer interface { SetCandidate(candidate webrtc.ICECandidateInit) error SetVideoID(videoID string) error + SetPaused(isPaused bool) error + SendCursorPosition(x, y int) error SendCursorImage(cur *CursorImage, img []byte) error From 81867d811ba1df729abfac21bc7e57d07cb339ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 27 Mar 2022 00:08:06 +0100 Subject: [PATCH 674/876] sessions: switch to settings struct. --- internal/api/room/handler.go | 24 ++++---- internal/session/manager.go | 87 ++++++++++++--------------- internal/session/session.go | 4 +- internal/websocket/handler/control.go | 2 +- internal/websocket/handler/system.go | 7 ++- internal/websocket/manager.go | 44 ++++++++++++-- pkg/types/event/events.go | 1 + pkg/types/message/messages.go | 7 ++- pkg/types/session.go | 17 +++--- 9 files changed, 113 insertions(+), 80 deletions(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index ef9cc525..45ba0598 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -31,22 +31,24 @@ func New( } // generate fallback image for private mode when needed - sessions.OnPrivateModeChanged(func(isPrivateMode bool) { - if !isPrivateMode { + sessions.OnSettingsChanged(func(new types.Settings, old types.Settings) { + if old.PrivateMode && !new.PrivateMode { log.Debug().Msg("clearing private mode fallback image") h.privateModeImage = nil return } - img := h.desktop.GetScreenshotImage() - bytes, err := utils.CreateJPGImage(img, 90) - if err != nil { - log.Err(err).Msg("could not generate private mode fallback image") - return - } + if !old.PrivateMode && new.PrivateMode { + img := h.desktop.GetScreenshotImage() + bytes, err := utils.CreateJPGImage(img, 90) + if err != nil { + log.Err(err).Msg("could not generate private mode fallback image") + return + } - log.Debug().Msg("using private mode fallback image") - h.privateModeImage = bytes + log.Debug().Msg("using private mode fallback image") + h.privateModeImage = bytes + } }) return h @@ -110,7 +112,7 @@ func (h *RoomHandler) Route(r types.Router) { func (h *RoomHandler) uploadMiddleware(w http.ResponseWriter, r *http.Request) (context.Context, error) { session, ok := auth.GetSession(r) - if !ok || (!session.IsHost() && (!session.Profile().CanHost || !h.sessions.ImplicitHosting())) { + if !ok || (!session.IsHost() && (!session.Profile().CanHost || !h.sessions.Settings().ImplicitHosting)) { return nil, utils.HttpForbidden("without implicit hosting, only host can upload files") } diff --git a/internal/session/manager.go b/internal/session/manager.go index b0eed57a..d1017de4 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -15,8 +15,14 @@ import ( func New(config *config.Session) *SessionManagerCtx { manager := &SessionManagerCtx{ - logger: log.With().Str("module", "session").Logger(), - config: config, + logger: log.With().Str("module", "session").Logger(), + config: config, + settings: types.Settings{ + PrivateMode: false, // By default disabled. + ImplicitHosting: config.ImplicitHosting, + InactiveCursors: config.InactiveCursors, + MercifulReconnect: config.MercifulReconnect, + }, tokens: make(map[string]string), sessions: make(map[string]*SessionCtx), cursors: make(map[types.Session][]types.Cursor), @@ -49,6 +55,9 @@ type SessionManagerCtx struct { logger zerolog.Logger config *config.Session + settings types.Settings + settingsMu sync.Mutex + tokens map[string]string sessions map[string]*SessionCtx sessionsMu sync.Mutex @@ -56,9 +65,6 @@ type SessionManagerCtx struct { host types.Session hostMu sync.Mutex - privateMode bool - privateModeMu sync.Mutex - cursors map[types.Session][]types.Cursor cursorsMu sync.Mutex @@ -200,39 +206,6 @@ func (manager *SessionManagerCtx) ClearHost() { manager.SetHost(nil) } -// --- -// private mode -// --- - -func (manager *SessionManagerCtx) SetPrivateMode(isPrivateMode bool) { - manager.privateModeMu.Lock() - - // only if value changed - if manager.privateMode == isPrivateMode { - manager.privateModeMu.Unlock() - return - } - - // update webrtc paused state for all sessions - for _, session := range manager.List() { - if webrtcPeer := session.GetWebRTCPeer(); webrtcPeer != nil { - webrtcPeer.SetPaused(isPrivateMode && !session.Profile().IsAdmin) - } - } - - manager.privateMode = isPrivateMode - manager.privateModeMu.Unlock() - - manager.emmiter.Emit("private_mode_changed", isPrivateMode) -} - -func (manager *SessionManagerCtx) PrivateMode() bool { - manager.privateModeMu.Lock() - defer manager.privateModeMu.Unlock() - - return manager.privateMode -} - // --- // cursors // --- @@ -362,28 +335,42 @@ func (manager *SessionManagerCtx) OnHostChanged(listener func(session types.Sess }) } -func (manager *SessionManagerCtx) OnPrivateModeChanged(listener func(isPrivateMode bool)) { - manager.emmiter.On("private_mode_changed", func(payload ...interface{}) { - listener(payload[0].(bool)) +func (manager *SessionManagerCtx) OnSettingsChanged(listener func(new types.Settings, old types.Settings)) { + manager.emmiter.On("settings_changed", func(payload ...interface{}) { + listener(payload[0].(types.Settings), payload[1].(types.Settings)) }) } // --- -// config +// settings // --- -func (manager *SessionManagerCtx) ImplicitHosting() bool { - return manager.config.ImplicitHosting +func (manager *SessionManagerCtx) UpdateSettings(new types.Settings) { + manager.settingsMu.Lock() + old := manager.settings + manager.settings = new + manager.settingsMu.Unlock() + + // if private mode changed + if old.PrivateMode != new.PrivateMode { + // update webrtc paused state for all sessions + for _, session := range manager.List() { + if webrtcPeer := session.GetWebRTCPeer(); webrtcPeer != nil { + webrtcPeer.SetPaused(session.PrivateModeEnabled()) + } + } + } + + manager.emmiter.Emit("settings_changed", new, old) } -func (manager *SessionManagerCtx) InactiveCursors() bool { - return manager.config.InactiveCursors +func (manager *SessionManagerCtx) Settings() types.Settings { + manager.settingsMu.Lock() + defer manager.settingsMu.Unlock() + + return manager.settings } func (manager *SessionManagerCtx) CookieEnabled() bool { return manager.config.CookieEnabled } - -func (manager *SessionManagerCtx) MercifulReconnect() bool { - return manager.config.MercifulReconnect -} diff --git a/internal/session/session.go b/internal/session/session.go index 4e46c917..445391ef 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -60,11 +60,11 @@ func (session *SessionCtx) IsHost() bool { } func (session *SessionCtx) PrivateModeEnabled() bool { - return session.manager.PrivateMode() && !session.profile.IsAdmin + return session.manager.Settings().PrivateMode && !session.profile.IsAdmin } func (session *SessionCtx) SetCursor(cursor types.Cursor) { - if session.manager.InactiveCursors() && session.profile.SendsInactiveCursor { + if session.manager.Settings().InactiveCursors && session.profile.SendsInactiveCursor { session.manager.SetCursor(cursor, session) } } diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 364852ea..d7e041cf 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -40,7 +40,7 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { return ErrIsAlreadyTheHost } - if !h.sessions.ImplicitHosting() { + if !h.sessions.Settings().ImplicitHosting { // tell session if there is a host if host := h.sessions.GetHost(); host != nil { session.Send( diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index f4ae2dd8..a2e0f273 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -44,12 +44,15 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { ControlHost: controlHost, ScreenSize: message.ScreenSize(*size), Sessions: sessions, - ImplicitHosting: h.sessions.ImplicitHosting(), - InactiveCursors: h.sessions.InactiveCursors(), + Settings: h.sessions.Settings(), ScreencastEnabled: h.capture.Screencast().Enabled(), WebRTC: message.SystemWebRTC{ Videos: h.capture.VideoIDs(), }, + + // TODO: Left for compatibility with old client, remove. + ImplicitHosting: h.sessions.Settings().ImplicitHosting, + InactiveCursors: h.sessions.Settings().InactiveCursors, }) return nil diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 067a3fc3..47caed03 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -49,6 +49,8 @@ type WebSocketManagerCtx struct { desktop types.DesktopManager handler *handler.MessageHandlerCtx handlers []types.WebSocketHandler + + shutdownInactiveCursors chan struct{} } func (manager *WebSocketManagerCtx) Start() { @@ -111,6 +113,24 @@ func (manager *WebSocketManagerCtx) Start() { Msg("session host changed") }) + manager.sessions.OnSettingsChanged(func(new types.Settings, old types.Settings) { + // start inactive cursors + if new.InactiveCursors && !old.InactiveCursors { + manager.startInactiveCursors() + } + + // stop inactive cursors + if !new.InactiveCursors && old.InactiveCursors { + manager.stopInactiveCursors() + } + + manager.sessions.Broadcast(event.SYSTEM_SETTINGS, new, nil) + manager.logger.Info(). + Interface("new", new). + Interface("old", old). + Msg("settings changed") + }) + manager.desktop.OnClipboardUpdated(func() { session := manager.sessions.GetHost() if session == nil || !session.Profile().CanAccessClipboard { @@ -135,8 +155,8 @@ func (manager *WebSocketManagerCtx) Start() { manager.fileChooserDialogEvents() - if manager.sessions.InactiveCursors() { - manager.inactiveCursors() + if manager.sessions.Settings().InactiveCursors { + manager.startInactiveCursors() } manager.logger.Info().Msg("websocket starting") @@ -145,6 +165,7 @@ func (manager *WebSocketManagerCtx) Start() { func (manager *WebSocketManagerCtx) Shutdown() error { manager.logger.Info().Msg("shutdown") close(manager.shutdown) + manager.stopInactiveCursors() manager.wg.Wait() return nil } @@ -196,7 +217,7 @@ func (manager *WebSocketManagerCtx) connect(connection *websocket.Conn, r *http. if session.State().IsConnected { logger.Warn().Msg("already connected") - if !manager.sessions.MercifulReconnect() { + if !manager.sessions.Settings().MercifulReconnect { peer.Destroy("already connected") return } @@ -299,8 +320,14 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer type } } -func (manager *WebSocketManagerCtx) inactiveCursors() { +func (manager *WebSocketManagerCtx) startInactiveCursors() { + if manager.shutdownInactiveCursors != nil { + manager.logger.Warn().Msg("inactive cursors handler already running") + return + } + manager.logger.Info().Msg("starting inactive cursors handler") + manager.shutdownInactiveCursors = make(chan struct{}) manager.wg.Add(1) go func() { @@ -314,8 +341,9 @@ func (manager *WebSocketManagerCtx) inactiveCursors() { for { select { - case <-manager.shutdown: + case <-manager.shutdownInactiveCursors: manager.logger.Info().Msg("stopping inactive cursors handler") + manager.shutdownInactiveCursors = nil return case <-ticker.C: cursorsMap := manager.sessions.PopCursors() @@ -342,3 +370,9 @@ func (manager *WebSocketManagerCtx) inactiveCursors() { } }() } + +func (manager *WebSocketManagerCtx) stopInactiveCursors() { + if manager.shutdownInactiveCursors != nil { + close(manager.shutdownInactiveCursors) + } +} diff --git a/pkg/types/event/events.go b/pkg/types/event/events.go index b9c37202..60973e40 100644 --- a/pkg/types/event/events.go +++ b/pkg/types/event/events.go @@ -3,6 +3,7 @@ package event const ( SYSTEM_INIT = "system/init" SYSTEM_ADMIN = "system/admin" + SYSTEM_SETTINGS = "system/settings" SYSTEM_LOGS = "system/logs" SYSTEM_DISCONNECT = "system/disconnect" ) diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index a46d67b4..e5de8bfb 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -19,10 +19,13 @@ type SystemInit struct { ControlHost ControlHost `json:"control_host"` ScreenSize ScreenSize `json:"screen_size"` Sessions map[string]SessionData `json:"sessions"` - ImplicitHosting bool `json:"implicit_hosting"` - InactiveCursors bool `json:"inactive_cursors"` + Settings types.Settings `json:"settings"` ScreencastEnabled bool `json:"screencast_enabled"` WebRTC SystemWebRTC `json:"webrtc"` + + // TODO: Left for compatibility with old client, remove. + ImplicitHosting bool `json:"implicit_hosting"` + InactiveCursors bool `json:"inactive_cursors"` } type SystemAdmin struct { diff --git a/pkg/types/session.go b/pkg/types/session.go index f3c3a39d..841b1854 100644 --- a/pkg/types/session.go +++ b/pkg/types/session.go @@ -22,6 +22,13 @@ type SessionState struct { IsWatching bool `json:"is_watching"` } +type Settings struct { + PrivateMode bool `json:"private_mode"` + ImplicitHosting bool `json:"implicit_hosting"` + InactiveCursors bool `json:"inactive_cursors"` + MercifulReconnect bool `json:"merciful_reconnect"` +} + type Session interface { ID() string Profile() MemberProfile @@ -56,9 +63,6 @@ type SessionManager interface { GetHost() Session ClearHost() - SetPrivateMode(isPrivateMode bool) - PrivateMode() bool - SetCursor(cursor Cursor, session Session) PopCursors() map[Session][]Cursor @@ -73,12 +77,11 @@ type SessionManager interface { OnProfileChanged(listener func(session Session)) OnStateChanged(listener func(session Session)) OnHostChanged(listener func(session Session)) - OnPrivateModeChanged(listener func(isPrivateMode bool)) + OnSettingsChanged(listener func(new Settings, old Settings)) - ImplicitHosting() bool - InactiveCursors() bool + UpdateSettings(Settings) + Settings() Settings CookieEnabled() bool - MercifulReconnect() bool CookieSetToken(w http.ResponseWriter, token string) CookieClearToken(w http.ResponseWriter, r *http.Request) From 7d53e59945f3942cb27d5287c00cc606a2619ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 27 Mar 2022 00:26:11 +0100 Subject: [PATCH 675/876] properly clear inactive cursors. --- internal/websocket/manager.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 47caed03..824da0a2 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -344,6 +344,10 @@ func (manager *WebSocketManagerCtx) startInactiveCursors() { case <-manager.shutdownInactiveCursors: manager.logger.Info().Msg("stopping inactive cursors handler") manager.shutdownInactiveCursors = nil + + // remove last cursor entries and send empty message + _ = manager.sessions.PopCursors() + manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, []message.SessionCursors{}, nil) return case <-ticker.C: cursorsMap := manager.sessions.PopCursors() From 58fca708a71f2200c8ddfa1827ef7245f810c192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 27 Mar 2022 00:26:25 +0100 Subject: [PATCH 676/876] add settings update to API. --- internal/api/room/handler.go | 6 ++++++ internal/api/room/settings.go | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 internal/api/room/settings.go diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 45ba0598..50707b55 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -55,6 +55,11 @@ func New( } func (h *RoomHandler) Route(r types.Router) { + r.With(auth.AdminsOnly).Route("/settings", func(r types.Router) { + r.Post("/", h.settingsSet) + r.Get("/", h.settingsGet) + }) + r.With(auth.AdminsOnly).Route("/broadcast", func(r types.Router) { r.Get("/", h.broadcastStatus) r.Post("/start", h.boradcastStart) @@ -108,6 +113,7 @@ func (h *RoomHandler) Route(r types.Router) { r.Post("/dialog", h.uploadDialogPost) r.Delete("/dialog", h.uploadDialogClose) }) + } func (h *RoomHandler) uploadMiddleware(w http.ResponseWriter, r *http.Request) (context.Context, error) { diff --git a/internal/api/room/settings.go b/internal/api/room/settings.go new file mode 100644 index 00000000..468b4168 --- /dev/null +++ b/internal/api/room/settings.go @@ -0,0 +1,24 @@ +package room + +import ( + "net/http" + + "gitlab.com/demodesk/neko/server/pkg/utils" +) + +func (h *RoomHandler) settingsGet(w http.ResponseWriter, r *http.Request) error { + settings := h.sessions.Settings() + return utils.HttpSuccess(w, settings) +} + +func (h *RoomHandler) settingsSet(w http.ResponseWriter, r *http.Request) error { + settings := h.sessions.Settings() + + if err := utils.HttpJsonRequest(w, r, &settings); err != nil { + return err + } + + h.sessions.UpdateSettings(settings) + + return utils.HttpSuccess(w) +} From 470f670865be7b1035f0f1f66900f991237ae453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 27 Mar 2022 00:32:21 +0100 Subject: [PATCH 677/876] private mode release control. --- internal/session/manager.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index d1017de4..c7f43c1d 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -355,8 +355,16 @@ func (manager *SessionManagerCtx) UpdateSettings(new types.Settings) { if old.PrivateMode != new.PrivateMode { // update webrtc paused state for all sessions for _, session := range manager.List() { + enabled := session.PrivateModeEnabled() + + // if session had control, it must release it + if enabled && session.IsHost() { + manager.ClearHost() + } + + // its webrtc connection will be paused or unpaused if webrtcPeer := session.GetWebRTCPeer(); webrtcPeer != nil { - webrtcPeer.SetPaused(session.PrivateModeEnabled()) + webrtcPeer.SetPaused(enabled) } } } From 149d74150b48c6b7eeedf03f63e59ff45a9123d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 27 Mar 2022 00:35:33 +0100 Subject: [PATCH 678/876] sessions in private still get cursor info & send inactive. --- internal/webrtc/manager.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 4a121cd3..fbe7c3f8 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -203,8 +203,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin setPaused: func(isPaused bool) { videoTrack.SetPaused(isPaused) audioTrack.SetPaused(isPaused) - - // TODO: Send fresh cursor position & image when unpausing. }, iceTrickle: manager.config.ICETrickle, } @@ -320,22 +318,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) cursorImage := func(entry *cursor.ImageEntry) { - // TODO: Refactor. - if videoTrack.paused { - return - } - if err := peer.SendCursorImage(entry.Cursor, entry.Image); err != nil { logger.Err(err).Msg("could not send cursor image") } } cursorPosition := func(x, y int) { - // TODO: Refactor. - if videoTrack.paused { - return - } - if session.IsHost() { return } @@ -368,11 +356,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { - // TODO: Refactor. - if videoTrack.paused { - return - } - if err := manager.handle(message.Data, session); err != nil { logger.Err(err).Msg("data handle failed") } From f447cabe2e03d5bdf44a235e490abfc3fcd3847b Mon Sep 17 00:00:00 2001 From: Maksim Dorokhin Date: Thu, 14 Apr 2022 08:47:47 +0000 Subject: [PATCH 679/876] add patch method to router. --- internal/http/router.go | 4 ++++ pkg/types/http.go | 1 + 2 files changed, 5 insertions(+) diff --git a/internal/http/router.go b/internal/http/router.go index c91a3720..636cc4ca 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -48,6 +48,10 @@ func (r *router) Put(pattern string, fn types.RouterHandler) { r.chi.Put(pattern, routeHandler(fn)) } +func (r *router) Patch(pattern string, fn types.RouterHandler) { + r.chi.Patch(pattern, routeHandler(fn)) +} + func (r *router) Delete(pattern string, fn types.RouterHandler) { r.chi.Delete(pattern, routeHandler(fn)) } diff --git a/pkg/types/http.go b/pkg/types/http.go index 3725333b..c178b447 100644 --- a/pkg/types/http.go +++ b/pkg/types/http.go @@ -14,6 +14,7 @@ type Router interface { Get(pattern string, fn RouterHandler) Post(pattern string, fn RouterHandler) Put(pattern string, fn RouterHandler) + Patch(pattern string, fn RouterHandler) Delete(pattern string, fn RouterHandler) With(fn MiddlewareHandler) Router WithBypass(fn func(next http.Handler) http.Handler) Router From a4bb108168954a4754432fec75ed38727a33cf26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 15 Apr 2022 19:28:00 +0000 Subject: [PATCH 680/876] replace modules with go plugins. --- .devcontainer/Dockerfile | 47 +++--- Dockerfile | 19 +-- build | 55 ++++++ cmd/serve.go | 39 +++-- go.mod | 15 +- go.sum | 324 ++++++++++++++++++++++++++++++++++-- internal/api/router.go | 2 - internal/config/plugins.go | 30 ++++ internal/plugins/manager.go | 108 ++++++++++++ pkg/types/plugins.go | 22 +++ 10 files changed, 587 insertions(+), 74 deletions(-) create mode 100755 build create mode 100644 internal/config/plugins.go create mode 100644 internal/plugins/manager.go create mode 100644 pkg/types/plugins.go diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index af1141d9..2382ca2a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -19,8 +19,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ wget ca-certificates supervisor \ - pulseaudio dbus-x11 xserver-xorg-video-dummy xserver-xorg-input-void \ - libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx5 \ + pulseaudio dbus-x11 xserver-xorg-video-dummy \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ + # + # needed for profile upload preStop hook + zip curl \ # # file chooser handler, clipboard xdotool xclip \ @@ -30,9 +33,10 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ gstreamer1.0-pulseaudio; -# browser dependencies +# dev runtime dependencies RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install --no-install-recommends openbox chromium; + && apt-get -y install --no-install-recommends \ + xfce4 xfce4-terminal firefox-esr sudo; # configure runtime ARG USERNAME=neko @@ -48,8 +52,6 @@ RUN set -eux; \ adduser $USERNAME pulse; \ # # add sudo support - apt-get update; \ - apt-get install -y sudo; \ echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME; \ chmod 0440 /etc/sudoers.d/$USERNAME; \ # @@ -66,7 +68,20 @@ RUN set -eux; \ mkdir -p /etc/neko /var/www /var/log/neko; \ chmod 1777 /var/log/neko; \ chown $USERNAME /var/log/neko/; \ - chown -R $USERNAME:$USERNAME /home/$USERNAME + chown -R $USERNAME:$USERNAME /home/$USERNAME; \ + # + # install fonts + apt-get install -y --no-install-recommends \ + # Emojis + fonts-noto-color-emoji \ + # Chinese fonts + fonts-arphic-ukai fonts-arphic-uming \ + # Japanese fonts + fonts-ipafont-mincho fonts-ipafont-gothic \ + # Korean fonts + fonts-unfonts-core \ + # Indian fonts + fonts-indic; # copy runtime files COPY runtime/dbus /usr/bin/dbus @@ -75,30 +90,20 @@ COPY runtime/supervisord.conf /etc/neko/supervisord.conf COPY runtime/xorg.conf /etc/neko/xorg.conf COPY runtime/icon-theme /home/$USERNAME/.icons/default -# copy browser files -COPY runtime/browser/env_wrapper /usr/bin/env_wrapper -# COPY runtime/browser/openbox.xml /etc/neko/openbox.xml -COPY runtime/browser/supervisord.conf /etc/neko/supervisord/chromium.conf -COPY runtime/browser/extension /usr/share/browser/extensions/neko -# COPY runtime/browser/policies.json /etc/chromium/policies/managed/policies.json -COPY --chown=$USERNAME runtime/browser/preferences.json /home/neko/.config/chromium/Default/Preferences - -# copy dev files -COPY dev/runtime/openbox.xml /etc/neko/openbox.xml -COPY dev/runtime/policies.json /etc/chromium/policies/managed/policies.json +# copy dev runtime files COPY dev/runtime/config.yml /etc/neko/neko.yml -COPY dev/runtime/supervisord.debug.conf /etc/neko/supervisord/debug.conf +COPY dev/runtime/supervisord.conf /etc/neko/supervisord/dev.conf # customized scripts RUN chmod +x /usr/bin/dbus;\ echo '#!/bin/sh\nsleep infinity' > /usr/bin/neko; \ chmod +x /usr/bin/neko; \ echo '#!/bin/sh\nsudo sh -c "export USER='$USERNAME'\nexport HOME=/home/'$USERNAME'\n/usr/bin/supervisord -c /etc/neko/supervisord.conf"' > /usr/bin/deps; \ - chmod +x /usr/bin/deps; + chmod +x /usr/bin/deps; \ + touch .env.development; # set default envs ENV USER=$USERNAME ENV DISPLAY=:99.0 ENV NEKO_SERVER_BIND=:3000 ENV NEKO_WEBRTC_EPR=3001-3004 -ENV BROWSER_KIOSK=false diff --git a/Dockerfile b/Dockerfile index 295208d8..16f755df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,16 +23,7 @@ ARG GIT_BRANCH=dev # # build server COPY . . -RUN go get -v -t -d . && go build \ - -tags "browser browser_profile" \ - -o bin/neko \ - -ldflags " \ - -s -w \ - -X 'demodesk/neko.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`' \ - -X 'demodesk/neko.gitCommit=${GIT_COMMIT}' \ - -X 'demodesk/neko.gitBranch=${GIT_BRANCH}' \ - " \ - cmd/neko/main.go; +RUN ./build # # Stage 2: Runtime. @@ -123,9 +114,15 @@ COPY runtime/fonts /usr/local/share/fonts ENV USER=$USERNAME ENV DISPLAY=:99.0 ENV NEKO_SERVER_BIND=:8080 +ENV NEKO_PLUGINS_ENABLED=true +ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/ # -# copy executabe from previous stage +# copy plugins from previous stage +COPY --from=build /src/bin/plugins/ $NEKO_PLUGINS_DIR + +# +# copy executable from previous stage COPY --from=build /src/bin/neko /usr/bin/neko # diff --git a/build b/build new file mode 100755 index 00000000..64d6f514 --- /dev/null +++ b/build @@ -0,0 +1,55 @@ +#!/bin/bash + +mkdir -p bin/plugins +rm bin/plugins/* + +# +# aborting if any command returns a non-zero value +set -e + +# +# set git build variables if git exists +if git version > /dev/null && [ -z $GIT_COMMIT ] && [ -z $GIT_COMMIT ]; +then + GIT_COMMIT=`git rev-parse --short HEAD` + GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` +fi + +# +# load server dependencies +go get -v -t -d . + +# +# build server +go build \ + -o bin/neko \ + -ldflags " + -s -w + -X 'demodesk/neko.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`' + -X 'demodesk/neko.gitCommit=${GIT_COMMIT}' + -X 'demodesk/neko.gitBranch=${GIT_BRANCH}' + " \ + cmd/neko/main.go; + +# +# if plugins directory does not exist +if [ ! -d "./plugins" ]; +then + echo "No plugins directory found, skipping..." + exit 0 +fi + +# +# build plugins +for plugPath in ./plugins/*; do + pushd $plugPath + + # replace plugin dependecy + go mod edit -replace "gitlab.com/demodesk/neko/server=../../" + # load plugin dependencies + go get -v -t -d . + # build plugin + go build -buildmode=plugin -o "../../bin/plugins/${plugPath##*/}.so" + + popd +done diff --git a/cmd/serve.go b/cmd/serve.go index e7142157..4619946e 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -14,10 +14,10 @@ import ( "gitlab.com/demodesk/neko/server/internal/desktop" "gitlab.com/demodesk/neko/server/internal/http" "gitlab.com/demodesk/neko/server/internal/member" + "gitlab.com/demodesk/neko/server/internal/plugins" "gitlab.com/demodesk/neko/server/internal/session" "gitlab.com/demodesk/neko/server/internal/webrtc" "gitlab.com/demodesk/neko/server/internal/websocket" - "gitlab.com/demodesk/neko/server/modules" ) func init() { @@ -43,12 +43,12 @@ type serve struct { logger zerolog.Logger configs struct { - Root config.Root Desktop config.Desktop Capture config.Capture WebRTC config.WebRTC Member config.Member Session config.Session + Plugins config.Plugins Server config.Server } @@ -59,6 +59,7 @@ type serve struct { member *member.MemberManagerCtx session *session.SessionManagerCtx webSocket *websocket.WebSocketManagerCtx + plugins *plugins.PluginsManagerCtx api *api.ApiManagerCtx http *http.HttpManagerCtx } @@ -80,14 +81,11 @@ func (c *serve) Init(cmd *cobra.Command) error { if err := c.configs.Session.Init(cmd); err != nil { return err } - if err := c.configs.Server.Init(cmd); err != nil { + if err := c.configs.Plugins.Init(cmd); err != nil { return err } - - for _, cfg := range modules.Configs() { - if err := cfg.Init(root); err != nil { - log.Panic().Err(err).Msg("unable to initialize configuration") - } + if err := c.configs.Server.Init(cmd); err != nil { + return err } return nil @@ -101,14 +99,11 @@ func (c *serve) Preflight() { c.configs.WebRTC.Set() c.configs.Member.Set() c.configs.Session.Set() + c.configs.Plugins.Set() c.configs.Server.Set() - - for _, cfg := range modules.Configs() { - cfg.Set() - } } -func (c *serve) Start() { +func (c *serve) Start(cmd *cobra.Command) { c.managers.session = session.New( &c.configs.Session, ) @@ -153,10 +148,18 @@ func (c *serve) Start() { c.managers.member, c.managers.desktop, c.managers.capture, - &c.configs.Server, ) - modules.Start( + c.managers.plugins = plugins.New( + &c.configs.Plugins, + ) + + // init and set configuration now + // this means it won't be in --help + c.managers.plugins.InitConfigs(cmd) + c.managers.plugins.SetConfigs() + + c.managers.plugins.Start( c.managers.session, c.managers.webSocket, c.managers.api, @@ -188,8 +191,8 @@ func (c *serve) Shutdown() { err = c.managers.webSocket.Shutdown() c.logger.Err(err).Msg("websocket manager shutdown") - err = modules.Shutdown() - c.logger.Err(err).Msg("modules shutdown") + err = c.managers.plugins.Shutdown() + c.logger.Err(err).Msg("plugins manager shutdown") err = c.managers.http.Shutdown() c.logger.Err(err).Msg("http manager shutdown") @@ -197,7 +200,7 @@ func (c *serve) Shutdown() { func (c *serve) Command(cmd *cobra.Command, args []string) { c.logger.Info().Msg("starting neko server") - c.Start() + c.Start(cmd) c.logger.Info().Msg("neko ready") quit := make(chan os.Signal, 1) diff --git a/go.mod b/go.mod index 920ac9dc..9ee94b96 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/PaesslerAG/gval v1.1.2 github.com/go-chi/chi v1.5.4 github.com/go-chi/cors v1.2.0 - github.com/gorilla/websocket v1.5.0 - github.com/kataras/go-events v0.0.3 + github.com/gorilla/websocket v1.4.2 + github.com/kataras/go-events v0.0.2 github.com/pion/ice/v2 v2.2.2 github.com/pion/interceptor v0.1.10 github.com/pion/logging v0.2.2 @@ -23,7 +23,8 @@ require ( github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/magiconair/properties v1.8.6 // indirect + github.com/kr/pretty v0.2.0 // indirect + github.com/magiconair/properties v1.8.5 // indirect github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pion/datachannel v1.5.2 // indirect @@ -38,16 +39,16 @@ require ( github.com/pion/transport v0.13.0 // indirect github.com/pion/turn/v2 v2.0.8 // indirect github.com/pion/udp v0.1.1 // indirect - github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/afero v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.2.0 // indirect - golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 // indirect + golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect - golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect + golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - gopkg.in/ini.v1 v1.66.4 // indirect + gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 8bcffe51..c47b6b61 100644 --- a/go.sum +++ b/go.sum @@ -17,6 +17,17 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -25,6 +36,7 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -38,18 +50,48 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PaesslerAG/gval v1.1.2 h1:EROKxV4/fAKWb0Qoj7NOxmHZA7gcpjOV9XgiRZMRCUU= github.com/PaesslerAG/gval v1.1.2/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -60,11 +102,20 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE= @@ -72,12 +123,20 @@ github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vz github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -85,6 +144,8 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -100,7 +161,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -111,11 +174,15 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -126,39 +193,107 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4= -github.com/kataras/go-events v0.0.3/go.mod h1:bFBgtzwwzrag7kQmGuU1ZaVxhK2qseYPQomXoVEMsj4= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= +github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= -github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= +github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -168,6 +303,8 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= @@ -210,19 +347,44 @@ github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= github.com/pion/webrtc/v3 v3.1.27 h1:yQ6TuHKJR/vro3nLZMfPv+WGf7T1/4ItaQeuzIZLXs4= github.com/pion/webrtc/v3 v3.1.27/go.mod h1:hdduI+Rx0cpGvva18j0gKy/Iak611WPyhUIXs5W/FuI= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= -github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60= +github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= @@ -234,7 +396,9 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -243,28 +407,41 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE= golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s= -golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -288,6 +465,7 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -299,9 +477,11 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -309,9 +489,11 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -329,13 +511,19 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -350,6 +538,14 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -361,24 +557,35 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -397,15 +604,34 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -414,6 +640,7 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -433,6 +660,7 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -457,6 +685,7 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -466,8 +695,14 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -493,6 +728,19 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -523,6 +771,7 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -535,7 +784,33 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -549,9 +824,21 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -564,22 +851,29 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= -gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= +gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/api/router.go b/internal/api/router.go index 7c369bd6..c7d171b9 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -7,7 +7,6 @@ import ( "gitlab.com/demodesk/neko/server/internal/api/members" "gitlab.com/demodesk/neko/server/internal/api/room" - "gitlab.com/demodesk/neko/server/internal/config" "gitlab.com/demodesk/neko/server/pkg/auth" "gitlab.com/demodesk/neko/server/pkg/types" "gitlab.com/demodesk/neko/server/pkg/utils" @@ -26,7 +25,6 @@ func New( members types.MemberManager, desktop types.DesktopManager, capture types.CaptureManager, - conf *config.Server, ) *ApiManagerCtx { return &ApiManagerCtx{ diff --git a/internal/config/plugins.go b/internal/config/plugins.go new file mode 100644 index 00000000..3ca005be --- /dev/null +++ b/internal/config/plugins.go @@ -0,0 +1,30 @@ +package config + +import ( + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +type Plugins struct { + Enabled bool + Dir string +} + +func (Plugins) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().Bool("plugins.enabled", false, "load plugins in runtime") + if err := viper.BindPFlag("plugins.enabled", cmd.PersistentFlags().Lookup("plugins.enabled")); err != nil { + return err + } + + cmd.PersistentFlags().String("plugins.dir", "./bin/plugins", "path to neko plugins to load") + if err := viper.BindPFlag("plugins.dir", cmd.PersistentFlags().Lookup("plugins.dir")); err != nil { + return err + } + + return nil +} + +func (s *Plugins) Set() { + s.Enabled = viper.GetBool("plugins.enabled") + s.Dir = viper.GetString("plugins.dir") +} diff --git a/internal/plugins/manager.go b/internal/plugins/manager.go new file mode 100644 index 00000000..a2456353 --- /dev/null +++ b/internal/plugins/manager.go @@ -0,0 +1,108 @@ +package plugins + +import ( + "fmt" + "os" + "path/filepath" + "plugin" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + "github.com/spf13/cobra" + + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/pkg/types" +) + +type PluginsManagerCtx struct { + logger zerolog.Logger + plugins map[string]types.Plugin +} + +func New(config *config.Plugins) *PluginsManagerCtx { + manager := &PluginsManagerCtx{ + logger: log.With().Str("module", "plugins").Logger(), + plugins: map[string]types.Plugin{}, + } + + if config.Enabled { + err := manager.loadDir(config.Dir) + manager.logger.Err(err).Msgf("loading finished, total %d plugins", len(manager.plugins)) + } + + return manager +} + +func (manager *PluginsManagerCtx) loadDir(dir string) error { + return filepath.Walk(dir, func(path string, info os.FileInfo, err error) error { + if err != nil { + return err + } + + if info.IsDir() { + return nil + } + + err = manager.load(path) + manager.logger.Err(err).Str("plugin", path).Msg("loading a plugin") + + return nil + }) +} + +func (manager *PluginsManagerCtx) load(path string) error { + pl, err := plugin.Open(path) + if err != nil { + return err + } + + sym, err := pl.Lookup("Plugin") + if err != nil { + return err + } + + p, ok := sym.(types.Plugin) + if !ok { + return fmt.Errorf("not a valid plugin") + } + + manager.plugins[path] = p + return nil +} + +func (manager *PluginsManagerCtx) InitConfigs(cmd *cobra.Command) { + for path, plug := range manager.plugins { + if err := plug.Config().Init(cmd); err != nil { + log.Err(err).Str("plugin", path).Msg("unable to initialize configuration") + } + } +} + +func (manager *PluginsManagerCtx) SetConfigs() { + for _, plug := range manager.plugins { + plug.Config().Set() + } +} + +func (manager *PluginsManagerCtx) Start( + sessionManager types.SessionManager, + webSocketManager types.WebSocketManager, + apiManager types.ApiManager, +) { + for _, plug := range manager.plugins { + plug.Start(types.PluginManagers{ + SessionManager: sessionManager, + WebSocketManager: webSocketManager, + ApiManager: apiManager, + }) + } +} + +func (manager *PluginsManagerCtx) Shutdown() error { + for path, plug := range manager.plugins { + err := plug.Shutdown() + manager.logger.Err(err).Str("plugin", path).Msg("plugin shutdown") + } + + return nil +} diff --git a/pkg/types/plugins.go b/pkg/types/plugins.go new file mode 100644 index 00000000..13c8324e --- /dev/null +++ b/pkg/types/plugins.go @@ -0,0 +1,22 @@ +package types + +import ( + "github.com/spf13/cobra" +) + +type Plugin interface { + Config() PluginConfig + Start(PluginManagers) + Shutdown() error +} + +type PluginConfig interface { + Init(cmd *cobra.Command) error + Set() +} + +type PluginManagers struct { + SessionManager SessionManager + WebSocketManager WebSocketManager + ApiManager ApiManager +} From 35892f4ed13c9cd68cc3127a6352c22025122fcb Mon Sep 17 00:00:00 2001 From: Aleksandar Sukovic Date: Fri, 15 Apr 2022 19:38:12 +0000 Subject: [PATCH 681/876] upgrade to go 1.18. --- .devcontainer/devcontainer.json | 2 +- Dockerfile | 2 +- go.mod | 2 +- go.sum | 294 -------------------------------- 4 files changed, 3 insertions(+), 297 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 118a1889..e7252a46 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,7 +7,7 @@ "context": "../", "args": { // Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.15 - "VARIANT": "1.17", + "VARIANT": "1.18", // Options "INSTALL_NODE": "false", "NODE_VERSION": "lts/*" diff --git a/Dockerfile b/Dockerfile index 16f755df..9a2c4cc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Stage 1: Build. # -FROM golang:1.17-bullseye as build +FROM golang:1.18-bullseye as build WORKDIR /src # diff --git a/go.mod b/go.mod index 9ee94b96..989ec78b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gitlab.com/demodesk/neko/server -go 1.17 +go 1.18 require ( github.com/PaesslerAG/gval v1.1.2 diff --git a/go.sum b/go.sum index c47b6b61..4b1ddb29 100644 --- a/go.sum +++ b/go.sum @@ -17,17 +17,6 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -36,7 +25,6 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -50,48 +38,18 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PaesslerAG/gval v1.1.2 h1:EROKxV4/fAKWb0Qoj7NOxmHZA7gcpjOV9XgiRZMRCUU= github.com/PaesslerAG/gval v1.1.2/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -102,20 +60,11 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE= @@ -123,20 +72,12 @@ github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vz github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -144,8 +85,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -161,9 +100,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -174,15 +111,11 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -193,107 +126,40 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -303,8 +169,6 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= @@ -347,42 +211,17 @@ github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= github.com/pion/webrtc/v3 v3.1.27 h1:yQ6TuHKJR/vro3nLZMfPv+WGf7T1/4ItaQeuzIZLXs4= github.com/pion/webrtc/v3 v3.1.27/go.mod h1:hdduI+Rx0cpGvva18j0gKy/Iak611WPyhUIXs5W/FuI= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60= github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= @@ -396,9 +235,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -407,37 +244,23 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE= @@ -465,7 +288,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -477,11 +299,9 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -489,11 +309,9 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -511,19 +329,13 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -538,14 +350,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -557,35 +361,24 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -604,31 +397,12 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -640,7 +414,6 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -660,7 +433,6 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -685,7 +457,6 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -695,14 +466,8 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -728,19 +493,6 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -771,7 +523,6 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -784,33 +535,7 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -824,21 +549,9 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -851,8 +564,6 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= @@ -862,18 +573,13 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From fdd0639036a671cc6fc534e370b1cff0f4474a16 Mon Sep 17 00:00:00 2001 From: Aleksandar Sukovic Date: Tue, 19 Apr 2022 10:14:59 +0000 Subject: [PATCH 682/876] expose plugin service. --- cmd/serve.go | 2 +- internal/plugins/manager.go | 46 ++++++++++++++++++++++++++----------- pkg/types/plugins.go | 35 +++++++++++++++++++++++++--- 3 files changed, 66 insertions(+), 17 deletions(-) diff --git a/cmd/serve.go b/cmd/serve.go index 4619946e..1ab011d3 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -59,7 +59,7 @@ type serve struct { member *member.MemberManagerCtx session *session.SessionManagerCtx webSocket *websocket.WebSocketManagerCtx - plugins *plugins.PluginsManagerCtx + plugins *plugins.ManagerCtx api *api.ApiManagerCtx http *http.HttpManagerCtx } diff --git a/internal/plugins/manager.go b/internal/plugins/manager.go index a2456353..776363bc 100644 --- a/internal/plugins/manager.go +++ b/internal/plugins/manager.go @@ -14,13 +14,13 @@ import ( "gitlab.com/demodesk/neko/server/pkg/types" ) -type PluginsManagerCtx struct { +type ManagerCtx struct { logger zerolog.Logger plugins map[string]types.Plugin } -func New(config *config.Plugins) *PluginsManagerCtx { - manager := &PluginsManagerCtx{ +func New(config *config.Plugins) *ManagerCtx { + manager := &ManagerCtx{ logger: log.With().Str("module", "plugins").Logger(), plugins: map[string]types.Plugin{}, } @@ -33,7 +33,7 @@ func New(config *config.Plugins) *PluginsManagerCtx { return manager } -func (manager *PluginsManagerCtx) loadDir(dir string) error { +func (manager *ManagerCtx) loadDir(dir string) error { return filepath.Walk(dir, func(path string, info os.FileInfo, err error) error { if err != nil { return err @@ -50,7 +50,7 @@ func (manager *PluginsManagerCtx) loadDir(dir string) error { }) } -func (manager *PluginsManagerCtx) load(path string) error { +func (manager *ManagerCtx) load(path string) error { pl, err := plugin.Open(path) if err != nil { return err @@ -66,11 +66,16 @@ func (manager *PluginsManagerCtx) load(path string) error { return fmt.Errorf("not a valid plugin") } - manager.plugins[path] = p + _, ok = manager.plugins[p.Name()] + if ok { + return fmt.Errorf("plugin '%s' already exists", p.Name()) + } + + manager.plugins[p.Name()] = p return nil } -func (manager *PluginsManagerCtx) InitConfigs(cmd *cobra.Command) { +func (manager *ManagerCtx) InitConfigs(cmd *cobra.Command) { for path, plug := range manager.plugins { if err := plug.Config().Init(cmd); err != nil { log.Err(err).Str("plugin", path).Msg("unable to initialize configuration") @@ -78,27 +83,28 @@ func (manager *PluginsManagerCtx) InitConfigs(cmd *cobra.Command) { } } -func (manager *PluginsManagerCtx) SetConfigs() { +func (manager *ManagerCtx) SetConfigs() { for _, plug := range manager.plugins { plug.Config().Set() } } -func (manager *PluginsManagerCtx) Start( +func (manager *ManagerCtx) Start( sessionManager types.SessionManager, webSocketManager types.WebSocketManager, apiManager types.ApiManager, ) { for _, plug := range manager.plugins { plug.Start(types.PluginManagers{ - SessionManager: sessionManager, - WebSocketManager: webSocketManager, - ApiManager: apiManager, + SessionManager: sessionManager, + WebSocketManager: webSocketManager, + ApiManager: apiManager, + LoadServiceFromPlugin: manager.LookupService, }) } } -func (manager *PluginsManagerCtx) Shutdown() error { +func (manager *ManagerCtx) Shutdown() error { for path, plug := range manager.plugins { err := plug.Shutdown() manager.logger.Err(err).Str("plugin", path).Msg("plugin shutdown") @@ -106,3 +112,17 @@ func (manager *PluginsManagerCtx) Shutdown() error { return nil } + +func (manager *ManagerCtx) LookupService(pluginName string) (any, error) { + plug, ok := manager.plugins[pluginName] + if !ok { + return nil, fmt.Errorf("plugin '%s' not found", pluginName) + } + + expPlug, ok := plug.(types.ExposablePlugin) + if !ok { + return nil, fmt.Errorf("plugin '%s' is not exposable", pluginName) + } + + return expPlug.ExposeService(), nil +} diff --git a/pkg/types/plugins.go b/pkg/types/plugins.go index 13c8324e..f6014e0b 100644 --- a/pkg/types/plugins.go +++ b/pkg/types/plugins.go @@ -1,22 +1,51 @@ package types import ( + "errors" + "github.com/spf13/cobra" ) type Plugin interface { + Name() string Config() PluginConfig Start(PluginManagers) Shutdown() error } +type ExposablePlugin interface { + Plugin + ExposeService() any +} + type PluginConfig interface { Init(cmd *cobra.Command) error Set() } type PluginManagers struct { - SessionManager SessionManager - WebSocketManager WebSocketManager - ApiManager ApiManager + SessionManager SessionManager + WebSocketManager WebSocketManager + ApiManager ApiManager + LoadServiceFromPlugin func(string) (any, error) +} + +func (p *PluginManagers) Validate() error { + if p.SessionManager == nil { + return errors.New("SessionManager is nil") + } + + if p.WebSocketManager == nil { + return errors.New("WebSocketManager is nil") + } + + if p.ApiManager == nil { + return errors.New("ApiManager is nil") + } + + if p.LoadServiceFromPlugin == nil { + return errors.New("LoadServiceFromPlugin is nil") + } + + return nil } From 61059c9b3cf53533916467ce3f80b395fa257fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 19 Apr 2022 10:16:59 +0000 Subject: [PATCH 683/876] revert backwards compatibility. --- internal/websocket/handler/system.go | 4 ---- pkg/types/message/messages.go | 4 ---- 2 files changed, 8 deletions(-) diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index a2e0f273..90440a1d 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -49,10 +49,6 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { WebRTC: message.SystemWebRTC{ Videos: h.capture.VideoIDs(), }, - - // TODO: Left for compatibility with old client, remove. - ImplicitHosting: h.sessions.Settings().ImplicitHosting, - InactiveCursors: h.sessions.Settings().InactiveCursors, }) return nil diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index e5de8bfb..8c6bfe61 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -22,10 +22,6 @@ type SystemInit struct { Settings types.Settings `json:"settings"` ScreencastEnabled bool `json:"screencast_enabled"` WebRTC SystemWebRTC `json:"webrtc"` - - // TODO: Left for compatibility with old client, remove. - ImplicitHosting bool `json:"implicit_hosting"` - InactiveCursors bool `json:"inactive_cursors"` } type SystemAdmin struct { From ae7e6dc2d774fd00e5e63bdaec187c0696029822 Mon Sep 17 00:00:00 2001 From: Maksim Dorokhin Date: Wed, 20 Apr 2022 09:31:37 +0000 Subject: [PATCH 684/876] add error to plugin start. --- internal/plugins/manager.go | 6 ++++-- pkg/types/plugins.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/plugins/manager.go b/internal/plugins/manager.go index 776363bc..aa902722 100644 --- a/internal/plugins/manager.go +++ b/internal/plugins/manager.go @@ -94,13 +94,15 @@ func (manager *ManagerCtx) Start( webSocketManager types.WebSocketManager, apiManager types.ApiManager, ) { - for _, plug := range manager.plugins { - plug.Start(types.PluginManagers{ + for path, plug := range manager.plugins { + err := plug.Start(types.PluginManagers{ SessionManager: sessionManager, WebSocketManager: webSocketManager, ApiManager: apiManager, LoadServiceFromPlugin: manager.LookupService, }) + + manager.logger.Err(err).Str("plugin", path).Msg("plugin start") } } diff --git a/pkg/types/plugins.go b/pkg/types/plugins.go index f6014e0b..27887aa6 100644 --- a/pkg/types/plugins.go +++ b/pkg/types/plugins.go @@ -9,7 +9,7 @@ import ( type Plugin interface { Name() string Config() PluginConfig - Start(PluginManagers) + Start(PluginManagers) error Shutdown() error } From cd2d9b413d2b4409a492860a40daa79b101ce864 Mon Sep 17 00:00:00 2001 From: Aleksandar Sukovic Date: Tue, 3 May 2022 08:15:44 +0000 Subject: [PATCH 685/876] build plugins with own modfile. --- build | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build b/build index 64d6f514..0ec7aad3 100755 --- a/build +++ b/build @@ -44,12 +44,8 @@ fi for plugPath in ./plugins/*; do pushd $plugPath - # replace plugin dependecy - go mod edit -replace "gitlab.com/demodesk/neko/server=../../" - # load plugin dependencies - go get -v -t -d . # build plugin - go build -buildmode=plugin -o "../../bin/plugins/${plugPath##*/}.so" + go build -modfile=go.plug.mod -buildmode=plugin -o "../../bin/plugins/${plugPath##*/}.so" popd done From 49ff4906405386c4c765de4ea6bf50204f313e59 Mon Sep 17 00:00:00 2001 From: Aleksandar Sukovic Date: Tue, 3 May 2022 11:17:04 +0000 Subject: [PATCH 686/876] load plugins in order of dependencies. --- build | 2 + go.mod | 4 + go.sum | 1 + internal/plugins/dependency.go | 130 ++++++ internal/plugins/dependency_test.go | 629 ++++++++++++++++++++++++++++ internal/plugins/manager.go | 66 +-- pkg/types/plugins.go | 5 + 7 files changed, 804 insertions(+), 33 deletions(-) create mode 100644 internal/plugins/dependency.go create mode 100644 internal/plugins/dependency_test.go diff --git a/build b/build index 0ec7aad3..d69b8dd4 100755 --- a/build +++ b/build @@ -44,6 +44,8 @@ fi for plugPath in ./plugins/*; do pushd $plugPath + echo "Building plugin: $plugPath" + # build plugin go build -modfile=go.plug.mod -buildmode=plugin -o "../../bin/plugins/${plugPath##*/}.so" diff --git a/go.mod b/go.mod index 989ec78b..56de7c04 100644 --- a/go.mod +++ b/go.mod @@ -16,9 +16,11 @@ require ( github.com/rs/zerolog v1.26.1 github.com/spf13/cobra v1.4.0 github.com/spf13/viper v1.10.1 + github.com/stretchr/testify v1.7.1 ) require ( + github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect @@ -39,6 +41,7 @@ require ( github.com/pion/transport v0.13.0 // indirect github.com/pion/turn/v2 v2.0.8 // indirect github.com/pion/udp v0.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/afero v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect @@ -51,4 +54,5 @@ require ( golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/go.sum b/go.sum index 4b1ddb29..6a606236 100644 --- a/go.sum +++ b/go.sum @@ -580,6 +580,7 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/plugins/dependency.go b/internal/plugins/dependency.go new file mode 100644 index 00000000..31f2dddc --- /dev/null +++ b/internal/plugins/dependency.go @@ -0,0 +1,130 @@ +package plugins + +import ( + "fmt" + + "github.com/rs/zerolog" + + "gitlab.com/demodesk/neko/server/pkg/types" +) + +type dependency struct { + plugin types.Plugin + dependsOn []*dependency + invoked bool + logger zerolog.Logger +} + +type dependiencies struct { + deps map[string]*dependency + logger zerolog.Logger +} + +func (d *dependiencies) addPlugin(plugin types.Plugin) error { + plug, ok := d.deps[plugin.Name()] + if !ok { + plug = &dependency{} + } else if plug.plugin != nil { + return fmt.Errorf("plugin '%s' already added", plugin.Name()) + } + + plug.plugin = plugin + plug.logger = d.logger + d.deps[plugin.Name()] = plug + + dplug, ok := plugin.(types.DependablePlugin) + if !ok { + return nil + } + + for _, dep := range dplug.DependsOn() { + var dependsOn *dependency + dependsOn, ok = d.deps[dep] + if !ok { + dependsOn = &dependency{} + } else if dependsOn.plugin != nil { + // if there is a cyclical dependency, break it and return error + if tdep := dependsOn.findPlugin(plugin.Name()); tdep != nil { + dependsOn.dependsOn = nil + delete(d.deps, plugin.Name()) + return fmt.Errorf("cyclical dependency detected: '%s' <-> '%s'", plugin.Name(), tdep.plugin.Name()) + } + } + + plug.dependsOn = append(plug.dependsOn, dependsOn) + d.deps[dep] = dependsOn + } + + return nil +} + +func (d *dependiencies) start(pm types.PluginManagers) error { + for _, p := range d.deps { + if err := p.start(pm); err != nil { + return err + } + } + return nil +} + +func (d *dependiencies) findPlugin(name string) (*dependency, bool) { + for _, p := range d.deps { + if found := p.findPlugin(name); found != nil { + return found, true + } + } + return nil, false +} + +func (a *dependency) findPlugin(name string) *dependency { + if a == nil { + return nil + } + + if a.plugin.Name() == name { + return a + } + + for _, p := range a.dependsOn { + if found := p.findPlugin(name); found != nil { + return found + } + } + + return nil +} + +func (d *dependiencies) forEach(f func(*dependency) error) error { + for _, dp := range d.deps { + if err := f(dp); err != nil { + return err + } + } + return nil +} + +func (d *dependiencies) len() int { + return len(d.deps) +} + +func (a *dependency) start(pm types.PluginManagers) error { + if a.invoked { + return nil + } + + a.invoked = true + + for _, do := range a.dependsOn { + if err := do.start(pm); err != nil { + return err + } + } + + err := a.plugin.Start(pm) + a.logger.Err(err).Str("plugin", a.plugin.Name()).Msg("plugin start") + if err != nil { + return fmt.Errorf("plugin %s failed to start: %s", a.plugin.Name(), err) + } + + return nil +} diff --git a/internal/plugins/dependency_test.go b/internal/plugins/dependency_test.go new file mode 100644 index 00000000..259eba3c --- /dev/null +++ b/internal/plugins/dependency_test.go @@ -0,0 +1,629 @@ +package plugins + +import ( + "testing" + + "github.com/stretchr/testify/assert" + + "gitlab.com/demodesk/neko/server/pkg/types" +) + +func Test_deps_addPlugin(t *testing.T) { + type args struct { + p []types.Plugin + } + tests := []struct { + name string + args args + want map[string]*dependency + skipRun bool + wantErr1 bool + wantErr2 bool + }{ + { + name: "three plugins - no dependencies", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "first"}, + &dummyPlugin{name: "second"}, + &dummyPlugin{name: "third"}, + }, + }, + want: map[string]*dependency{ + "first": { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "second": { + plugin: &dummyPlugin{name: "second", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "third": { + plugin: &dummyPlugin{name: "third", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, { + name: "three plugins - one dependency", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "third", dep: []string{"second"}}, + &dummyPlugin{name: "first"}, + &dummyPlugin{name: "second"}, + }, + }, + want: map[string]*dependency{ + "first": { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "second": { + plugin: &dummyPlugin{name: "second", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "third": { + plugin: &dummyPlugin{name: "third", dep: []string{"second"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "second", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + }, + }, { + name: "three plugins - one double dependency", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "third", dep: []string{"first", "second"}}, + &dummyPlugin{name: "first"}, + &dummyPlugin{name: "second"}, + }, + }, + want: map[string]*dependency{ + "first": { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "second": { + plugin: &dummyPlugin{name: "second", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "third": { + plugin: &dummyPlugin{name: "third", dep: []string{"first", "second"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + { + plugin: &dummyPlugin{name: "second", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + }, + }, { + name: "three plugins - two dependencies", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "third", dep: []string{"first"}}, + &dummyPlugin{name: "first"}, + &dummyPlugin{name: "second", dep: []string{"first"}}, + }, + }, + want: map[string]*dependency{ + "first": { + plugin: &dummyPlugin{name: "first"}, + invoked: false, + dependsOn: nil, + }, + "third": { + plugin: &dummyPlugin{name: "third", dep: []string{"first"}}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first"}, + invoked: false, + dependsOn: nil, + }, + }, + }, + "second": { + plugin: &dummyPlugin{name: "second", dep: []string{"first"}}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first"}, + invoked: false, + dependsOn: nil, + }, + }, + }, + }, + skipRun: true, + }, { + name: "three plugins - three dependencies", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "third", dep: []string{"second"}}, + &dummyPlugin{name: "first"}, + &dummyPlugin{name: "second", dep: []string{"first"}}, + }, + }, + want: map[string]*dependency{ + "first": { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "second": { + plugin: &dummyPlugin{name: "second", dep: []string{"first"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + "third": { + plugin: &dummyPlugin{name: "third", dep: []string{"second"}, idx: 2}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "second", dep: []string{"first"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + }, + }, + }, + }, { + name: "four plugins - added in reverse order, with dependencies", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "forth", dep: []string{"third"}}, + &dummyPlugin{name: "third", dep: []string{"second"}}, + &dummyPlugin{name: "second", dep: []string{"first"}}, + &dummyPlugin{name: "first"}, + }, + }, + want: map[string]*dependency{ + "first": { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: false, + dependsOn: nil, + }, + "second": { + plugin: &dummyPlugin{name: "second", dep: []string{"first"}, idx: 0}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: false, + dependsOn: nil, + }, + }, + }, + "third": { + plugin: &dummyPlugin{name: "third", dep: []string{"second"}, idx: 0}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "second", dep: []string{"first"}, idx: 0}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: false, + dependsOn: nil, + }, + }, + }, + }, + }, + "forth": { + plugin: &dummyPlugin{name: "forth", dep: []string{"third"}, idx: 0}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "third", dep: []string{"second"}, idx: 0}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "second", dep: []string{"first"}, idx: 0}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: false, + dependsOn: nil, + }, + }, + }, + }, + }, + }, + }, + }, + skipRun: true, + }, { + name: "four plugins - two double dependencies", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "forth", dep: []string{"first", "third"}}, + &dummyPlugin{name: "third", dep: []string{"first", "second"}}, + &dummyPlugin{name: "second"}, + &dummyPlugin{name: "first"}, + }, + }, + want: map[string]*dependency{ + "first": { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "second": { + plugin: &dummyPlugin{name: "second", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "third": { + plugin: &dummyPlugin{name: "third", dep: []string{"first", "second"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + { + plugin: &dummyPlugin{name: "second", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + "forth": { + plugin: &dummyPlugin{name: "forth", dep: []string{"first", "third"}, idx: 2}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + { + plugin: &dummyPlugin{name: "third", dep: []string{"first", "second"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", idx: 0}, + invoked: true, + dependsOn: nil, + }, + { + plugin: &dummyPlugin{name: "second", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + }, + }, + }, + }, { + // So, when we have plugin A in the list and want to add plugin C we can't determine the proper order without + // resolving their direct dependiencies first: + // + // Can be C->D->A->B if D depends on A + // + // So to do it properly I would imagine tht we need to resolve all direct dependiencies first and build multiple lists: + // + // i.e. A->B->C D F->G + // + // and then join these lists in any order. + name: "add indirect dependency CDAB", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "A", dep: []string{"B"}}, + &dummyPlugin{name: "C", dep: []string{"D"}}, + &dummyPlugin{name: "B"}, + &dummyPlugin{name: "D", dep: []string{"A"}}, + }, + }, + want: map[string]*dependency{ + "B": { + plugin: &dummyPlugin{name: "B", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "A": { + plugin: &dummyPlugin{name: "A", dep: []string{"B"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "B", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + "D": { + plugin: &dummyPlugin{name: "D", dep: []string{"A"}, idx: 2}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "A", dep: []string{"B"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "B", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + }, + }, + "C": { + plugin: &dummyPlugin{name: "C", dep: []string{"D"}, idx: 3}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "D", dep: []string{"A"}, idx: 2}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "A", dep: []string{"B"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "B", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + }, + }, + }, + }, + }, + }, { + // So, when we have plugin A in the list and want to add plugin C we can't determine the proper order without + // resolving their direct dependiencies first: + // + // Can be A->B->C->D (in this test) if B depends on C + // + // So to do it properly I would imagine tht we need to resolve all direct dependiencies first and build multiple lists: + // + // i.e. A->B->C D F->G + // + // and then join these lists in any order. + name: "add indirect dependency ABCD", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "C", dep: []string{"D"}}, + &dummyPlugin{name: "D"}, + &dummyPlugin{name: "B", dep: []string{"C"}}, + &dummyPlugin{name: "A", dep: []string{"B"}}, + }, + }, + want: map[string]*dependency{ + "D": { + plugin: &dummyPlugin{name: "D", idx: 0}, + invoked: true, + dependsOn: nil, + }, + "C": { + plugin: &dummyPlugin{name: "C", dep: []string{"D"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "D", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + "B": { + plugin: &dummyPlugin{name: "B", dep: []string{"C"}, idx: 2}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "C", dep: []string{"D"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "D", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + }, + }, + "A": { + plugin: &dummyPlugin{name: "A", dep: []string{"B"}, idx: 3}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "B", dep: []string{"C"}, idx: 2}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "C", dep: []string{"D"}, idx: 1}, + invoked: true, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "D", idx: 0}, + invoked: true, + dependsOn: nil, + }, + }, + }, + }, + }, + }, + }, + }, + }, { + name: "add duplicate plugin", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "first"}, + &dummyPlugin{name: "first"}, + }, + }, + want: map[string]*dependency{ + "first": {plugin: &dummyPlugin{name: "first", idx: 0}, invoked: true}, + }, + wantErr1: true, + }, { + name: "cyclical dependency", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "first", dep: []string{"second"}}, + &dummyPlugin{name: "second", dep: []string{"first"}}, + }, + }, + want: map[string]*dependency{ + "first": { + plugin: &dummyPlugin{name: "first", dep: []string{"second"}, idx: 1}, + invoked: true, + }, + }, + wantErr1: true, + }, { + name: "four plugins - cyclical transitive dependencies in reverse order", + args: args{ + p: []types.Plugin{ + &dummyPlugin{name: "forth", dep: []string{"third"}}, + &dummyPlugin{name: "third", dep: []string{"second"}}, + &dummyPlugin{name: "second", dep: []string{"first"}}, + &dummyPlugin{name: "first", dep: []string{"forth"}}, + }, + }, + want: map[string]*dependency{ + "second": { + plugin: &dummyPlugin{name: "second", dep: []string{"first"}, idx: 0}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", dep: []string{"forth"}, idx: 0}, + invoked: false, + dependsOn: nil, + }, + }, + }, + "third": { + plugin: &dummyPlugin{name: "third", dep: []string{"second"}, idx: 0}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "second", dep: []string{"first"}, idx: 0}, + invoked: false, + dependsOn: []*dependency{ + { + plugin: &dummyPlugin{name: "first", dep: []string{"forth"}, idx: 0}, + invoked: false, + dependsOn: nil, + }, + }, + }, + }, + }, + "forth": { + plugin: &dummyPlugin{name: "forth", dep: []string{"third"}, idx: 0}, + invoked: false, + dependsOn: nil, + }, + }, + wantErr1: true, + skipRun: true, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + d := &dependiencies{deps: make(map[string]*dependency)} + + var ( + err error + counter int + ) + for _, p := range tt.args.p { + if !tt.skipRun { + p.(*dummyPlugin).counter = &counter + } + if err = d.addPlugin(p); err != nil { + break + } + } + if err != nil != tt.wantErr1 { + t.Errorf("dependiencies.addPlugin() error = %v, wantErr1 %v", err, tt.wantErr1) + return + } + + if !tt.skipRun { + if err := d.start(types.PluginManagers{}); (err != nil) != tt.wantErr2 { + t.Errorf("dependiencies.start() error = %v, wantErr1 %v", err, tt.wantErr2) + } + } + + assert.Equal(t, tt.want, d.deps) + }) + } +} + +type dummyPlugin struct { + name string + dep []string + idx int + counter *int +} + +func (d dummyPlugin) Name() string { + return d.name +} + +func (d dummyPlugin) DependsOn() []string { + return d.dep +} + +func (d dummyPlugin) Config() types.PluginConfig { + return nil +} + +func (d *dummyPlugin) Start(types.PluginManagers) error { + if len(d.dep) > 0 { + *d.counter++ + d.idx = *d.counter + } + d.counter = nil + return nil +} + +func (d dummyPlugin) Shutdown() error { + return nil +} diff --git a/internal/plugins/manager.go b/internal/plugins/manager.go index aa902722..ea88ca61 100644 --- a/internal/plugins/manager.go +++ b/internal/plugins/manager.go @@ -16,18 +16,22 @@ import ( type ManagerCtx struct { logger zerolog.Logger - plugins map[string]types.Plugin + plugins dependiencies } func New(config *config.Plugins) *ManagerCtx { manager := &ManagerCtx{ - logger: log.With().Str("module", "plugins").Logger(), - plugins: map[string]types.Plugin{}, + logger: log.With().Str("module", "plugins").Logger(), + plugins: dependiencies{ + deps: make(map[string]*dependency), + }, } + manager.plugins.logger = manager.logger + if config.Enabled { err := manager.loadDir(config.Dir) - manager.logger.Err(err).Msgf("loading finished, total %d plugins", len(manager.plugins)) + manager.logger.Err(err).Msgf("loading finished, total %d plugins", manager.plugins.len()) } return manager @@ -45,7 +49,6 @@ func (manager *ManagerCtx) loadDir(dir string) error { err = manager.load(path) manager.logger.Err(err).Str("plugin", path).Msg("loading a plugin") - return nil }) } @@ -66,27 +69,28 @@ func (manager *ManagerCtx) load(path string) error { return fmt.Errorf("not a valid plugin") } - _, ok = manager.plugins[p.Name()] - if ok { - return fmt.Errorf("plugin '%s' already exists", p.Name()) + if err = manager.plugins.addPlugin(p); err != nil { + return fmt.Errorf("failed to add plugin '%s': %w", p.Name(), err) } - manager.plugins[p.Name()] = p + manager.logger.Info().Msgf("loaded plugin '%s', total %d plugins", p.Name(), manager.plugins.len()) return nil } func (manager *ManagerCtx) InitConfigs(cmd *cobra.Command) { - for path, plug := range manager.plugins { - if err := plug.Config().Init(cmd); err != nil { - log.Err(err).Str("plugin", path).Msg("unable to initialize configuration") + _ = manager.plugins.forEach(func(plug *dependency) error { + if err := plug.plugin.Config().Init(cmd); err != nil { + log.Err(err).Str("plugin", plug.plugin.Name()).Msg("unable to initialize configuration") } - } + return nil + }) } func (manager *ManagerCtx) SetConfigs() { - for _, plug := range manager.plugins { - plug.Config().Set() - } + _ = manager.plugins.forEach(func(plug *dependency) error { + plug.plugin.Config().Set() + return nil + }) } func (manager *ManagerCtx) Start( @@ -94,34 +98,30 @@ func (manager *ManagerCtx) Start( webSocketManager types.WebSocketManager, apiManager types.ApiManager, ) { - for path, plug := range manager.plugins { - err := plug.Start(types.PluginManagers{ - SessionManager: sessionManager, - WebSocketManager: webSocketManager, - ApiManager: apiManager, - LoadServiceFromPlugin: manager.LookupService, - }) - - manager.logger.Err(err).Str("plugin", path).Msg("plugin start") - } + _ = manager.plugins.start(types.PluginManagers{ + SessionManager: sessionManager, + WebSocketManager: webSocketManager, + ApiManager: apiManager, + LoadServiceFromPlugin: manager.LookupService, + }) } func (manager *ManagerCtx) Shutdown() error { - for path, plug := range manager.plugins { - err := plug.Shutdown() - manager.logger.Err(err).Str("plugin", path).Msg("plugin shutdown") - } - + _ = manager.plugins.forEach(func(plug *dependency) error { + err := plug.plugin.Shutdown() + manager.logger.Err(err).Str("plugin", plug.plugin.Name()).Msg("plugin shutdown") + return nil + }) return nil } func (manager *ManagerCtx) LookupService(pluginName string) (any, error) { - plug, ok := manager.plugins[pluginName] + plug, ok := manager.plugins.findPlugin(pluginName) if !ok { return nil, fmt.Errorf("plugin '%s' not found", pluginName) } - expPlug, ok := plug.(types.ExposablePlugin) + expPlug, ok := plug.plugin.(types.ExposablePlugin) if !ok { return nil, fmt.Errorf("plugin '%s' is not exposable", pluginName) } diff --git a/pkg/types/plugins.go b/pkg/types/plugins.go index 27887aa6..7176e382 100644 --- a/pkg/types/plugins.go +++ b/pkg/types/plugins.go @@ -13,6 +13,11 @@ type Plugin interface { Shutdown() error } +type DependablePlugin interface { + Plugin + DependsOn() []string +} + type ExposablePlugin interface { Plugin ExposeService() any From d5425ea45707844099ef8271f4fc9f3870a444ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 3 May 2022 19:57:31 +0000 Subject: [PATCH 687/876] clipboard set for control paste. --- internal/desktop/clipboard.go | 10 ++++++++++ internal/websocket/handler/control.go | 9 ++++++++- internal/websocket/handler/handler.go | 5 ++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index b9772142..c7431b87 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -7,6 +7,7 @@ import ( "strings" "gitlab.com/demodesk/neko/server/pkg/types" + "gitlab.com/demodesk/neko/server/pkg/xevent" ) func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) { @@ -63,6 +64,13 @@ func (manager *DesktopManagerCtx) ClipboardSetBinary(mime string, data []byte) e return err } + // TODO: Refactor. + // We need to wait until the data came to the clipboard. + wait := make(chan struct{}) + xevent.Emmiter.Once("clipboard-updated", func(payload ...interface{}) { + wait <- struct{}{} + }) + err = cmd.Start() if err != nil { msg := strings.TrimSpace(stderr.String()) @@ -78,6 +86,8 @@ func (manager *DesktopManagerCtx) ClipboardSetBinary(mime string, data []byte) e // TODO: Refactor. // cmd.Wait() + <-wait + return nil } diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index d7e041cf..e0cb2a52 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -99,11 +99,18 @@ func (h *MessageHandlerCtx) controlCopy(session types.Session) error { return h.desktop.KeyPress(xorg.XK_Control_L, xorg.XK_c) } -func (h *MessageHandlerCtx) controlPaste(session types.Session) error { +func (h *MessageHandlerCtx) controlPaste(session types.Session, payload *message.ClipboardData) error { if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err } + // if there have been set clipboard data, set them first + if payload != nil && payload.Text != "" { + if err := h.clipboardSet(session, payload); err != nil { + return err + } + } + return h.desktop.KeyPress(xorg.XK_Control_L, xorg.XK_v) } diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 9c5a8a26..d87935b8 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -97,7 +97,10 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM case event.CONTROL_COPY: err = h.controlCopy(session) case event.CONTROL_PASTE: - err = h.controlPaste(session) + payload := &message.ClipboardData{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlPaste(session, payload) + }) case event.CONTROL_SELECT_ALL: err = h.controlSelectAll(session) From 52642dbeb63f104375f159a7a5291dd1aac127eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 8 May 2022 00:15:36 +0200 Subject: [PATCH 688/876] add plugins to member profile. --- pkg/types/member.go | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkg/types/member.go b/pkg/types/member.go index 116c1684..6506f7dc 100644 --- a/pkg/types/member.go +++ b/pkg/types/member.go @@ -9,16 +9,21 @@ var ( ) type MemberProfile struct { - Name string `json:"name"` - IsAdmin bool `json:"is_admin"` - CanLogin bool `json:"can_login"` - CanConnect bool `json:"can_connect"` - CanWatch bool `json:"can_watch"` - CanHost bool `json:"can_host"` - CanShareMedia bool `json:"can_share_media"` - CanAccessClipboard bool `json:"can_access_clipboard"` - SendsInactiveCursor bool `json:"sends_inactive_cursor"` - CanSeeInactiveCursors bool `json:"can_see_inactive_cursors"` + Name string `json:"name"` + + // permissions + IsAdmin bool `json:"is_admin"` + CanLogin bool `json:"can_login"` + CanConnect bool `json:"can_connect"` + CanWatch bool `json:"can_watch"` + CanHost bool `json:"can_host"` + CanShareMedia bool `json:"can_share_media"` + CanAccessClipboard bool `json:"can_access_clipboard"` + SendsInactiveCursor bool `json:"sends_inactive_cursor"` + CanSeeInactiveCursors bool `json:"can_see_inactive_cursors"` + + // plugin scope + Plugins map[string]any `json:"plugins"` } type MemberProvider interface { From 0e6b4119885e78dfab19505f05abfe086a6abfc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 8 May 2022 00:22:45 +0200 Subject: [PATCH 689/876] skip plugin build if no go.plug.mod. --- build | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build b/build index d69b8dd4..6da83c33 100755 --- a/build +++ b/build @@ -1,7 +1,7 @@ #!/bin/bash mkdir -p bin/plugins -rm bin/plugins/* +rm bin/plugins/* 2>/dev/null # # aborting if any command returns a non-zero value @@ -46,6 +46,13 @@ for plugPath in ./plugins/*; do echo "Building plugin: $plugPath" + if [ ! -f "go.plug.mod" ]; + then + echo "go.plug.mod not found, skipping..." + popd + continue + fi + # build plugin go build -modfile=go.plug.mod -buildmode=plugin -o "../../bin/plugins/${plugPath##*/}.so" From 91c8f0886b059fdd8a9edaa3aae0edd2061b411c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 8 May 2022 00:32:20 +0200 Subject: [PATCH 690/876] optionally rebuild plugins. --- build | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/build b/build index 6da83c33..16fb5d7f 100755 --- a/build +++ b/build @@ -1,12 +1,16 @@ #!/bin/bash -mkdir -p bin/plugins -rm bin/plugins/* 2>/dev/null - # # aborting if any command returns a non-zero value set -e +# +# do not build plugins when passing "core" as first argument +if [ "$1" = "core" ]; +then + skip_plugins="true" +fi + # # set git build variables if git exists if git version > /dev/null && [ -z $GIT_COMMIT ] && [ -z $GIT_COMMIT ]; @@ -31,6 +35,14 @@ go build \ " \ cmd/neko/main.go; +# +# if plugins are ignored +if [ "$skip_plugins" = "true" ]; +then + echo "Not building plugins..." + exit 0 +fi + # # if plugins directory does not exist if [ ! -d "./plugins" ]; @@ -39,6 +51,11 @@ then exit 0 fi +# +# ensure plugins folder exits and remove old plugins +mkdir -p bin/plugins +rm -f bin/plugins/* + # # build plugins for plugPath in ./plugins/*; do From a31ad44bb81a782757a35d7432255939afe5eb09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 12 May 2022 00:12:15 +0200 Subject: [PATCH 691/876] plugins generic only. --- pkg/auth/auth.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 98620387..43126ae5 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -2,6 +2,7 @@ package auth import ( "context" + "fmt" "net/http" "gitlab.com/demodesk/neko/server/pkg/types" @@ -69,3 +70,19 @@ func CanAccessClipboardOnly(w http.ResponseWriter, r *http.Request) (context.Con return nil, nil } + +func PluginsGenericOnly[V comparable](key string, value V) func(w http.ResponseWriter, r *http.Request) (context.Context, error) { + return func(w http.ResponseWriter, r *http.Request) (context.Context, error) { + session, ok := GetSession(r) + if !ok { + return nil, utils.HttpForbidden("session not found") + } + + plugins := session.Profile().Plugins + if val, ok := plugins[key].(V); !ok || val != value { + return nil, utils.HttpForbidden(fmt.Sprintf("%s is set to %v; expected %v", key, value, val)) + } + + return nil, nil + } +} From ff85f0b11b59099f6374ee8433a473f3215d4899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 May 2022 00:30:58 +0200 Subject: [PATCH 692/876] PluginsGenericOnly debug types. --- pkg/auth/auth.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 43126ae5..12c24155 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -71,7 +71,7 @@ func CanAccessClipboardOnly(w http.ResponseWriter, r *http.Request) (context.Con return nil, nil } -func PluginsGenericOnly[V comparable](key string, value V) func(w http.ResponseWriter, r *http.Request) (context.Context, error) { +func PluginsGenericOnly[V comparable](key string, exp V) func(w http.ResponseWriter, r *http.Request) (context.Context, error) { return func(w http.ResponseWriter, r *http.Request) (context.Context, error) { session, ok := GetSession(r) if !ok { @@ -79,10 +79,16 @@ func PluginsGenericOnly[V comparable](key string, value V) func(w http.ResponseW } plugins := session.Profile().Plugins - if val, ok := plugins[key].(V); !ok || val != value { - return nil, utils.HttpForbidden(fmt.Sprintf("%s is set to %v; expected %v", key, value, val)) + + val, ok := plugins[key].(V) + if !ok { + return nil, utils.HttpForbidden(fmt.Sprintf("%s is %T, but expected %T", key, plugins[key], exp)) } - + + if val != exp { + return nil, utils.HttpForbidden(fmt.Sprintf("%s is set to %v, but expected %v", key, val, exp)) + } + return nil, nil } } From 5b7784f2a444cd0fc5e70430fae208f9fd372547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 May 2022 17:40:49 +0200 Subject: [PATCH 693/876] add auth test. --- pkg/auth/auth_test.go | 356 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) create mode 100644 pkg/auth/auth_test.go diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go new file mode 100644 index 00000000..94f242ad --- /dev/null +++ b/pkg/auth/auth_test.go @@ -0,0 +1,356 @@ +package auth + +import ( + "fmt" + "net/http" + "reflect" + "testing" + + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/session" + "gitlab.com/demodesk/neko/server/pkg/types" +) + +var i = 0 +var sessionManager = session.New(&config.Session{}) + +func rWithSession(profile types.MemberProfile) (*http.Request, types.Session, error) { + i++ + r := &http.Request{} + session, _, err := sessionManager.Create(fmt.Sprintf("id-%d", i), profile) + ctx := SetSession(r, session) + r = r.WithContext(ctx) + return r, session, err +} + +func TestSessionCtx(t *testing.T) { + r, session, err := rWithSession(types.MemberProfile{}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + sess, ok := GetSession(r) + if !ok { + t.Errorf("session not found") + return + } + + if !reflect.DeepEqual(sess, session) { + t.Errorf("sessions not equal") + return + } +} + +func TestAdminsOnly(t *testing.T) { + r1, _, err := rWithSession(types.MemberProfile{IsAdmin: false}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + r2, _, err := rWithSession(types.MemberProfile{IsAdmin: true}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + tests := []struct { + name string + r *http.Request + wantErr bool + }{ + { + name: "is not admin", + r: r1, + wantErr: true, + }, + { + name: "is admin", + r: r2, + wantErr: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + _, err := AdminsOnly(nil, tt.r) + if (err != nil) != tt.wantErr { + t.Errorf("AdminsOnly() error = %v, wantErr %v", err, tt.wantErr) + return + } + }) + } +} + +func TestHostsOnly(t *testing.T) { + r1, _, err := rWithSession(types.MemberProfile{CanHost: true}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + r2, session, err := rWithSession(types.MemberProfile{CanHost: true}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + // r2 is host + sessionManager.SetHost(session) + + r3, _, err := rWithSession(types.MemberProfile{CanHost: false}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + tests := []struct { + name string + r *http.Request + wantErr bool + }{ + { + name: "is not hosting", + r: r1, + wantErr: true, + }, + { + name: "is hosting", + r: r2, + wantErr: false, + }, + { + name: "cannot host", + r: r3, + wantErr: true, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + _, err := HostsOnly(nil, tt.r) + if (err != nil) != tt.wantErr { + t.Errorf("HostsOnly() error = %v, wantErr %v", err, tt.wantErr) + return + } + }) + } +} + +func TestCanWatchOnly(t *testing.T) { + r1, _, err := rWithSession(types.MemberProfile{CanWatch: false}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + r2, _, err := rWithSession(types.MemberProfile{CanWatch: true}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + tests := []struct { + name string + r *http.Request + wantErr bool + }{ + { + name: "can not watch", + r: r1, + wantErr: true, + }, + { + name: "can watch", + r: r2, + wantErr: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + _, err := CanWatchOnly(nil, tt.r) + if (err != nil) != tt.wantErr { + t.Errorf("CanWatchOnly() error = %v, wantErr %v", err, tt.wantErr) + return + } + }) + } +} + +func TestCanHostOnly(t *testing.T) { + r1, _, err := rWithSession(types.MemberProfile{CanHost: false}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + r2, _, err := rWithSession(types.MemberProfile{CanHost: true}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + tests := []struct { + name string + r *http.Request + wantErr bool + privateMode bool + }{ + { + name: "can not host", + r: r1, + wantErr: true, + }, + { + name: "can host", + r: r2, + wantErr: false, + }, + { + name: "private mode enabled: can not host", + r: r1, + wantErr: true, + privateMode: true, + }, + { + name: "private mode enabled: can host", + r: r2, + wantErr: true, + privateMode: true, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + settings := sessionManager.Settings() + settings.PrivateMode = tt.privateMode + sessionManager.UpdateSettings(settings) + + _, err := CanHostOnly(nil, tt.r) + if (err != nil) != tt.wantErr { + t.Errorf("CanHostOnly() error = %v, wantErr %v", err, tt.wantErr) + return + } + }) + } +} + +func TestCanAccessClipboardOnly(t *testing.T) { + r1, _, err := rWithSession(types.MemberProfile{CanAccessClipboard: false}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + r2, _, err := rWithSession(types.MemberProfile{CanAccessClipboard: true}) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + tests := []struct { + name string + r *http.Request + wantErr bool + }{ + { + name: "can not access clipboard", + r: r1, + wantErr: true, + }, + { + name: "can access clipboard", + r: r2, + wantErr: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + _, err := CanAccessClipboardOnly(nil, tt.r) + if (err != nil) != tt.wantErr { + t.Errorf("CanAccessClipboardOnly() error = %v, wantErr %v", err, tt.wantErr) + return + } + }) + } +} + +func TestPluginsGenericOnly(t *testing.T) { + r1, _, err := rWithSession(types.MemberProfile{ + Plugins: map[string]any{ + "foo.bar": 1, + }, + }) + if err != nil { + t.Errorf("could not create session %s", err.Error()) + return + } + + t.Run("test if exists", func(t *testing.T) { + key := "foo.bar" + val := 1 + wantErr := false + + handler := PluginsGenericOnly(key, val) + _, err := handler(nil, r1) + if (err != nil) != wantErr { + t.Errorf("PluginsGenericOnly(%q, %v) error = %v, wantErr %v", key, val, err, wantErr) + return + } + }) + + t.Run("test when gets different value", func(t *testing.T) { + key := "foo.bar" + val := 2 + wantErr := true + + handler := PluginsGenericOnly(key, val) + _, err := handler(nil, r1) + if (err != nil) != wantErr { + t.Errorf("PluginsGenericOnly(%q, %v) error = %v, wantErr %v", key, val, err, wantErr) + return + } + }) + + t.Run("test when gets different type", func(t *testing.T) { + key := "foo.bar" + val := "1" + wantErr := true + + handler := PluginsGenericOnly(key, val) + _, err := handler(nil, r1) + if (err != nil) != wantErr { + t.Errorf("PluginsGenericOnly(%q, %v) error = %v, wantErr %v", key, val, err, wantErr) + return + } + }) + + t.Run("test if does not exists", func(t *testing.T) { + key := "foo.bar_not_extist" + val := 1 + wantErr := true + + handler := PluginsGenericOnly(key, val) + _, err := handler(nil, r1) + if (err != nil) != wantErr { + t.Errorf("PluginsGenericOnly(%q, %v) error = %v, wantErr %v", key, val, err, wantErr) + return + } + }) + + t.Run("test if session does not exists", func(t *testing.T) { + key := "foo.bar_not_extist" + val := 1 + wantErr := true + + handler := PluginsGenericOnly(key, val) + _, err := handler(nil, &http.Request{}) + if (err != nil) != wantErr { + t.Errorf("PluginsGenericOnly(%q, %v) error = %v, wantErr %v", key, val, err, wantErr) + return + } + }) +} From 0952be6a9450b14bd2e608f79685a2e532e5b567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 15 Jun 2022 00:22:27 +0200 Subject: [PATCH 694/876] add chi metrics middleware. --- go.mod | 9 ++++ go.sum | 88 ++++++++++++++++++++++++++++++++++++++++ internal/api/router.go | 7 ++++ internal/http/metrics.go | 57 ++++++++++++++++++++++++++ internal/http/router.go | 1 + 5 files changed, 162 insertions(+) create mode 100644 internal/http/metrics.go diff --git a/go.mod b/go.mod index 56de7c04..2a8bc9b7 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.9 github.com/pion/webrtc/v3 v3.1.27 + github.com/prometheus/client_golang v1.12.2 github.com/rs/zerolog v1.26.1 github.com/spf13/cobra v1.4.0 github.com/spf13/viper v1.10.1 @@ -20,13 +21,17 @@ require ( ) require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/kr/pretty v0.2.0 // indirect github.com/magiconair/properties v1.8.5 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pion/datachannel v1.5.2 // indirect @@ -42,6 +47,9 @@ require ( github.com/pion/turn/v2 v2.0.8 // indirect github.com/pion/udp v0.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.32.1 // indirect + github.com/prometheus/procfs v0.7.3 // indirect github.com/spf13/afero v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect @@ -52,6 +60,7 @@ require ( golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/protobuf v1.27.1 // indirect gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/go.sum b/go.sum index 6a606236..de309a4d 100644 --- a/go.sum +++ b/go.sum @@ -42,7 +42,19 @@ github.com/PaesslerAG/gval v1.1.2 h1:EROKxV4/fAKWb0Qoj7NOxmHZA7gcpjOV9XgiRZMRCUU github.com/PaesslerAG/gval v1.1.2/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -72,8 +84,16 @@ github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vz github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -100,6 +120,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -113,6 +134,8 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -144,12 +167,22 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -158,8 +191,17 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -211,17 +253,43 @@ github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= github.com/pion/webrtc/v3 v3.1.27 h1:yQ6TuHKJR/vro3nLZMfPv+WGf7T1/4ItaQeuzIZLXs4= github.com/pion/webrtc/v3 v3.1.27/go.mod h1:hdduI+Rx0cpGvva18j0gKy/Iak611WPyhUIXs5W/FuI= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= +github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60= github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= @@ -235,7 +303,9 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -255,6 +325,7 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -302,6 +373,7 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -309,6 +381,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -335,6 +408,7 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -350,6 +424,7 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -362,10 +437,13 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -377,6 +455,7 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -389,6 +468,8 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -397,9 +478,11 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -564,6 +647,9 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= @@ -573,8 +659,10 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/internal/api/router.go b/internal/api/router.go index c7d171b9..96a174dd 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -5,6 +5,8 @@ import ( "errors" "net/http" + "github.com/prometheus/client_golang/prometheus/promhttp" + "gitlab.com/demodesk/neko/server/internal/api/members" "gitlab.com/demodesk/neko/server/internal/api/room" "gitlab.com/demodesk/neko/server/pkg/auth" @@ -62,6 +64,11 @@ func (api *ApiManagerCtx) Route(r types.Router) { _, err := w.Write([]byte("true")) return err }) + + r.Get("/metrics", func(w http.ResponseWriter, r *http.Request) error { + promhttp.Handler().ServeHTTP(w, r) + return nil + }) } func (api *ApiManagerCtx) Authenticate(w http.ResponseWriter, r *http.Request) (context.Context, error) { diff --git a/internal/http/metrics.go b/internal/http/metrics.go new file mode 100644 index 00000000..68623b1d --- /dev/null +++ b/internal/http/metrics.go @@ -0,0 +1,57 @@ +package http + +import ( + "net/http" + "time" + + "github.com/go-chi/chi/middleware" + "github.com/prometheus/client_golang/prometheus" +) + +// Middleware is a handler that exposes prometheus metrics for the number of requests, +// the latency and the response size, partitioned by status code, method and HTTP path. +type metrics struct { + reqs *prometheus.CounterVec + latency *prometheus.HistogramVec +} + +// NewMiddleware returns a new prometheus Middleware handler. +func middlewareMetrics(next http.Handler) http.Handler { + var m metrics + + m.reqs = prometheus.NewCounterVec( + prometheus.CounterOpts{ + Name: "requests_total", + Namespace: "neko", + Subsystem: "http", + Help: "How many HTTP requests processed, partitioned by status code, method and HTTP path.", + }, + []string{"code", "method", "path"}, + ) + prometheus.MustRegister(m.reqs) + + m.latency = prometheus.NewHistogramVec(prometheus.HistogramOpts{ + Name: "request_duration_milliseconds", + Namespace: "neko", + Subsystem: "http", + Help: "How long it took to process the request, partitioned by status code, method and HTTP path.", + Buckets: []float64{300, 1200, 5000}, + }, + []string{"code", "method", "path"}, + ) + + prometheus.MustRegister(m.latency) + return m.handler(next) +} + +func (c metrics) handler(next http.Handler) http.Handler { + fn := func(w http.ResponseWriter, r *http.Request) { + start := time.Now() + ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor) + next.ServeHTTP(ww, r) + c.reqs.WithLabelValues(http.StatusText(ww.Status()), r.Method, r.URL.Path).Inc() + c.latency.WithLabelValues(http.StatusText(ww.Status()), r.Method, r.URL.Path).Observe(float64(time.Since(start).Nanoseconds()) / 1000000) + } + + return http.HandlerFunc(fn) +} diff --git a/internal/http/router.go b/internal/http/router.go index 636cc4ca..30db7e4e 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -20,6 +20,7 @@ func newRouter(logger zerolog.Logger) *router { r := chi.NewRouter() r.Use(middleware.RequestID) // Create a request ID for each request r.Use(middleware.RequestLogger(&logFormatter{logger})) + r.Use(middlewareMetrics) r.Use(middleware.Recoverer) // Recover from panics without crashing server return &router{r} } From 6deaa64884acb8b9265f088a2b74375ab4fff25b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 15 Jun 2022 00:23:16 +0200 Subject: [PATCH 695/876] capture metrics. --- internal/capture/broadcast.go | 15 +++++++++++++ internal/capture/screencast.go | 25 +++++++++++++++++++++ internal/capture/streamsink.go | 32 ++++++++++++++++++++++++++ internal/capture/streamsrc.go | 41 ++++++++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 7d26df65..bb6d27be 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -4,6 +4,8 @@ import ( "strings" "sync" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -21,6 +23,9 @@ type BroacastManagerCtx struct { url string started bool + + // metrics + pipelinesCounter prometheus.Counter } func broadcastNew(pipelineStr string) *BroacastManagerCtx { @@ -34,6 +39,14 @@ func broadcastNew(pipelineStr string) *BroacastManagerCtx { pipelineStr: pipelineStr, url: "", started: false, + + // metrics + pipelinesCounter: promauto.NewCounter(prometheus.CounterOpts{ + Name: "pipelines_total", + Namespace: "neko", + Subsystem: "capture_broadcast", + Help: "Total number of created pipelines.", + }), } } @@ -102,6 +115,8 @@ func (manager *BroacastManagerCtx) createPipeline() error { } manager.pipeline.Play() + manager.pipelinesCounter.Inc() + return nil } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 82d59e18..d6b815a4 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -6,6 +6,8 @@ import ( "sync/atomic" "time" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -32,6 +34,10 @@ type ScreencastManagerCtx struct { enabled bool started bool expired int32 + + // metrics + imagesCounter prometheus.Counter + pipelinesCounter prometheus.Counter } func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { @@ -46,6 +52,20 @@ func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { tickerStop: make(chan struct{}), enabled: enabled, started: false, + + // metrics + imagesCounter: promauto.NewCounter(prometheus.CounterOpts{ + Name: "images_total", + Namespace: "neko", + Subsystem: "capture_screencast", + Help: "Total number of created images.", + }), + pipelinesCounter: promauto.NewCounter(prometheus.CounterOpts{ + Name: "pipelines_total", + Namespace: "neko", + Subsystem: "capture_screencast", + Help: "Total number of created pipelines.", + }), } manager.wg.Add(1) @@ -158,6 +178,7 @@ func (manager *ScreencastManagerCtx) createPipeline() error { manager.pipeline.AttachAppsink("appsink") manager.pipeline.Play() + manager.pipelinesCounter.Inc() // get first image select { @@ -168,6 +189,8 @@ func (manager *ScreencastManagerCtx) createPipeline() error { manager.imageMu.Lock() manager.image = image manager.imageMu.Unlock() + + manager.imagesCounter.Inc() } case <-time.After(1 * time.Second): return errors.New("timeouted while waiting for first image") @@ -190,6 +213,8 @@ func (manager *ScreencastManagerCtx) createPipeline() error { manager.imageMu.Lock() manager.image = image manager.imageMu.Unlock() + + manager.imagesCounter.Inc() } }() diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index 22d1f64e..8b1faad4 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -5,6 +5,9 @@ import ( "reflect" "sync" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -27,6 +30,10 @@ type StreamSinkManagerCtx struct { listeners map[uintptr]*func(sample types.Sample) listenersMu sync.Mutex + + // metrics + currentListeners prometheus.Gauge + pipelinesCounter prometheus.Counter } func streamSinkNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) *StreamSinkManagerCtx { @@ -40,6 +47,28 @@ func streamSinkNew(codec codec.RTPCodec, pipelineStr func() string, video_id str codec: codec, pipelineStr: pipelineStr, listeners: map[uintptr]*func(sample types.Sample){}, + + // metrics + currentListeners: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "listeners", + Namespace: "neko", + Subsystem: "capture_streamsink", + Help: "Current number of listeners for a pipeline.", + ConstLabels: map[string]string{ + "video_id": video_id, + "codec": codec.Name, + }, + }), + pipelinesCounter: promauto.NewCounter(prometheus.CounterOpts{ + Name: "pipelines_total", + Namespace: "neko", + Subsystem: "capture_streamsink", + Help: "Total number of created pipelines.", + ConstLabels: map[string]string{ + "video_id": video_id, + "codec": codec.Name, + }, + }), } return manager @@ -90,6 +119,7 @@ func (manager *StreamSinkManagerCtx) addListener(listener *func(sample types.Sam manager.listenersMu.Unlock() manager.logger.Debug().Interface("ptr", ptr).Msgf("adding listener") + manager.currentListeners.Set(float64(manager.ListenersCount())) } func (manager *StreamSinkManagerCtx) removeListener(listener *func(sample types.Sample)) { @@ -100,6 +130,7 @@ func (manager *StreamSinkManagerCtx) removeListener(listener *func(sample types. manager.listenersMu.Unlock() manager.logger.Debug().Interface("ptr", ptr).Msgf("removing listener") + manager.currentListeners.Set(float64(manager.ListenersCount())) } func (manager *StreamSinkManagerCtx) AddListener(listener *func(sample types.Sample)) error { @@ -240,6 +271,7 @@ func (manager *StreamSinkManagerCtx) createPipeline() error { } }() + manager.pipelinesCounter.Inc() return nil } diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index 368f6e0f..c6583670 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -4,6 +4,8 @@ import ( "errors" "sync" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -21,6 +23,10 @@ type StreamSrcManagerCtx struct { pipeline *gst.Pipeline pipelineMu sync.Mutex pipelineStr string + + // metrics + pushedData map[string]prometheus.Summary + pipelinesCounter map[string]prometheus.Counter } func streamSrcNew(enabled bool, codecPipeline map[string]string, video_id string) *StreamSrcManagerCtx { @@ -29,10 +35,39 @@ func streamSrcNew(enabled bool, codecPipeline map[string]string, video_id string Str("submodule", "stream-src"). Str("video_id", video_id).Logger() + pushedData := map[string]prometheus.Summary{} + pipelinesCounter := map[string]prometheus.Counter{} + for codec := range codecPipeline { + pushedData[codec] = promauto.NewSummary(prometheus.SummaryOpts{ + Name: "data_bytes", + Namespace: "neko", + Subsystem: "capture_streamsrc", + Help: "Data pushed to a pipeline (in bytes).", + ConstLabels: map[string]string{ + "video_id": video_id, + "codec": codec, + }, + }) + pipelinesCounter[codec] = promauto.NewCounter(prometheus.CounterOpts{ + Name: "pipelines_total", + Namespace: "neko", + Subsystem: "capture_streamsrc", + Help: "Total number of created pipelines.", + ConstLabels: map[string]string{ + "video_id": video_id, + "codec": codec, + }, + }) + } + return &StreamSrcManagerCtx{ logger: logger, enabled: enabled, codecPipeline: codecPipeline, + + // metrics + pushedData: pushedData, + pipelinesCounter: pipelinesCounter, } } @@ -86,6 +121,8 @@ func (manager *StreamSrcManagerCtx) Start(codec codec.RTPCodec) error { manager.pipeline.AttachAppsrc("appsrc") manager.pipeline.Play() + + manager.pipelinesCounter[codec.Name].Inc() return nil } @@ -111,8 +148,12 @@ func (manager *StreamSrcManagerCtx) Push(bytes []byte) { } manager.pipeline.Push(bytes) + manager.pushedData[manager.codec.Name].Observe(float64(len(bytes))) } func (manager *StreamSrcManagerCtx) Started() bool { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + return manager.pipeline != nil } From ef7e9b1a53814ea00be2448a4a78225214ff3d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 14 Jun 2022 22:34:51 +0000 Subject: [PATCH 696/876] move metrics to /metrics. --- internal/api/router.go | 7 ------- internal/http/manager.go | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/internal/api/router.go b/internal/api/router.go index 96a174dd..c7d171b9 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -5,8 +5,6 @@ import ( "errors" "net/http" - "github.com/prometheus/client_golang/prometheus/promhttp" - "gitlab.com/demodesk/neko/server/internal/api/members" "gitlab.com/demodesk/neko/server/internal/api/room" "gitlab.com/demodesk/neko/server/pkg/auth" @@ -64,11 +62,6 @@ func (api *ApiManagerCtx) Route(r types.Router) { _, err := w.Write([]byte("true")) return err }) - - r.Get("/metrics", func(w http.ResponseWriter, r *http.Request) error { - promhttp.Handler().ServeHTTP(w, r) - return nil - }) } func (api *ApiManagerCtx) Authenticate(w http.ResponseWriter, r *http.Request) (context.Context, error) { diff --git a/internal/http/manager.go b/internal/http/manager.go index 0ead57ef..d81f695e 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -6,6 +6,7 @@ import ( "os" "github.com/go-chi/cors" + "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -41,6 +42,11 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c return config.AllowOrigin(r.Header.Get("Origin")) })) + router.Get("/metrics", func(w http.ResponseWriter, r *http.Request) error { + promhttp.Handler().ServeHTTP(w, r) + return nil + }) + if config.Static != "" { fs := http.FileServer(http.Dir(config.Static)) router.Get("/*", func(w http.ResponseWriter, r *http.Request) error { From 5ab4848580b73ae25ab6a909db91150a4296105c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 19 Jun 2022 00:51:17 +0200 Subject: [PATCH 697/876] join pipelines_total. --- internal/capture/broadcast.go | 8 +++++++- internal/capture/screencast.go | 12 +++++++++--- internal/capture/streamsink.go | 17 ++++++++++------- internal/capture/streamsrc.go | 31 +++++++++++++++++++++---------- 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index bb6d27be..4e860f03 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -44,8 +44,14 @@ func broadcastNew(pipelineStr string) *BroacastManagerCtx { pipelinesCounter: promauto.NewCounter(prometheus.CounterOpts{ Name: "pipelines_total", Namespace: "neko", - Subsystem: "capture_broadcast", + Subsystem: "capture", Help: "Total number of created pipelines.", + ConstLabels: map[string]string{ + "submodule": "broadcast", + "video_id": "main", + "codec_name": "-", + "codec_type": "-", + }, }), } } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index d6b815a4..a8314d31 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -55,16 +55,22 @@ func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { // metrics imagesCounter: promauto.NewCounter(prometheus.CounterOpts{ - Name: "images_total", + Name: "screencast_images_total", Namespace: "neko", - Subsystem: "capture_screencast", + Subsystem: "capture", Help: "Total number of created images.", }), pipelinesCounter: promauto.NewCounter(prometheus.CounterOpts{ Name: "pipelines_total", Namespace: "neko", - Subsystem: "capture_screencast", + Subsystem: "capture", Help: "Total number of created pipelines.", + ConstLabels: map[string]string{ + "submodule": "screencast", + "video_id": "main", + "codec_name": "-", + "codec_type": "-", + }, }), } diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index 8b1faad4..8de12b9b 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -50,23 +50,26 @@ func streamSinkNew(codec codec.RTPCodec, pipelineStr func() string, video_id str // metrics currentListeners: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "listeners", + Name: "streamsink_listeners", Namespace: "neko", - Subsystem: "capture_streamsink", + Subsystem: "capture", Help: "Current number of listeners for a pipeline.", ConstLabels: map[string]string{ - "video_id": video_id, - "codec": codec.Name, + "video_id": video_id, + "codec_name": codec.Name, + "codec_type": codec.Type.String(), }, }), pipelinesCounter: promauto.NewCounter(prometheus.CounterOpts{ Name: "pipelines_total", Namespace: "neko", - Subsystem: "capture_streamsink", + Subsystem: "capture", Help: "Total number of created pipelines.", ConstLabels: map[string]string{ - "video_id": video_id, - "codec": codec.Name, + "submodule": "streamsink", + "video_id": video_id, + "codec_name": codec.Name, + "codec_type": codec.Type.String(), }, }), } diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index c6583670..fbf4303a 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -37,25 +37,36 @@ func streamSrcNew(enabled bool, codecPipeline map[string]string, video_id string pushedData := map[string]prometheus.Summary{} pipelinesCounter := map[string]prometheus.Counter{} - for codec := range codecPipeline { - pushedData[codec] = promauto.NewSummary(prometheus.SummaryOpts{ - Name: "data_bytes", + for codecName, pipeline := range codecPipeline { + codec, ok := codec.ParseStr(codecName) + if !ok { + logger.Fatal(). + Str("codec", codecName). + Str("pipeline", pipeline). + Msg("unknown codec name") + } + + pushedData[codecName] = promauto.NewSummary(prometheus.SummaryOpts{ + Name: "streamsrc_data_bytes", Namespace: "neko", - Subsystem: "capture_streamsrc", + Subsystem: "capture", Help: "Data pushed to a pipeline (in bytes).", ConstLabels: map[string]string{ - "video_id": video_id, - "codec": codec, + "video_id": video_id, + "codec_name": codec.Name, + "codec_type": codec.Type.String(), }, }) - pipelinesCounter[codec] = promauto.NewCounter(prometheus.CounterOpts{ + pipelinesCounter[codecName] = promauto.NewCounter(prometheus.CounterOpts{ Name: "pipelines_total", Namespace: "neko", - Subsystem: "capture_streamsrc", + Subsystem: "capture", Help: "Total number of created pipelines.", ConstLabels: map[string]string{ - "video_id": video_id, - "codec": codec, + "submodule": "streamsrc", + "video_id": video_id, + "codec_name": codec.Name, + "codec_type": codec.Type.String(), }, }) } From 555fd803bcc431d7abc82f28a07738796a5976b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 19 Jun 2022 01:03:16 +0200 Subject: [PATCH 698/876] add active pipelines. --- internal/capture/broadcast.go | 16 +++++++++++++++ internal/capture/screencast.go | 36 ++++++++++++++++++++++++---------- internal/capture/streamsink.go | 17 ++++++++++++++++ internal/capture/streamsrc.go | 20 ++++++++++++++++++- 4 files changed, 78 insertions(+), 11 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 4e860f03..70f955de 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -26,6 +26,7 @@ type BroacastManagerCtx struct { // metrics pipelinesCounter prometheus.Counter + pipelinesActive prometheus.Gauge } func broadcastNew(pipelineStr string) *BroacastManagerCtx { @@ -53,6 +54,18 @@ func broadcastNew(pipelineStr string) *BroacastManagerCtx { "codec_type": "-", }, }), + pipelinesActive: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "pipelines_active", + Namespace: "neko", + Subsystem: "capture", + Help: "Total number of active pipelines.", + ConstLabels: map[string]string{ + "submodule": "broadcast", + "video_id": "main", + "codec_name": "-", + "codec_type": "-", + }, + }), } } @@ -122,6 +135,7 @@ func (manager *BroacastManagerCtx) createPipeline() error { manager.pipeline.Play() manager.pipelinesCounter.Inc() + manager.pipelinesActive.Set(1) return nil } @@ -137,4 +151,6 @@ func (manager *BroacastManagerCtx) destroyPipeline() { manager.pipeline.Destroy() manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil + + manager.pipelinesActive.Set(0) } diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index a8314d31..7bb73e60 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -38,6 +38,7 @@ type ScreencastManagerCtx struct { // metrics imagesCounter prometheus.Counter pipelinesCounter prometheus.Counter + pipelinesActive prometheus.Gauge } func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { @@ -72,6 +73,18 @@ func screencastNew(enabled bool, pipelineStr string) *ScreencastManagerCtx { "codec_type": "-", }, }), + pipelinesActive: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "pipelines_active", + Namespace: "neko", + Subsystem: "capture", + Help: "Total number of active pipelines.", + ConstLabels: map[string]string{ + "submodule": "screencast", + "video_id": "main", + "codec_name": "-", + "codec_type": "-", + }, + }), } manager.wg.Add(1) @@ -185,6 +198,7 @@ func (manager *ScreencastManagerCtx) createPipeline() error { manager.pipeline.AttachAppsink("appsink") manager.pipeline.Play() manager.pipelinesCounter.Inc() + manager.pipelinesActive.Set(1) // get first image select { @@ -192,11 +206,7 @@ func (manager *ScreencastManagerCtx) createPipeline() error { if !ok { return errors.New("unable to get first image") } else { - manager.imageMu.Lock() - manager.image = image - manager.imageMu.Unlock() - - manager.imagesCounter.Inc() + manager.setImage(image) } case <-time.After(1 * time.Second): return errors.New("timeouted while waiting for first image") @@ -216,17 +226,21 @@ func (manager *ScreencastManagerCtx) createPipeline() error { return } - manager.imageMu.Lock() - manager.image = image - manager.imageMu.Unlock() - - manager.imagesCounter.Inc() + manager.setImage(image) } }() return nil } +func (manager *ScreencastManagerCtx) setImage(image types.Sample) { + manager.imageMu.Lock() + manager.image = image + manager.imageMu.Unlock() + + manager.imagesCounter.Inc() +} + func (manager *ScreencastManagerCtx) destroyPipeline() { manager.pipelineMu.Lock() defer manager.pipelineMu.Unlock() @@ -238,4 +252,6 @@ func (manager *ScreencastManagerCtx) destroyPipeline() { manager.pipeline.Destroy() manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil + + manager.pipelinesActive.Set(0) } diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index 8de12b9b..354e829b 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -34,6 +34,7 @@ type StreamSinkManagerCtx struct { // metrics currentListeners prometheus.Gauge pipelinesCounter prometheus.Counter + pipelinesActive prometheus.Gauge } func streamSinkNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) *StreamSinkManagerCtx { @@ -72,6 +73,18 @@ func streamSinkNew(codec codec.RTPCodec, pipelineStr func() string, video_id str "codec_type": codec.Type.String(), }, }), + pipelinesActive: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "pipelines_active", + Namespace: "neko", + Subsystem: "capture", + Help: "Total number of active pipelines.", + ConstLabels: map[string]string{ + "submodule": "streamsink", + "video_id": video_id, + "codec_name": codec.Name, + "codec_type": codec.Type.String(), + }, + }), } return manager @@ -275,6 +288,8 @@ func (manager *StreamSinkManagerCtx) createPipeline() error { }() manager.pipelinesCounter.Inc() + manager.pipelinesActive.Set(1) + return nil } @@ -289,4 +304,6 @@ func (manager *StreamSinkManagerCtx) destroyPipeline() { manager.pipeline.Destroy() manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil + + manager.pipelinesActive.Set(0) } diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index fbf4303a..e31f2834 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -27,6 +27,7 @@ type StreamSrcManagerCtx struct { // metrics pushedData map[string]prometheus.Summary pipelinesCounter map[string]prometheus.Counter + pipelinesActive map[string]prometheus.Gauge } func streamSrcNew(enabled bool, codecPipeline map[string]string, video_id string) *StreamSrcManagerCtx { @@ -37,6 +38,7 @@ func streamSrcNew(enabled bool, codecPipeline map[string]string, video_id string pushedData := map[string]prometheus.Summary{} pipelinesCounter := map[string]prometheus.Counter{} + pipelinesActive := map[string]prometheus.Gauge{} for codecName, pipeline := range codecPipeline { codec, ok := codec.ParseStr(codecName) if !ok { @@ -69,6 +71,18 @@ func streamSrcNew(enabled bool, codecPipeline map[string]string, video_id string "codec_type": codec.Type.String(), }, }) + pipelinesActive[codecName] = promauto.NewGauge(prometheus.GaugeOpts{ + Name: "pipelines_active", + Namespace: "neko", + Subsystem: "capture", + Help: "Total number of active pipelines.", + ConstLabels: map[string]string{ + "submodule": "streamsrc", + "video_id": video_id, + "codec_name": codec.Name, + "codec_type": codec.Type.String(), + }, + }) } return &StreamSrcManagerCtx{ @@ -133,7 +147,9 @@ func (manager *StreamSrcManagerCtx) Start(codec codec.RTPCodec) error { manager.pipeline.AttachAppsrc("appsrc") manager.pipeline.Play() - manager.pipelinesCounter[codec.Name].Inc() + manager.pipelinesCounter[manager.codec.Name].Inc() + manager.pipelinesActive[manager.codec.Name].Set(1) + return nil } @@ -148,6 +164,8 @@ func (manager *StreamSrcManagerCtx) Stop() { manager.pipeline.Destroy() manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil + + manager.pipelinesActive[manager.codec.Name].Set(0) } func (manager *StreamSrcManagerCtx) Push(bytes []byte) { From 527b1f08f8143cd3d0b73ca0c7f770901a94e721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 25 Jun 2022 20:12:42 +0200 Subject: [PATCH 699/876] add webrtc metrtics. --- internal/webrtc/manager.go | 32 +++++++++-- internal/webrtc/metrics.go | 115 +++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 5 deletions(-) create mode 100644 internal/webrtc/metrics.go diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index fbe7c3f8..3d5c32c7 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -36,8 +36,9 @@ const rtcpPLIInterval = 3 * time.Second func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { return &WebRTCManagerCtx{ - logger: log.With().Str("module", "webrtc").Logger(), - config: config, + logger: log.With().Str("module", "webrtc").Logger(), + config: config, + metrics: newMetrics(), desktop: desktop, capture: capture, @@ -47,9 +48,10 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con } type WebRTCManagerCtx struct { - logger zerolog.Logger - config *config.WebRTC - peerId int32 + logger zerolog.Logger + config *config.WebRTC + metrics *metricsCtx + peerId int32 desktop types.DesktopManager capture types.CaptureManager @@ -121,6 +123,7 @@ func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) { id := atomic.AddInt32(&manager.peerId, 1) + manager.metrics.NewConnection(session) // add session id to logger context logger := manager.logger.With().Str("session_id", session.ID()).Int32("peer_id", id).Logger() @@ -315,6 +318,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin videoTrack.RemoveStream() audioTrack.RemoveStream() } + + manager.metrics.SetState(session, state) }) cursorImage := func(entry *cursor.ImageEntry) { @@ -392,5 +397,22 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) }) + go func() { + ticker := time.NewTicker(5 * time.Second) + defer ticker.Stop() + + for range ticker.C { + if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { + break + } + + stats := connection.GetStats() + data, ok := stats["iceTransport"].(webrtc.TransportStats) + if ok { + manager.metrics.SetTransportStats(session, data) + } + } + }() + return offer, nil } diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go new file mode 100644 index 00000000..57e719e6 --- /dev/null +++ b/internal/webrtc/metrics.go @@ -0,0 +1,115 @@ +package webrtc + +import ( + "sync" + + "github.com/pion/webrtc/v3" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" + "gitlab.com/demodesk/neko/server/pkg/types" +) + +type metrics struct { + connectionState prometheus.Gauge + connectionCount prometheus.Counter + + bytesSent prometheus.Gauge + bytesReceived prometheus.Gauge +} + +type metricsCtx struct { + mu sync.Mutex + + sessions map[string]metrics +} + +func newMetrics() *metricsCtx { + return &metricsCtx{ + sessions: map[string]metrics{}, + } +} + +func (m *metricsCtx) getBySession(session types.Session) metrics { + m.mu.Lock() + defer m.mu.Unlock() + + met, ok := m.sessions[session.ID()] + if ok { + return met + } + + met = metrics{ + connectionState: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "connection_state", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Connection state of session.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + connectionCount: promauto.NewCounter(prometheus.CounterOpts{ + Name: "connection_count", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Connection count of a session.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + bytesSent: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "bytes_sent", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Sent bytes to a session.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + bytesReceived: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "bytes_received", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Received bytes from a session.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + } + + m.sessions[session.ID()] = met + return met +} + +func (m *metricsCtx) NewConnection(session types.Session) { + met := m.getBySession(session) + met.connectionCount.Add(1) +} + +func (m *metricsCtx) SetState(session types.Session, state webrtc.PeerConnectionState) { + met := m.getBySession(session) + + switch state { + case webrtc.PeerConnectionStateNew: + met.connectionState.Set(0) + case webrtc.PeerConnectionStateConnecting: + met.connectionState.Set(4) + case webrtc.PeerConnectionStateConnected: + met.connectionState.Set(5) + case webrtc.PeerConnectionStateDisconnected: + met.connectionState.Set(3) + case webrtc.PeerConnectionStateFailed: + met.connectionState.Set(2) + case webrtc.PeerConnectionStateClosed: + met.connectionState.Set(1) + default: + met.connectionState.Set(-1) + } +} + +func (m *metricsCtx) SetTransportStats(session types.Session, data webrtc.TransportStats) { + met := m.getBySession(session) + + met.bytesSent.Set(float64(data.BytesSent)) + met.bytesReceived.Set(float64(data.BytesReceived)) +} From 8e80ef2c694e5ca9f99e0df60e6e07438497e8e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 25 Jun 2022 23:53:19 +0200 Subject: [PATCH 700/876] streamsrc mutex. --- internal/capture/streamsrc.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index e31f2834..3c3aef17 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -39,6 +39,7 @@ func streamSrcNew(enabled bool, codecPipeline map[string]string, video_id string pushedData := map[string]prometheus.Summary{} pipelinesCounter := map[string]prometheus.Counter{} pipelinesActive := map[string]prometheus.Gauge{} + for codecName, pipeline := range codecPipeline { codec, ok := codec.ParseStr(codecName) if !ok { @@ -103,6 +104,9 @@ func (manager *StreamSrcManagerCtx) shutdown() { } func (manager *StreamSrcManagerCtx) Codec() codec.RTPCodec { + manager.pipelineMu.Lock() + defer manager.pipelineMu.Unlock() + return manager.codec } From fc5c0176668402695c0d5c770c581e690c4263a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 30 Jun 2022 23:50:47 +0200 Subject: [PATCH 701/876] stats ice Candidates Count. --- internal/webrtc/manager.go | 8 ++++++++ internal/webrtc/metrics.go | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 3d5c32c7..e95e13b8 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -411,6 +411,14 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin if ok { manager.metrics.SetTransportStats(session, data) } + + for _, entry := range stats { + // only remote ice candidate stats + candidate, ok := entry.(webrtc.ICECandidateStats) + if ok && candidate.Type == webrtc.StatsTypeRemoteCandidate { + manager.metrics.NewICECandidate(session, candidate.ID) + } + } } }() diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 57e719e6..14daf21b 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -13,6 +13,9 @@ type metrics struct { connectionState prometheus.Gauge connectionCount prometheus.Counter + iceCandidates map[string]struct{} + iceCandidatesCount prometheus.Counter + bytesSent prometheus.Gauge bytesReceived prometheus.Gauge } @@ -57,6 +60,18 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { "session_id": session.ID(), }, }), + + iceCandidates: map[string]struct{}{}, + iceCandidatesCount: promauto.NewCounter(prometheus.CounterOpts{ + Name: "ice_candidates_count", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Count of ICE candidates sent by a remote client.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + bytesSent: promauto.NewGauge(prometheus.GaugeOpts{ Name: "bytes_sent", Namespace: "neko", @@ -86,6 +101,17 @@ func (m *metricsCtx) NewConnection(session types.Session) { met.connectionCount.Add(1) } +func (m *metricsCtx) NewICECandidate(session types.Session, id string) { + met := m.getBySession(session) + + if _, found := met.iceCandidates[id]; found { + return + } + + met.iceCandidates[id] = struct{}{} + met.iceCandidatesCount.Add(1) +} + func (m *metricsCtx) SetState(session types.Session, state webrtc.PeerConnectionState) { met := m.getBySession(session) From 7a1c8813e62f4d54c016dcdc72646eb8cb46be36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 30 Jun 2022 23:54:06 +0200 Subject: [PATCH 702/876] metrics connection State Count. --- internal/webrtc/metrics.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 14daf21b..b682b070 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -10,8 +10,9 @@ import ( ) type metrics struct { - connectionState prometheus.Gauge - connectionCount prometheus.Counter + connectionState prometheus.Gauge + connectionStateCount prometheus.Counter + connectionCount prometheus.Counter iceCandidates map[string]struct{} iceCandidatesCount prometheus.Counter @@ -51,6 +52,15 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { "session_id": session.ID(), }, }), + connectionStateCount: promauto.NewCounter(prometheus.CounterOpts{ + Name: "connection_state_count", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Count of connection state changes for a session.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), connectionCount: promauto.NewCounter(prometheus.CounterOpts{ Name: "connection_count", Namespace: "neko", @@ -131,6 +141,8 @@ func (m *metricsCtx) SetState(session types.Session, state webrtc.PeerConnection default: met.connectionState.Set(-1) } + + met.connectionStateCount.Add(1) } func (m *metricsCtx) SetTransportStats(session types.Session, data webrtc.TransportStats) { From bb3569525551ffa8053e64e0964a2179890b967d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 1 Jul 2022 00:16:39 +0200 Subject: [PATCH 703/876] split sctp and ice bytes. --- internal/webrtc/manager.go | 7 +++++- internal/webrtc/metrics.go | 50 +++++++++++++++++++++++++++++--------- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index e95e13b8..c6dec0c0 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -409,7 +409,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin stats := connection.GetStats() data, ok := stats["iceTransport"].(webrtc.TransportStats) if ok { - manager.metrics.SetTransportStats(session, data) + manager.metrics.SetIceTransportStats(session, data) + } + + data, ok = stats["sctpTransport"].(webrtc.TransportStats) + if ok { + manager.metrics.SetSctpTransportStats(session, data) } for _, entry := range stats { diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index b682b070..bd377294 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -17,8 +17,10 @@ type metrics struct { iceCandidates map[string]struct{} iceCandidatesCount prometheus.Counter - bytesSent prometheus.Gauge - bytesReceived prometheus.Gauge + iceBytesSent prometheus.Gauge + iceBytesReceived prometheus.Gauge + sctpBytesSent prometheus.Gauge + sctpBytesReceived prometheus.Gauge } type metricsCtx struct { @@ -82,20 +84,39 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { }, }), - bytesSent: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "bytes_sent", + iceBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "ice_bytes_sent", Namespace: "neko", Subsystem: "webrtc", - Help: "Sent bytes to a session.", + Help: "Sent bytes using ICE transport to a session.", ConstLabels: map[string]string{ "session_id": session.ID(), }, }), - bytesReceived: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "bytes_received", + iceBytesReceived: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "ice_bytes_received", Namespace: "neko", Subsystem: "webrtc", - Help: "Received bytes from a session.", + Help: "Received bytes using ICE transport from a session.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + + sctpBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "sctp_bytes_sent", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Sent bytes using SCTP transport to a session.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + sctpBytesReceived: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "sctp_bytes_received", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Received bytes using SCTP transport from a session.", ConstLabels: map[string]string{ "session_id": session.ID(), }, @@ -145,9 +166,16 @@ func (m *metricsCtx) SetState(session types.Session, state webrtc.PeerConnection met.connectionStateCount.Add(1) } -func (m *metricsCtx) SetTransportStats(session types.Session, data webrtc.TransportStats) { +func (m *metricsCtx) SetIceTransportStats(session types.Session, data webrtc.TransportStats) { met := m.getBySession(session) - met.bytesSent.Set(float64(data.BytesSent)) - met.bytesReceived.Set(float64(data.BytesReceived)) + met.iceBytesSent.Set(float64(data.BytesSent)) + met.iceBytesReceived.Set(float64(data.BytesReceived)) +} + +func (m *metricsCtx) SetSctpTransportStats(session types.Session, data webrtc.TransportStats) { + met := m.getBySession(session) + + met.sctpBytesSent.Set(float64(data.BytesSent)) + met.sctpBytesReceived.Set(float64(data.BytesReceived)) } From e4261c53b189e3678a815d25842ef5477d79324e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 3 Jul 2022 23:06:56 +0200 Subject: [PATCH 704/876] iceCandidatesMu. --- internal/webrtc/metrics.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index bd377294..42efa7ae 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -15,6 +15,7 @@ type metrics struct { connectionCount prometheus.Counter iceCandidates map[string]struct{} + iceCandidatesMu *sync.Mutex iceCandidatesCount prometheus.Counter iceBytesSent prometheus.Gauge @@ -73,7 +74,8 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { }, }), - iceCandidates: map[string]struct{}{}, + iceCandidates: map[string]struct{}{}, + iceCandidatesMu: &sync.Mutex{}, iceCandidatesCount: promauto.NewCounter(prometheus.CounterOpts{ Name: "ice_candidates_count", Namespace: "neko", @@ -135,6 +137,9 @@ func (m *metricsCtx) NewConnection(session types.Session) { func (m *metricsCtx) NewICECandidate(session types.Session, id string) { met := m.getBySession(session) + met.iceCandidatesMu.Lock() + defer met.iceCandidatesMu.Unlock() + if _, found := met.iceCandidates[id]; found { return } From 3fda00bac50a735062f059292f8c0d2a2e606605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 3 Jul 2022 23:21:25 +0200 Subject: [PATCH 705/876] add video id for webrtc metrics. --- internal/webrtc/manager.go | 3 +++ internal/webrtc/metrics.go | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index c6dec0c0..e3e454a1 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -138,6 +138,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return nil, types.ErrWebRTCVideoNotFound } + manager.metrics.SetVideoID(session, videoID) + connection, err := manager.newPeerConnection([]codec.RTPCodec{ audioStream.Codec(), videoStream.Codec(), @@ -201,6 +203,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return types.ErrWebRTCVideoNotFound } + manager.metrics.SetVideoID(session, videoID) return videoTrack.SetStream(videoStream) }, setPaused: func(isPaused bool) { diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 42efa7ae..14c99def 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -18,6 +18,9 @@ type metrics struct { iceCandidatesMu *sync.Mutex iceCandidatesCount prometheus.Counter + videoIds map[string]prometheus.Gauge + videoIdsMu *sync.Mutex + iceBytesSent prometheus.Gauge iceBytesReceived prometheus.Gauge sctpBytesSent prometheus.Gauge @@ -86,6 +89,9 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { }, }), + videoIds: map[string]prometheus.Gauge{}, + videoIdsMu: &sync.Mutex{}, + iceBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ Name: "ice_bytes_sent", Namespace: "neko", @@ -171,6 +177,34 @@ func (m *metricsCtx) SetState(session types.Session, state webrtc.PeerConnection met.connectionStateCount.Add(1) } +func (m *metricsCtx) SetVideoID(session types.Session, videoId string) { + met := m.getBySession(session) + + met.videoIdsMu.Lock() + defer met.videoIdsMu.Unlock() + + if _, found := met.videoIds[videoId]; !found { + met.videoIds[videoId] = promauto.NewGauge(prometheus.GaugeOpts{ + Name: "video_id", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Current Video ID of a session.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + "video_id": videoId, + }, + }) + } + + for id, entry := range met.videoIds { + if id == videoId { + entry.Set(1) + } else { + entry.Set(0) + } + } +} + func (m *metricsCtx) SetIceTransportStats(session types.Session, data webrtc.TransportStats) { met := m.getBySession(session) From 01b5d61e2b0c536c6a8c1ddb6976d4c0688f3a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jul 2022 00:38:46 +0200 Subject: [PATCH 706/876] add receiverEstimatedMaximumBitrate. --- internal/webrtc/manager.go | 7 ++++++ internal/webrtc/metrics.go | 18 +++++++++++++++ internal/webrtc/peerstreamtrack.go | 37 ++++++++++++++++++++++++++++-- pkg/types/codec/codecs.go | 18 ++++++++++++--- 4 files changed, 75 insertions(+), 5 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index e3e454a1..7bf18d41 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -400,6 +400,13 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin }) }) + videoTrack.OnRTCP(func(p rtcp.Packet) { + switch rtcpPacket := p.(type) { + case *rtcp.ReceiverEstimatedMaximumBitrate: // TODO: Deprecated. + manager.metrics.SetReceiverEstimatedMaximumBitrate(session, rtcpPacket.Bitrate) + } + }) + go func() { ticker := time.NewTicker(5 * time.Second) defer ticker.Stop() diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 14c99def..066f011b 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -21,6 +21,8 @@ type metrics struct { videoIds map[string]prometheus.Gauge videoIdsMu *sync.Mutex + receiverEstimatedMaximumBitrate prometheus.Gauge + iceBytesSent prometheus.Gauge iceBytesReceived prometheus.Gauge sctpBytesSent prometheus.Gauge @@ -92,6 +94,16 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { videoIds: map[string]prometheus.Gauge{}, videoIdsMu: &sync.Mutex{}, + receiverEstimatedMaximumBitrate: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "receiver_estimated_maximum_bitrate", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Receiver Estimated Maximum Bitrate from SCTP.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + iceBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ Name: "ice_bytes_sent", Namespace: "neko", @@ -205,6 +217,12 @@ func (m *metricsCtx) SetVideoID(session types.Session, videoId string) { } } +func (m *metricsCtx) SetReceiverEstimatedMaximumBitrate(session types.Session, bitrate float32) { + met := m.getBySession(session) + + met.receiverEstimatedMaximumBitrate.Set(float64(bitrate)) +} + func (m *metricsCtx) SetIceTransportStats(session types.Session, data webrtc.TransportStats) { met := m.getBySession(session) diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go index b77cab2a..2d2fa59b 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -5,6 +5,7 @@ import ( "io" "sync" + "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" @@ -51,6 +52,9 @@ type PeerStreamTrack struct { stream types.StreamSinkManager streamMu sync.Mutex + + onRtcp func(rtcp.Packet) + onRtcpMu sync.RWMutex } func (peer *PeerStreamTrack) SetStream(stream types.StreamSinkManager) error { @@ -90,8 +94,30 @@ func (peer *PeerStreamTrack) AddToConnection(connection *webrtc.PeerConnection) go func() { rtcpBuf := make([]byte, 1500) for { - if _, _, err := sender.Read(rtcpBuf); err != nil { - return + n, _, err := sender.Read(rtcpBuf) + if err != nil { + if err == io.EOF || err == io.ErrClosedPipe { + return + } + + peer.logger.Err(err).Msg("RTCP read error") + continue + } + + packets, err := rtcp.Unmarshal(rtcpBuf[:n]) + if err != nil { + peer.logger.Err(err).Msg("RTCP unmarshal error") + continue + } + + peer.onRtcpMu.RLock() + handler := peer.onRtcp + peer.onRtcpMu.RUnlock() + + for _, packet := range packets { + if handler != nil { + go handler(packet) + } } } }() @@ -102,3 +128,10 @@ func (peer *PeerStreamTrack) AddToConnection(connection *webrtc.PeerConnection) func (peer *PeerStreamTrack) SetPaused(paused bool) { peer.paused = paused } + +func (peer *PeerStreamTrack) OnRTCP(f func(rtcp.Packet)) { + peer.onRtcpMu.Lock() + defer peer.onRtcpMu.Unlock() + + peer.onRtcp = f +} diff --git a/pkg/types/codec/codecs.go b/pkg/types/codec/codecs.go index cc8b9bd7..d53a5509 100644 --- a/pkg/types/codec/codecs.go +++ b/pkg/types/codec/codecs.go @@ -6,6 +6,18 @@ import ( "github.com/pion/webrtc/v3" ) +var RTCPFeedback = []webrtc.RTCPFeedback{ + {Type: webrtc.TypeRTCPFBTransportCC, Parameter: ""}, + {Type: webrtc.TypeRTCPFBGoogREMB, Parameter: ""}, + + // https://www.iana.org/assignments/sdp-parameters/sdp-parameters.xhtml#sdp-parameters-19 + {Type: webrtc.TypeRTCPFBCCM, Parameter: "fir"}, + + // https://www.iana.org/assignments/sdp-parameters/sdp-parameters.xhtml#sdp-parameters-15 + {Type: webrtc.TypeRTCPFBNACK, Parameter: "pli"}, + {Type: webrtc.TypeRTCPFBNACK, Parameter: ""}, +} + func ParseRTC(codec webrtc.RTPCodecParameters) (RTPCodec, bool) { codecName := strings.Split(codec.RTPCodecCapability.MimeType, "/")[1] return ParseStr(codecName) @@ -61,7 +73,7 @@ func VP8() RTPCodec { ClockRate: 90000, Channels: 0, SDPFmtpLine: "", - RTCPFeedback: []webrtc.RTCPFeedback{}, + RTCPFeedback: RTCPFeedback, }, // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html // gstreamer1.0-plugins-good @@ -80,7 +92,7 @@ func VP9() RTPCodec { ClockRate: 90000, Channels: 0, SDPFmtpLine: "profile-id=0", - RTCPFeedback: []webrtc.RTCPFeedback{}, + RTCPFeedback: RTCPFeedback, }, // https://gstreamer.freedesktop.org/documentation/vpx/vp9enc.html // gstreamer1.0-plugins-good @@ -99,7 +111,7 @@ func H264() RTPCodec { ClockRate: 90000, Channels: 0, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", - RTCPFeedback: []webrtc.RTCPFeedback{}, + RTCPFeedback: RTCPFeedback, }, // https://gstreamer.freedesktop.org/documentation/x264/index.html // gstreamer1.0-plugins-ugly From fb707f05a62052f1db6912cf4096d053b64385ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jul 2022 00:48:29 +0200 Subject: [PATCH 707/876] join bytes by a label. --- internal/webrtc/metrics.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 066f011b..c386e0d3 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -105,40 +105,44 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { }), iceBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "ice_bytes_sent", + Name: "bytes_sent", Namespace: "neko", Subsystem: "webrtc", - Help: "Sent bytes using ICE transport to a session.", + Help: "Sent bytes to a session.", ConstLabels: map[string]string{ "session_id": session.ID(), + "transport": "ice", }, }), iceBytesReceived: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "ice_bytes_received", + Name: "bytes_received", Namespace: "neko", Subsystem: "webrtc", - Help: "Received bytes using ICE transport from a session.", + Help: "Received bytes from a session.", ConstLabels: map[string]string{ "session_id": session.ID(), + "transport": "ice", }, }), sctpBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "sctp_bytes_sent", + Name: "bytes_sent", Namespace: "neko", Subsystem: "webrtc", - Help: "Sent bytes using SCTP transport to a session.", + Help: "Sent bytes to a session.", ConstLabels: map[string]string{ "session_id": session.ID(), + "transport": "sctp", }, }), sctpBytesReceived: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "sctp_bytes_received", + Name: "bytes_received", Namespace: "neko", Subsystem: "webrtc", - Help: "Received bytes using SCTP transport from a session.", + Help: "Received bytes from a session.", ConstLabels: map[string]string{ "session_id": session.ID(), + "transport": "sctp", }, }), } From d5c934f2af7ffb1b5f228aef7b6d2c3b3e0f55e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jul 2022 01:01:03 +0200 Subject: [PATCH 708/876] add ReceiverReport. --- internal/webrtc/manager.go | 7 +++++++ internal/webrtc/metrics.go | 41 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 7bf18d41..cc8523a9 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -404,6 +404,13 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin switch rtcpPacket := p.(type) { case *rtcp.ReceiverEstimatedMaximumBitrate: // TODO: Deprecated. manager.metrics.SetReceiverEstimatedMaximumBitrate(session, rtcpPacket.Bitrate) + + case *rtcp.ReceiverReport: + l := len(rtcpPacket.Reports) + if l > 0 { + // use only last report + manager.metrics.SetReceiverReport(session, rtcpPacket.Reports[l-1]) + } } }) diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index c386e0d3..8c1f4143 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -3,6 +3,7 @@ package webrtc import ( "sync" + "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" @@ -23,6 +24,10 @@ type metrics struct { receiverEstimatedMaximumBitrate prometheus.Gauge + receiverReportDelay prometheus.Gauge + receiverReportJitter prometheus.Gauge + receiverReportTotalLost prometheus.Gauge + iceBytesSent prometheus.Gauge iceBytesReceived prometheus.Gauge sctpBytesSent prometheus.Gauge @@ -104,6 +109,34 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { }, }), + receiverReportDelay: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "receiver_report_delay", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Receiver Report Delay from SCTP, expressed in units of 1/65536 seconds.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + receiverReportJitter: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "receiver_report_jitter", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Receiver Report Jitter from SCTP.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + receiverReportTotalLost: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "receiver_report_total_lost", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Receiver Report Total Lost from SCTP.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), + iceBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ Name: "bytes_sent", Namespace: "neko", @@ -227,6 +260,14 @@ func (m *metricsCtx) SetReceiverEstimatedMaximumBitrate(session types.Session, b met.receiverEstimatedMaximumBitrate.Set(float64(bitrate)) } +func (m *metricsCtx) SetReceiverReport(session types.Session, report rtcp.ReceptionReport) { + met := m.getBySession(session) + + met.receiverReportDelay.Set(float64(report.Delay)) + met.receiverReportJitter.Set(float64(report.Jitter)) + met.receiverReportTotalLost.Set(float64(report.TotalLost)) +} + func (m *metricsCtx) SetIceTransportStats(session types.Session, data webrtc.TransportStats) { met := m.getBySession(session) From 8ada0217d0f95c66681670303cb10924f6c9df84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jul 2022 17:47:04 +0200 Subject: [PATCH 709/876] reset counters when closed. --- internal/webrtc/metrics.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 8c1f4143..713b45e7 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -184,6 +184,19 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { return met } +func (m *metricsCtx) reset(met metrics) { + met.videoIdsMu.Lock() + for _, entry := range met.videoIds { + entry.Set(0) + } + met.videoIdsMu.Unlock() + + met.receiverEstimatedMaximumBitrate.Set(0) + + met.receiverReportDelay.Set(0) + met.receiverReportJitter.Set(0) +} + func (m *metricsCtx) NewConnection(session types.Session) { met := m.getBySession(session) met.connectionCount.Add(1) @@ -219,6 +232,7 @@ func (m *metricsCtx) SetState(session types.Session, state webrtc.PeerConnection met.connectionState.Set(2) case webrtc.PeerConnectionStateClosed: met.connectionState.Set(1) + m.reset(met) default: met.connectionState.Set(-1) } From e37f5c13ca8971eff85b60d71e980c5e2b689fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jul 2022 18:03:35 +0200 Subject: [PATCH 710/876] fix bug. --- internal/capture/streamsrc.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index 3c3aef17..59e2632b 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -94,6 +94,7 @@ func streamSrcNew(enabled bool, codecPipeline map[string]string, video_id string // metrics pushedData: pushedData, pipelinesCounter: pipelinesCounter, + pipelinesActive: pipelinesActive, } } @@ -166,9 +167,13 @@ func (manager *StreamSrcManagerCtx) Stop() { } manager.pipeline.Destroy() - manager.logger.Info().Msgf("destroying pipeline") manager.pipeline = nil + manager.logger.Info(). + Str("codec", manager.codec.Name). + Str("src", manager.pipelineStr). + Msgf("destroying pipeline") + manager.pipelinesActive[manager.codec.Name].Set(0) } From 8f83089c8efe5e04ade5c61fb2635a26d07028ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jul 2022 18:09:47 +0200 Subject: [PATCH 711/876] move to /health and exclude metrics from logging. --- Dockerfile | 2 +- internal/api/router.go | 5 ----- internal/http/logger.go | 4 ++-- internal/http/manager.go | 5 +++++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9a2c4cc8..0d509d1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -128,7 +128,7 @@ COPY --from=build /src/bin/neko /usr/bin/neko # # add healthcheck HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ - CMD wget -O - http://localhost:${NEKO_SERVER_BIND#*:}/api/health || exit 1 + CMD wget -O - http://localhost:${NEKO_SERVER_BIND#*:}/health || exit 1 # # run neko diff --git a/internal/api/router.go b/internal/api/router.go index c7d171b9..b05115fd 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -57,11 +57,6 @@ func (api *ApiManagerCtx) Route(r types.Router) { r.Route(path, router) } }) - - r.Get("/health", func(w http.ResponseWriter, r *http.Request) error { - _, err := w.Write([]byte("true")) - return err - }) } func (api *ApiManagerCtx) Authenticate(w http.ResponseWriter, r *http.Request) (context.Context, error) { diff --git a/internal/http/logger.go b/internal/http/logger.go index 3714568e..783caede 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -17,8 +17,8 @@ type logFormatter struct { } func (l *logFormatter) NewLogEntry(r *http.Request) middleware.LogEntry { - // exclude healthcheck from logs - if r.RequestURI == "/api/health" { + // exclude health & metrics from logs + if r.RequestURI == "/health" || r.RequestURI == "/metrics" { return &nulllog{} } diff --git a/internal/http/manager.go b/internal/http/manager.go index d81f695e..5175f09e 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -42,6 +42,11 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c return config.AllowOrigin(r.Header.Get("Origin")) })) + router.Get("/health", func(w http.ResponseWriter, r *http.Request) error { + _, err := w.Write([]byte("true")) + return err + }) + router.Get("/metrics", func(w http.ResponseWriter, r *http.Request) error { promhttp.Handler().ServeHTTP(w, r) return nil From bf47e5a8d0f7c620d8d325cc96ff68ed3999671e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jul 2022 18:23:35 +0200 Subject: [PATCH 712/876] cleanup. --- internal/http/metrics.go | 57 -------------------------------------- internal/http/router.go | 1 - internal/webrtc/metrics.go | 4 +-- 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 internal/http/metrics.go diff --git a/internal/http/metrics.go b/internal/http/metrics.go deleted file mode 100644 index 68623b1d..00000000 --- a/internal/http/metrics.go +++ /dev/null @@ -1,57 +0,0 @@ -package http - -import ( - "net/http" - "time" - - "github.com/go-chi/chi/middleware" - "github.com/prometheus/client_golang/prometheus" -) - -// Middleware is a handler that exposes prometheus metrics for the number of requests, -// the latency and the response size, partitioned by status code, method and HTTP path. -type metrics struct { - reqs *prometheus.CounterVec - latency *prometheus.HistogramVec -} - -// NewMiddleware returns a new prometheus Middleware handler. -func middlewareMetrics(next http.Handler) http.Handler { - var m metrics - - m.reqs = prometheus.NewCounterVec( - prometheus.CounterOpts{ - Name: "requests_total", - Namespace: "neko", - Subsystem: "http", - Help: "How many HTTP requests processed, partitioned by status code, method and HTTP path.", - }, - []string{"code", "method", "path"}, - ) - prometheus.MustRegister(m.reqs) - - m.latency = prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Name: "request_duration_milliseconds", - Namespace: "neko", - Subsystem: "http", - Help: "How long it took to process the request, partitioned by status code, method and HTTP path.", - Buckets: []float64{300, 1200, 5000}, - }, - []string{"code", "method", "path"}, - ) - - prometheus.MustRegister(m.latency) - return m.handler(next) -} - -func (c metrics) handler(next http.Handler) http.Handler { - fn := func(w http.ResponseWriter, r *http.Request) { - start := time.Now() - ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor) - next.ServeHTTP(ww, r) - c.reqs.WithLabelValues(http.StatusText(ww.Status()), r.Method, r.URL.Path).Inc() - c.latency.WithLabelValues(http.StatusText(ww.Status()), r.Method, r.URL.Path).Observe(float64(time.Since(start).Nanoseconds()) / 1000000) - } - - return http.HandlerFunc(fn) -} diff --git a/internal/http/router.go b/internal/http/router.go index 30db7e4e..636cc4ca 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -20,7 +20,6 @@ func newRouter(logger zerolog.Logger) *router { r := chi.NewRouter() r.Use(middleware.RequestID) // Create a request ID for each request r.Use(middleware.RequestLogger(&logFormatter{logger})) - r.Use(middlewareMetrics) r.Use(middleware.Recoverer) // Recover from panics without crashing server return &router{r} } diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 713b45e7..69498ed1 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -248,10 +248,10 @@ func (m *metricsCtx) SetVideoID(session types.Session, videoId string) { if _, found := met.videoIds[videoId]; !found { met.videoIds[videoId] = promauto.NewGauge(prometheus.GaugeOpts{ - Name: "video_id", + Name: "video_listeners", Namespace: "neko", Subsystem: "webrtc", - Help: "Current Video ID of a session.", + Help: "Listeners for Video pipelines by a session.", ConstLabels: map[string]string{ "session_id": session.ID(), "video_id": videoId, From 2bf83f6217a2b6237313108b82ad373cadeaedfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jul 2022 18:26:29 +0200 Subject: [PATCH 713/876] add metrics to config. --- internal/config/server.go | 19 +++++++++++++------ internal/http/manager.go | 10 ++++++---- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/internal/config/server.go b/internal/config/server.go index 62200dd7..1fe656a7 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -8,12 +8,13 @@ import ( ) type Server struct { - Cert string - Key string - Bind string - Static string - PProf bool - CORS []string + Cert string + Key string + Bind string + Static string + PProf bool + Metrics bool + CORS []string } func (Server) Init(cmd *cobra.Command) error { @@ -42,6 +43,11 @@ func (Server) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("server.metrics", true, "enable prometheus metrics available at /metrics") + if err := viper.BindPFlag("server.metrics", cmd.PersistentFlags().Lookup("server.metrics")); err != nil { + return err + } + cmd.PersistentFlags().StringSlice("server.cors", []string{"*"}, "list of allowed origins for CORS") if err := viper.BindPFlag("server.cors", cmd.PersistentFlags().Lookup("server.cors")); err != nil { return err @@ -56,6 +62,7 @@ func (s *Server) Set() { s.Bind = viper.GetString("server.bind") s.Static = viper.GetString("server.static") s.PProf = viper.GetBool("server.pprof") + s.Metrics = viper.GetBool("server.metrics") s.CORS = viper.GetStringSlice("server.cors") in, _ := utils.ArrayIn("*", s.CORS) diff --git a/internal/http/manager.go b/internal/http/manager.go index 5175f09e..63c767d2 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -47,10 +47,12 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c return err }) - router.Get("/metrics", func(w http.ResponseWriter, r *http.Request) error { - promhttp.Handler().ServeHTTP(w, r) - return nil - }) + if config.Metrics { + router.Get("/metrics", func(w http.ResponseWriter, r *http.Request) error { + promhttp.Handler().ServeHTTP(w, r) + return nil + }) + } if config.Static != "" { fs := http.FileServer(http.Dir(config.Static)) From 1064cc4eb51e0a4631d160082e39170cde263209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jul 2022 18:28:38 +0200 Subject: [PATCH 714/876] go mod upgrade. --- go.mod | 66 ++++++++++++------------ go.sum | 160 ++++++++++++++++++++++++++++++++------------------------- 2 files changed, 124 insertions(+), 102 deletions(-) diff --git a/go.mod b/go.mod index 2a8bc9b7..703050b2 100644 --- a/go.mod +++ b/go.mod @@ -3,65 +3,67 @@ module gitlab.com/demodesk/neko/server go 1.18 require ( - github.com/PaesslerAG/gval v1.1.2 + github.com/PaesslerAG/gval v1.2.0 github.com/go-chi/chi v1.5.4 - github.com/go-chi/cors v1.2.0 - github.com/gorilla/websocket v1.4.2 - github.com/kataras/go-events v0.0.2 - github.com/pion/ice/v2 v2.2.2 - github.com/pion/interceptor v0.1.10 + github.com/go-chi/cors v1.2.1 + github.com/gorilla/websocket v1.5.0 + github.com/kataras/go-events v0.0.3 + github.com/pion/ice/v2 v2.2.6 + github.com/pion/interceptor v0.1.11 github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.9 - github.com/pion/webrtc/v3 v3.1.27 + github.com/pion/webrtc/v3 v3.1.42 github.com/prometheus/client_golang v1.12.2 - github.com/rs/zerolog v1.26.1 - github.com/spf13/cobra v1.4.0 - github.com/spf13/viper v1.10.1 - github.com/stretchr/testify v1.7.1 + github.com/rs/zerolog v1.27.0 + github.com/spf13/cobra v1.5.0 + github.com/spf13/viper v1.12.0 + github.com/stretchr/testify v1.8.0 ) require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/kr/pretty v0.2.0 // indirect - github.com/magiconair/properties v1.8.5 // indirect + github.com/magiconair/properties v1.8.6 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect - github.com/pelletier/go-toml v1.9.4 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.2 // indirect github.com/pion/datachannel v1.5.2 // indirect - github.com/pion/dtls/v2 v2.1.3 // indirect + github.com/pion/dtls/v2 v2.1.5 // indirect github.com/pion/mdns v0.0.5 // indirect github.com/pion/randutil v0.1.0 // indirect - github.com/pion/rtp v1.7.9 // indirect + github.com/pion/rtp v1.7.13 // indirect github.com/pion/sctp v1.8.2 // indirect - github.com/pion/sdp/v3 v3.0.4 // indirect - github.com/pion/srtp/v2 v2.0.5 // indirect + github.com/pion/sdp/v3 v3.0.5 // indirect + github.com/pion/srtp/v2 v2.0.9 // indirect github.com/pion/stun v0.3.5 // indirect - github.com/pion/transport v0.13.0 // indirect + github.com/pion/transport v0.13.1 // indirect github.com/pion/turn/v2 v2.0.8 // indirect github.com/pion/udp v0.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.32.1 // indirect + github.com/prometheus/common v0.35.0 // indirect github.com/prometheus/procfs v0.7.3 // indirect - github.com/spf13/afero v1.8.0 // indirect - github.com/spf13/cast v1.4.1 // indirect + github.com/shopspring/decimal v1.3.1 // indirect + github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.2.0 // indirect - golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect - golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + github.com/subosito/gotenv v1.4.0 // indirect + golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect + golang.org/x/net v0.0.0-20220630215102-69896b714898 // indirect + golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect golang.org/x/text v0.3.7 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - google.golang.org/protobuf v1.27.1 // indirect - gopkg.in/ini.v1 v1.66.2 // indirect + google.golang.org/protobuf v1.28.0 // indirect + gopkg.in/ini.v1 v1.66.6 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index de309a4d..44f44a47 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/PaesslerAG/gval v1.1.2 h1:EROKxV4/fAKWb0Qoj7NOxmHZA7gcpjOV9XgiRZMRCUU= -github.com/PaesslerAG/gval v1.1.2/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w= +github.com/PaesslerAG/gval v1.2.0 h1:DA7PsxmtzlUU4bYxV35MKp9KDDVWcrJJRhlaCohMhsM= +github.com/PaesslerAG/gval v1.2.0/go.mod h1:XRFLwvmkTEdYziLdaCeCa5ImcGVrfQbeNUbVR+C6xac= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -62,8 +62,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -73,23 +73,26 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= -github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE= -github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= +github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4= +github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -134,7 +137,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -156,8 +159,8 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -176,25 +179,28 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kataras/go-events v0.0.2 h1:fhyUPXvUbrjIPmH4vRdrAAGoNzdcwJPQmjhg47m1nMU= -github.com/kataras/go-events v0.0.2/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= +github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4= +github.com/kataras/go-events v0.0.3/go.mod h1:bFBgtzwwzrag7kQmGuU1ZaVxhK2qseYPQomXoVEMsj4= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -211,48 +217,49 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= +github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= -github.com/pion/dtls/v2 v2.1.3 h1:3UF7udADqous+M2R5Uo2q/YaP4EzUoWKdfX2oscCUio= github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus= -github.com/pion/ice/v2 v2.2.2 h1:UfmAslxZ0u0itVjA4x7aw7WeQIv22FdF8VjW9cM+74g= -github.com/pion/ice/v2 v2.2.2/go.mod h1:vLI7dFqxw8zMSb9J+ca74XU7JjLhddgfQB9+BbTydCo= -github.com/pion/interceptor v0.1.10 h1:DJ2GjMGm4XGIQgMJxuEpdaExdY/6RdngT7Uh4oVmquU= -github.com/pion/interceptor v0.1.10/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= +github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c= +github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY= +github.com/pion/ice/v2 v2.2.6 h1:R/vaLlI1J2gCx141L5PEwtuGAGcyS6e7E0hDeJFq5Ig= +github.com/pion/ice/v2 v2.2.6/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE= +github.com/pion/interceptor v0.1.11 h1:00U6OlqxA3FFB50HSg25J/8cWi7P6FbSzw4eFn24Bvs= +github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U= github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo= -github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.7.9 h1:17W5Mt2IM3MVfOh7yRfzXbbKXYzBZxV8eG4KKAy+0bg= -github.com/pion/rtp v1.7.9/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= +github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA= github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= -github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8= -github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= -github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ= -github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A= +github.com/pion/sdp/v3 v3.0.5 h1:ouvI7IgGl+V4CrqskVtr3AaTrPvPisEOxwgpdktctkU= +github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= +github.com/pion/srtp/v2 v2.0.9 h1:JJq3jClmDFBPX/F5roEb0U19jSU7eUhyDqR/NZ34EKQ= +github.com/pion/srtp/v2 v2.0.9/go.mod h1:5TtM9yw6lsH0ppNCehB/EjEUli7VkUgKSPJqWVqbhQ4= github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= -github.com/pion/transport v0.13.0 h1:KWTA5ZrQogizzYwPEciGtHPLwpAjE91FgXnyu+Hv2uY= github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g= +github.com/pion/transport v0.13.1 h1:/UH5yLeQtwm2VZIPjxwnNFxjS4DFhyLfS4GlfuKUzfA= +github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg= github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw= github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/webrtc/v3 v3.1.27 h1:yQ6TuHKJR/vro3nLZMfPv+WGf7T1/4ItaQeuzIZLXs4= -github.com/pion/webrtc/v3 v3.1.27/go.mod h1:hdduI+Rx0cpGvva18j0gKy/Iak611WPyhUIXs5W/FuI= +github.com/pion/webrtc/v3 v3.1.42 h1:wJEQFIXVanptnQcHOLTuIo4AtGB2+mG2x4OhIhnITOA= +github.com/pion/webrtc/v3 v3.1.42/go.mod h1:ffD9DulDrPxyWvDPUIPAOSAWx9GUlOExiJPf7cCcMLA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -263,6 +270,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -273,8 +281,9 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.35.0 h1:Eyr+Pw2VymWejHqCugNaQXkAi6KayVNxaHeu6khmFBE= +github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -282,43 +291,48 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= -github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= +github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs= +github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= +github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60= -github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= -github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= +github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= +github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= +github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs= +github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -333,9 +347,11 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE= golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -369,7 +385,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -409,12 +424,15 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220630215102-69896b714898 h1:K7wO6V1IrczY9QOQ2WkVpw4JQSwCd52UsxVEirZUfiw= +golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -425,6 +443,7 @@ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -435,7 +454,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -485,10 +503,14 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -551,11 +573,9 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -647,8 +667,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -656,8 +676,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= +gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -667,8 +687,8 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From e181abf57765f7804ff84f09b32a2e16b8ef6e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 4 Jul 2022 19:14:52 +0200 Subject: [PATCH 715/876] set version from git tag. --- Dockerfile | 9 +++++---- build | 10 ++++++---- neko.go | 35 ++++++++++++++++------------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0d509d1d..d64f563f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,9 @@ RUN set -eux; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* -ARG GIT_COMMIT=dev -ARG GIT_BRANCH=dev +ARG GIT_COMMIT +ARG GIT_BRANCH +ARG GIT_TAG # # build server @@ -49,8 +50,8 @@ RUN set -eux; \ # needed for profile upload preStop hook zip curl \ # - # file chooser handler, clipboard - xdotool xclip \ + # file chooser handler, clipboard, drop + xdotool xclip libgtk-3-0 \ # # gst gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ diff --git a/build b/build index 16fb5d7f..163cb38f 100755 --- a/build +++ b/build @@ -13,10 +13,11 @@ fi # # set git build variables if git exists -if git version > /dev/null && [ -z $GIT_COMMIT ] && [ -z $GIT_COMMIT ]; +if git version > /dev/null && [ -z $GIT_COMMIT ] && [ -z $GIT_BRANCH ] && [ -z $GIT_TAG ]; then GIT_COMMIT=`git rev-parse --short HEAD` GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` + GIT_TAG=`git tag --points-at $GIT_COMMIT | head -n 1` fi # @@ -29,9 +30,10 @@ go build \ -o bin/neko \ -ldflags " -s -w - -X 'demodesk/neko.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`' - -X 'demodesk/neko.gitCommit=${GIT_COMMIT}' - -X 'demodesk/neko.gitBranch=${GIT_BRANCH}' + -X 'gitlab.com/demodesk/neko/server.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`' + -X 'gitlab.com/demodesk/neko/server.gitCommit=${GIT_COMMIT}' + -X 'gitlab.com/demodesk/neko/server.gitBranch=${GIT_BRANCH}' + -X 'gitlab.com/demodesk/neko/server.gitTag=${GIT_TAG}' " \ cmd/neko/main.go; diff --git a/neko.go b/neko.go index 1770ccef..d25ee6a7 100644 --- a/neko.go +++ b/neko.go @@ -3,6 +3,7 @@ package neko import ( "fmt" "runtime" + "strings" ) const Header = `&34 @@ -11,7 +12,7 @@ const Header = `&34 / |/ / _ \/ //_/ __ \ ) ( ') / /| / __/ ,< / /_/ / ( / ) /_/ |_/\___/_/|_|\____/ \(__)| -&1&37 nurdism/m1k1o &33%s v%s&0 +&1&37 nurdism/m1k1o &33%s %s&0 ` var ( @@ -21,21 +22,14 @@ var ( gitCommit = "dev" // gitBranch = "dev" - - // Major version when you make incompatible API changes. - major = "dev" - // Minor version when you add functionality in a backwards-compatible manner. - minor = "dev" - // Patch version when you make backwards-compatible bug fixes. - patch = "dev" + // + gitTag = "dev" ) var Version = &version{ - Major: major, - Minor: minor, - Patch: patch, GitCommit: gitCommit, GitBranch: gitBranch, + GitTag: gitTag, BuildDate: buildDate, GoVersion: runtime.Version(), Compiler: runtime.Compiler, @@ -43,11 +37,9 @@ var Version = &version{ } type version struct { - Major string - Minor string - Patch string GitCommit string GitBranch string + GitTag string BuildDate string GoVersion string Compiler string @@ -55,18 +47,23 @@ type version struct { } func (i *version) String() string { - return fmt.Sprintf("%s.%s.%s %s", i.Major, i.Minor, i.Patch, i.GitCommit) + version := i.GitTag + if version == "" || version == "dev" { + version = i.GitBranch + } + + return fmt.Sprintf("%s@%s", version, i.GitCommit) } func (i *version) Details() string { - return fmt.Sprintf( - "%s\n%s\n%s\n%s\n%s\n%s\n%s\n", - fmt.Sprintf("Version %s.%s.%s", i.Major, i.Minor, i.Patch), + return "\n" + strings.Join([]string{ + fmt.Sprintf("Version %s", i.String()), fmt.Sprintf("GitCommit %s", i.GitCommit), fmt.Sprintf("GitBranch %s", i.GitBranch), + fmt.Sprintf("GitTag %s", i.GitTag), fmt.Sprintf("BuildDate %s", i.BuildDate), fmt.Sprintf("GoVersion %s", i.GoVersion), fmt.Sprintf("Compiler %s", i.Compiler), fmt.Sprintf("Platform %s", i.Platform), - ) + }, "\n") + "\n" } From 43fa56f5af5a1bc0a7fd1b8a8b911785f8e4e774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jul 2022 00:45:41 +0200 Subject: [PATCH 716/876] update gitignore. --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index d13f1364..1e25df6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ bin/ .idea .env.development + +runtime/fonts/* +!runtime/fonts/.gitkeep + +runtime/icon-theme/* +!runtime/icon-theme/.gitkeep From a1f7b23f9db092e8b2476a3210069af14450846b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jul 2022 00:55:37 +0200 Subject: [PATCH 717/876] add openapi. --- openapi.yaml | 1104 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1104 insertions(+) create mode 100644 openapi.yaml diff --git a/openapi.yaml b/openapi.yaml new file mode 100644 index 00000000..00f79fd6 --- /dev/null +++ b/openapi.yaml @@ -0,0 +1,1104 @@ +openapi: 3.0.0 + +info: + title: n.eko REST API + description: Next Gen Renderer. + license: + name: Apache 2.0 + url: 'http://www.apache.org/licenses/LICENSE-2.0.html' + version: "1.0.0" + +servers: + - description: Local server + url: http://localhost:3000 + +tags: + - name: session + description: Session management. + - name: room + description: Room releated operations. + - name: members + description: Members management. + +paths: + /health: + get: + summary: healthcheck + operationId: healthcheck + security: [] + responses: + '200': + description: OK + /metrics: + get: + summary: metrics + operationId: metrics + security: [] + responses: + '200': + description: OK + + # + # session + # + + /api/login: + post: + tags: + - session + summary: login + operationId: login + security: [] + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/SessionData' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/SessionLogin' + required: true + /api/logout: + post: + tags: + - session + summary: logout + operationId: logout + responses: + '200': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + /api/whoami: + get: + tags: + - session + summary: whoami + operationId: whoami + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/SessionData' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + + # + # room + # + + /api/room/settings: + get: + tags: + - room + summary: get settings + operationId: settingsGet + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/Settings' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + post: + tags: + - room + summary: set settings + operationId: settingsSet + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Settings' + required: true + /api/room/broadcast: + get: + tags: + - room + summary: get broadcast status + operationId: broadcastStatus + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/BroadcastStatus' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + /api/room/broadcast/start: + post: + tags: + - room + summary: start broadcast + operationId: boradcastStart + responses: + '204': + description: OK + '400': + description: Missing broadcast URL + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '422': + description: Server is already broadcasting + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + '500': + description: Unable to start broadcast + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/BroadcastStatus' + required: true + /api/room/broadcast/stop: + post: + tags: + - room + summary: stop broadcast + operationId: boradcastStop + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '422': + description: Server is not broadcasting + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + + /api/room/clipboard: + get: + tags: + - room + summary: get clipboard rich-text or plain-text content + operationId: clipboardGetText + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/ClipboardText' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '500': + description: Unable to get clipboard content + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + post: + tags: + - room + summary: set clipboard rich-text or plain-text content + operationId: clipboardSetText + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '500': + description: Unable to set clipboard content + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/ClipboardText' + required: true + /api/room/clipboard/image.png: + get: + tags: + - room + summary: get clipboard image content + operationId: clipboardGetImage + responses: + '200': + description: OK + content: + image/png: + schema: + type: string + format: binary + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '500': + description: Unable to get clipboard content + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + + /api/room/keyboard/map: + get: + tags: + - room + summary: get keyboard map + operationId: keyboardMapGet + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/KeyboardMap' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '500': + description: Unable to get keyboard map + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + post: + tags: + - room + summary: set keyboard map + operationId: keyboardMapSet + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '500': + description: Unable to change keyboard map + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/KeyboardMap' + required: true + /api/room/keyboard/modifiers: + get: + tags: + - room + summary: get keyboard modifiers + operationId: keyboardModifiersGet + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/KeyboardModifiers' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + post: + tags: + - room + summary: set keyboard modifiers + operationId: keyboardModifiersSet + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/KeyboardModifiers' + required: true + + /api/room/control: + get: + tags: + - room + summary: get control status + operationId: controlStatus + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/ControlStatus' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + /api/room/control/request: + post: + tags: + - room + summary: request control + operationId: controlRequest + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '422': + description: There is already a host + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + /api/room/control/release: + post: + tags: + - room + summary: release control + operationId: controlRelease + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '422': + description: There is already a host + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + /api/room/control/take: + post: + tags: + - room + summary: take control + operationId: controlTake + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + /api/room/control/give/{sessionId}: + post: + tags: + - room + summary: give control + operationId: controlGive + parameters: + - in: path + name: sessionId + description: session ID + required: true + schema: + type: string + responses: + '204': + description: OK + '400': + description: Target session is not allowed to host + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '404': + $ref: '#/components/responses/NotFound' + /api/room/control/reset: + post: + tags: + - room + summary: reset control + operationId: controlReset + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + + /api/room/screen: + get: + tags: + - room + summary: get current screen configuration + operationId: screenConfiguration + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/ScreenConfiguration' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '500': + description: Unable to get screen configuration + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + post: + tags: + - room + summary: change screen configuration + operationId: screenConfigurationChange + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/ScreenConfiguration' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '422': + description: Invalid screen configuration + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/ScreenConfiguration' + required: true + /api/room/screen/configurations: + get: + tags: + - room + summary: get list of all available screen configurations + operationId: screenConfigurationsList + responses: + '200': + description: OK + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/ScreenConfiguration' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + /api/room/screen/cast.jpg: + get: + tags: + - room + summary: get screencast image + operationId: screenCastImage + responses: + '200': + description: OK + content: + image/jpeg: + schema: + type: string + format: binary + '400': + description: Screencast is not enabled + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '500': + description: Unable to fetch image + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + /api/room/screen/shot.jpg: + get: + tags: + - room + summary: get screenshot image + operationId: screenShotImage + responses: + '200': + description: OK + content: + image/jpeg: + schema: + type: string + format: binary + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '500': + description: Unable to create image + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + + /api/room/upload/drop: + post: + tags: + - room + summary: upload and drop file + operationId: uploadDrop + responses: + '204': + description: OK + '400': + description: Unable to upload file + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '500': + description: Unable to process uploaded file + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + requestBody: + content: + multipart/form-data: + schema: + type: object + properties: + x: + type: number + description: X coordinate of drop + y: + type: number + description: Y coordinate of drop + files: + type: array + description: files to be uploaded + items: + type: string + format: binary + required: true + /api/room/upload/dialog: + post: + tags: + - room + summary: upload file to a dialog + operationId: uploadDialog + responses: + '204': + description: OK + '400': + description: Unable to upload file + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '422': + description: No upload dialog prompt active + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + '500': + description: Unable to process uploaded file + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + requestBody: + content: + multipart/form-data: + schema: + type: object + properties: + files: + type: array + description: files to be uploaded + items: + type: string + format: binary + required: true + delete: + tags: + - room + summary: close file chooser dialog + operationId: uploadDialogClose + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '422': + description: No upload dialog prompt active + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + + # + # members + # + + /api/members: + get: + tags: + - members + summary: list of members + operationId: membersList + parameters: + - in: query + name: limit + schema: + type: number + - in: query + name: offset + schema: + type: number + responses: + '200': + description: OK + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/MemberData' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + post: + tags: + - members + summary: create new member + operationId: membersCreate + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/MemberData' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '422': + description: Member with chosen ID already exists + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/MemberCreate' + required: true + /api/members/{memberId}: + get: + tags: + - members + summary: get member's profile + operationId: membersGetProfile + parameters: + - in: path + name: memberId + description: member identifier + required: true + schema: + type: string + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/MemberProfile' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '404': + $ref: '#/components/responses/NotFound' + post: + tags: + - members + summary: update member's profile + operationId: membersUpdateProfile + parameters: + - in: path + name: memberId + description: member identifier + required: true + schema: + type: string + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '404': + $ref: '#/components/responses/NotFound' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/MemberProfile' + required: true + delete: + tags: + - members + summary: remove member + operationId: membersRemove + parameters: + - in: path + name: memberId + description: member identifier + required: true + schema: + type: string + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '404': + $ref: '#/components/responses/NotFound' + /api/members/{memberId}/password: + post: + tags: + - members + summary: update member's password + operationId: membersUpdatePassword + parameters: + - in: path + name: memberId + description: member identifier + required: true + schema: + type: string + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '404': + $ref: '#/components/responses/NotFound' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/MemberPassword' + required: true + /api/members_bulk/update: + post: + tags: + - members + summary: bulk update members + operationId: membersBulkUpdate + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '404': + $ref: '#/components/responses/NotFound' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/MemberBulkUpdate' + required: true + +components: + securitySchemes: + CookieAuth: + type: apiKey + in: cookie + name: NEKO_SESSION + BearerAuth: + type: http + scheme: bearer + TokenAuth: + type: apiKey + in: query + name: token + + responses: + NotFound: + description: The specified resource was not found + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + Unauthorized: + description: Unauthorized + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + Forbidden: + description: Forbidden + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorMessage' + + schemas: + ErrorMessage: + type: object + properties: + message: + type: string + + # + # session + # + + SessionLogin: + type: object + properties: + username: + type: string + password: + type: string + + SessionData: + type: object + properties: + id: + type: string + token: + type: string + description: Only if cookie authentication is disabled. + profile: + $ref: '#/components/schemas/MemberProfile' + state: + $ref: '#/components/schemas/SessionState' + + SessionState: + type: object + properties: + is_connected: + type: boolean + is_watching: + type: boolean + + # + # room + # + + Settings: + type: object + properties: + private_mode: + type: boolean + implicit_hosting: + type: boolean + inactive_cursors: + type: boolean + merciful_reconnect: + type: boolean + + BroadcastStatus: + type: object + properties: + url: + type: string + example: rtmp://localhost/live + is_active: + type: boolean + + ClipboardText: + type: object + properties: + text: + type: string + example: Copied Content 123 + html: + type: string + example: Copied Content 123 + + KeyboardMap: + type: object + properties: + layout: + type: string + example: sk + variant: + type: string + example: qwerty + + KeyboardModifiers: + type: object + properties: + numlock: + type: boolean + capslock: + type: boolean + + ControlStatus: + type: object + properties: + has_host: + type: boolean + host_id: + type: string + + ScreenConfiguration: + type: object + properties: + width: + type: integer + example: 1280 + height: + type: integer + example: 720 + rate: + type: integer + example: 30 + + # + # members + # + + MemberProfile: + type: object + properties: + name: + type: string + is_admin: + type: boolean + can_login: + type: boolean + can_connect: + type: boolean + can_watch: + type: boolean + can_host: + type: boolean + can_share_media: + type: boolean + can_access_clipboard: + type: boolean + sends_inactive_cursor: + type: boolean + can_see_inactive_cursors: + type: boolean + plugins: + type: object + additionalProperties: true + + MemberData: + properties: + id: + type: string + profile: + $ref: '#/components/schemas/MemberProfile' + + MemberCreate: + properties: + username: + type: string + password: + type: string + profile: + $ref: '#/components/schemas/MemberProfile' + + MemberPassword: + properties: + password: + type: string + + MemberBulkUpdate: + properties: + ids: + type: array + items: + type: string + profile: + $ref: '#/components/schemas/MemberProfile' + +security: + - BearerAuth: [] + - CookieAuth: [] + - TokenAuth: [] From 757437111e67375a0b133457896aec9a04a7ea7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jul 2022 00:55:56 +0200 Subject: [PATCH 718/876] add build scripts. --- dev/build | 14 ++++++ dev/exec | 3 ++ dev/fmt | 12 +++++ dev/go | 25 ++++++++++ dev/lint | 14 ++++++ dev/rebuild | 32 ++++++++++++ dev/runtime/Dockerfile | 19 ++++++++ dev/runtime/config.yml | 95 ++++++++++++++++++++++++++++++++++++ dev/runtime/supervisord.conf | 11 +++++ dev/start | 45 +++++++++++++++++ 10 files changed, 270 insertions(+) create mode 100755 dev/build create mode 100755 dev/exec create mode 100755 dev/fmt create mode 100755 dev/go create mode 100755 dev/lint create mode 100755 dev/rebuild create mode 100644 dev/runtime/Dockerfile create mode 100644 dev/runtime/config.yml create mode 100644 dev/runtime/supervisord.conf create mode 100755 dev/start diff --git a/dev/build b/dev/build new file mode 100755 index 00000000..3a6ef04b --- /dev/null +++ b/dev/build @@ -0,0 +1,14 @@ +#!/bin/bash +cd "$(dirname "$0")" + +# +# aborting if any command returns a non-zero value +set -e + +GIT_COMMIT=`git rev-parse --short HEAD` +GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` + +docker build -t neko_server_build --target build --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" .. +docker build -t neko_server_runtime --target runtime --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" .. + +docker build -t neko_server_app --build-arg "BASE_IMAGE=neko_server_runtime" ./runtime diff --git a/dev/exec b/dev/exec new file mode 100755 index 00000000..e9d89421 --- /dev/null +++ b/dev/exec @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -it neko_server_dev /bin/bash diff --git a/dev/fmt b/dev/fmt new file mode 100755 index 00000000..977f8802 --- /dev/null +++ b/dev/fmt @@ -0,0 +1,12 @@ +#!/bin/bash +cd "$(dirname "$0")" + +if [ "$(docker images -q neko_server_build 2> /dev/null)" == "" ]; then + echo "Image 'neko_server_build' not found. Run ./build first." + exit 1 +fi + +docker run -it --rm \ + --entrypoint="go" \ + -v "${PWD}/../:/src" \ + neko_server_build fmt ./... diff --git a/dev/go b/dev/go new file mode 100755 index 00000000..731d1d14 --- /dev/null +++ b/dev/go @@ -0,0 +1,25 @@ +#!/bin/bash +cd "$(dirname "$0")" + +if [ "$(docker images -q neko_server_build 2> /dev/null)" == "" ]; then + echo "Image 'neko_server_build' not found. Run ./build first." + exit 1 +fi + +docker run -it \ + --name "neko_server_go" \ + --entrypoint="go" \ + -v "${PWD}/../:/src" \ + neko_server_build "$@"; +# +# copy package files +docker cp neko_server_go:/src/go.mod "../go.mod" +docker cp neko_server_go:/src/go.sum "../go.sum" + +# +# commit changes to image +docker commit "neko_server_go" "neko_server_build" + +# +# remove contianer +docker rm "neko_server_go" diff --git a/dev/lint b/dev/lint new file mode 100755 index 00000000..a7aa6203 --- /dev/null +++ b/dev/lint @@ -0,0 +1,14 @@ +#!/bin/bash +cd "$(dirname "$0")" + +if [ "$(docker images -q neko_server_build 2> /dev/null)" == "" ]; then + echo "Image 'neko_server_build' not found. Run ./build first." + exit 1 +fi + +# +# build server +docker run --rm -it \ + -v "${PWD}/../:/src" \ + --entrypoint="/bin/bash" \ + neko_server_build -c '[ -f ./bin/golangci-lint ] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.31.0;./bin/golangci-lint run'; diff --git a/dev/rebuild b/dev/rebuild new file mode 100755 index 00000000..34ca4328 --- /dev/null +++ b/dev/rebuild @@ -0,0 +1,32 @@ +#!/bin/bash +cd "$(dirname "$0")" + +# +# aborting if any command returns a non-zero value +set -e + +# +# build server +docker run --rm -it \ + -v "${PWD}/../:/src" \ + --entrypoint="/bin/bash" \ + neko_server_build "./build" "$@"; + +# +# remove old plugins +docker exec neko_server_dev rm -rf /etc/neko/plugins + +# +# replace server binary in container +docker cp "${PWD}/../bin/neko" neko_server_dev:/usr/bin/neko + +# +# replace plugin binaries in container +if [ -d "${PWD}/../bin/plugins" ]; +then + docker cp "${PWD}/../bin/plugins" neko_server_dev:/etc/neko/plugins +fi + +# +# restart server +docker exec neko_server_dev supervisorctl restart neko diff --git a/dev/runtime/Dockerfile b/dev/runtime/Dockerfile new file mode 100644 index 00000000..e1d401b1 --- /dev/null +++ b/dev/runtime/Dockerfile @@ -0,0 +1,19 @@ +ARG BASE_IMAGE=neko_server_runtime:latest +FROM $BASE_IMAGE + +# +# install xfce +RUN set -eux; apt-get update; \ + apt-get install -y --no-install-recommends xfce4 xfce4-terminal firefox-esr sudo; \ + # + # add user to sudoers + usermod -aG sudo neko; \ + echo "neko:neko" | chpasswd; \ + echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \ + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# copy configuation files +COPY supervisord.conf /etc/neko/supervisord/xfce.conf diff --git a/dev/runtime/config.yml b/dev/runtime/config.yml new file mode 100644 index 00000000..a37d7775 --- /dev/null +++ b/dev/runtime/config.yml @@ -0,0 +1,95 @@ +capture: + video: + codec: vp8 + ids: [ hq, lq ] + pipelines: + hq: + fps: 25 + gst_encoder: vp8enc + gst_params: + target-bitrate: (3072 * 650) + cpu-used: 4 + end-usage: cbr + threads: 4 + deadline: 1 + undershoot: 95 + buffer-size: (3072 * 4) + buffer-initial-size: (3072 * 2) + buffer-optimal-size: (3072 * 3) + keyframe-max-dist: 25 + min-quantizer: 4 + max-quantizer: 20 + lq: + fps: 25 + gst_encoder: vp8enc + gst_params: + target-bitrate: (1024 * 650) + cpu-used: 4 + end-usage: cbr + threads: 4 + deadline: 1 + undershoot: 95 + buffer-size: (1024 * 4) + buffer-initial-size: (1024 * 2) + buffer-optimal-size: (1024 * 3) + keyframe-max-dist: 25 + min-quantizer: 4 + max-quantizer: 20 + # video: + # codec: h264 + # ids: [ main ] + # pipelines: + # main: + # width: (width / 3) * 2 + # height: (height / 3) * 2 + # fps: 20 + # gst_prefix: "! video/x-raw,format=I420" + # gst_encoder: "x264enc" + # gst_params: + # threads: 4 + # bitrate: 4096 + # key-int-max: 15 + # byte-stream: true + # tune: zerolatency + # speed-preset: veryfast + # gst_suffix: "! video/x-h264,stream-format=byte-stream" + screencast: + enabled: true + +server: + pprof: true + +desktop: + screen: "1920x1080@60" + +member: + provider: "object" + object: + admin_password: "admin" + user_password: "neko" + # provider: "file" + # file: + # path: "/home/neko/members.json" + +session: + # Allows reconnecting the websocket even if the previous + # connection was not closed. Can lead to session hijacking. + merciful_reconnect: true + # Show inactive cursors on the screen. Can lead to multiple + # data sent via WebSockets and additonal rendering cost on + # the clients. + inactive_cursors: true + api_token: "neko123" + cookie: + # Disabling cookies will result to use Bearer Authentication. + # This is less secure, because access token will be sent to + # client in playload and accessible via JS app. + enabled: false + secure: false + +webrtc: + icelite: true + iceservers: + - urls: [ stun:stun.l.google.com:19302 ] + # username: foo + # credential: bar diff --git a/dev/runtime/supervisord.conf b/dev/runtime/supervisord.conf new file mode 100644 index 00000000..d14ef4ad --- /dev/null +++ b/dev/runtime/supervisord.conf @@ -0,0 +1,11 @@ +[program:xfce] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/startxfce4 +stopsignal=INT +autorestart=true +priority=500 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/xfce.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true diff --git a/dev/start b/dev/start new file mode 100755 index 00000000..ad57f8a2 --- /dev/null +++ b/dev/start @@ -0,0 +1,45 @@ +#!/bin/bash +cd "$(dirname "$0")" + +if [ -z "$(docker images -q neko_server_app 2> /dev/null)" ]; then + echo "Image 'neko_server_app' not found. Running ./build first." + ./build +fi + +if [ -z $NEKO_PORT ]; then + NEKO_PORT="3000" +fi + +if [ -z $NEKO_MUX ]; then + NEKO_MUX="52100" +fi + +if [ -z $NEKO_NAT1TO1 ]; then + for i in $(ifconfig -l 2>/dev/null); do + NEKO_NAT1TO1=$(ipconfig getifaddr $i) + if [ ! -z $NEKO_NAT1TO1 ]; then + break + fi + done + + if [ -z $NEKO_NAT1TO1 ]; then + NEKO_NAT1TO1=$(hostname -i 2>/dev/null) + fi +fi + +echo "Using app port: ${NEKO_PORT}" +echo "Using mux port: ${NEKO_MUX}" +echo "Using IP address: ${NEKO_NAT1TO1}" + +# start server +docker run --rm -it \ + --name "neko_server_dev" \ + -p "${NEKO_PORT}:8080" \ + -p "${NEKO_MUX}:${NEKO_MUX}/tcp" \ + -p "${NEKO_MUX}:${NEKO_MUX}/udp" \ + -e "NEKO_WEBRTC_UDPMUX=${NEKO_MUX}" \ + -e "NEKO_WEBRTC_TCPMUX=${NEKO_MUX}" \ + -e "NEKO_WEBRTC_NAT1TO1=${NEKO_NAT1TO1}" \ + -v "${PWD}/runtime/config.yml:/etc/neko/neko.yml" \ + -e "NEKO_DEBUG=1" \ + neko_server_app:latest; From 41df1bc8d385f10e36843a2a44134a0374f5c9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jul 2022 00:57:00 +0200 Subject: [PATCH 719/876] build - ensure plugins folder exists. --- build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build b/build index 163cb38f..0788e5a6 100755 --- a/build +++ b/build @@ -37,6 +37,10 @@ go build \ " \ cmd/neko/main.go; +# +# ensure plugins folder exists +mkdir -p bin/plugins + # # if plugins are ignored if [ "$skip_plugins" = "true" ]; @@ -54,8 +58,7 @@ then fi # -# ensure plugins folder exits and remove old plugins -mkdir -p bin/plugins +# remove old plugins rm -f bin/plugins/* # From 3cd59b9f302ba497b887d7884502799c4fbac901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jul 2022 00:58:22 +0200 Subject: [PATCH 720/876] rename module name from gitlab to github. --- build | 8 ++++---- cmd/neko/main.go | 6 +++--- cmd/root.go | 4 ++-- cmd/serve.go | 20 ++++++++++---------- go.mod | 2 +- internal/api/members/bluk.go | 4 ++-- internal/api/members/controler.go | 4 ++-- internal/api/members/handler.go | 6 +++--- internal/api/room/broadcast.go | 6 +++--- internal/api/room/clipboard.go | 4 ++-- internal/api/room/control.go | 4 ++-- internal/api/room/handler.go | 6 +++--- internal/api/room/keyboard.go | 4 ++-- internal/api/room/screen.go | 10 +++++----- internal/api/room/settings.go | 2 +- internal/api/room/upload.go | 2 +- internal/api/router.go | 10 +++++----- internal/api/session.go | 6 +++--- internal/capture/broadcast.go | 4 ++-- internal/capture/manager.go | 6 +++--- internal/capture/screencast.go | 4 ++-- internal/capture/streamsink.go | 6 +++--- internal/capture/streamsrc.go | 6 +++--- internal/config/capture.go | 6 +++--- internal/config/member.go | 4 ++-- internal/config/server.go | 2 +- internal/config/webrtc.go | 4 ++-- internal/desktop/clipboard.go | 4 ++-- internal/desktop/drop.go | 2 +- internal/desktop/filechooserdialog.go | 2 +- internal/desktop/manager.go | 6 +++--- internal/desktop/xevent.go | 2 +- internal/desktop/xorg.go | 4 ++-- internal/http/debug.go | 2 +- internal/http/logger.go | 4 ++-- internal/http/manager.go | 4 ++-- internal/http/router.go | 6 +++--- internal/member/dummy/provider.go | 2 +- internal/member/file/provider.go | 2 +- internal/member/file/types.go | 2 +- internal/member/manager.go | 10 +++++----- internal/member/object/provider.go | 2 +- internal/member/object/types.go | 2 +- internal/plugins/dependency.go | 2 +- internal/plugins/dependency_test.go | 2 +- internal/plugins/manager.go | 4 ++-- internal/session/auth.go | 2 +- internal/session/manager.go | 6 +++--- internal/session/session.go | 4 ++-- internal/webrtc/cursor/image.go | 4 ++-- internal/webrtc/handler.go | 4 ++-- internal/webrtc/manager.go | 14 +++++++------- internal/webrtc/metrics.go | 2 +- internal/webrtc/peer.go | 2 +- internal/webrtc/peerconnection.go | 4 ++-- internal/webrtc/peerstreamtrack.go | 2 +- internal/webrtc/send.go | 4 ++-- internal/websocket/filechooserdialog.go | 6 +++--- internal/websocket/handler/clipboard.go | 4 ++-- internal/websocket/handler/control.go | 8 ++++---- internal/websocket/handler/handler.go | 8 ++++---- internal/websocket/handler/keyboard.go | 4 ++-- internal/websocket/handler/screen.go | 6 +++--- internal/websocket/handler/send.go | 6 +++--- internal/websocket/handler/session.go | 6 +++--- internal/websocket/handler/signal.go | 6 +++--- internal/websocket/handler/system.go | 6 +++--- internal/websocket/manager.go | 10 +++++----- internal/websocket/peer.go | 6 +++--- pkg/auth/auth.go | 4 ++-- pkg/auth/auth_test.go | 6 +++--- pkg/gst/gst.go | 2 +- pkg/types/capture.go | 2 +- pkg/types/message/messages.go | 2 +- pkg/xorg/xorg.go | 2 +- 75 files changed, 178 insertions(+), 178 deletions(-) diff --git a/build b/build index 0788e5a6..ea3ccae9 100755 --- a/build +++ b/build @@ -30,10 +30,10 @@ go build \ -o bin/neko \ -ldflags " -s -w - -X 'gitlab.com/demodesk/neko/server.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`' - -X 'gitlab.com/demodesk/neko/server.gitCommit=${GIT_COMMIT}' - -X 'gitlab.com/demodesk/neko/server.gitBranch=${GIT_BRANCH}' - -X 'gitlab.com/demodesk/neko/server.gitTag=${GIT_TAG}' + -X 'github.com/demodesk/neko.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`' + -X 'github.com/demodesk/neko.gitCommit=${GIT_COMMIT}' + -X 'github.com/demodesk/neko.gitBranch=${GIT_BRANCH}' + -X 'github.com/demodesk/neko.gitTag=${GIT_TAG}' " \ cmd/neko/main.go; diff --git a/cmd/neko/main.go b/cmd/neko/main.go index 47e1eadd..dec9df74 100644 --- a/cmd/neko/main.go +++ b/cmd/neko/main.go @@ -5,9 +5,9 @@ import ( "github.com/rs/zerolog/log" - neko "gitlab.com/demodesk/neko/server" - "gitlab.com/demodesk/neko/server/cmd" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko" + "github.com/demodesk/neko/cmd" + "github.com/demodesk/neko/pkg/utils" ) func main() { diff --git a/cmd/root.go b/cmd/root.go index d51f8b0a..79c91229 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -15,8 +15,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - neko "gitlab.com/demodesk/neko/server" - "gitlab.com/demodesk/neko/server/internal/config" + "github.com/demodesk/neko" + "github.com/demodesk/neko/internal/config" ) func Execute() error { diff --git a/cmd/serve.go b/cmd/serve.go index 1ab011d3..1d5fd9dc 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -8,16 +8,16 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "gitlab.com/demodesk/neko/server/internal/api" - "gitlab.com/demodesk/neko/server/internal/capture" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/desktop" - "gitlab.com/demodesk/neko/server/internal/http" - "gitlab.com/demodesk/neko/server/internal/member" - "gitlab.com/demodesk/neko/server/internal/plugins" - "gitlab.com/demodesk/neko/server/internal/session" - "gitlab.com/demodesk/neko/server/internal/webrtc" - "gitlab.com/demodesk/neko/server/internal/websocket" + "github.com/demodesk/neko/internal/api" + "github.com/demodesk/neko/internal/capture" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/internal/desktop" + "github.com/demodesk/neko/internal/http" + "github.com/demodesk/neko/internal/member" + "github.com/demodesk/neko/internal/plugins" + "github.com/demodesk/neko/internal/session" + "github.com/demodesk/neko/internal/webrtc" + "github.com/demodesk/neko/internal/websocket" ) func init() { diff --git a/go.mod b/go.mod index 703050b2..116de496 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlab.com/demodesk/neko/server +module github.com/demodesk/neko go 1.18 diff --git a/internal/api/members/bluk.go b/internal/api/members/bluk.go index 36a6f5f8..a7a4552e 100644 --- a/internal/api/members/bluk.go +++ b/internal/api/members/bluk.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type MemberBulkUpdatePayload struct { diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 6bb40db4..b1814ce3 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -5,8 +5,8 @@ import ( "net/http" "strconv" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type MemberDataPayload struct { diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index b6a8c71c..45d022a5 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type key int diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index f0bd8664..1dde70df 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -3,9 +3,9 @@ package room import ( "net/http" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" + "github.com/demodesk/neko/pkg/utils" ) type BroadcastStatusPayload struct { diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index f0a8bfdd..00cf8031 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -7,8 +7,8 @@ import ( "net/http" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type ClipboardPayload struct { diff --git a/internal/api/room/control.go b/internal/api/room/control.go index cf0300e9..7395db33 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -5,8 +5,8 @@ import ( "github.com/go-chi/chi" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/utils" ) type ControlStatusPayload struct { diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 50707b55..e3c9428e 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type RoomHandler struct { diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index f75c9291..ab15c2bd 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -3,8 +3,8 @@ package room import ( "net/http" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type KeyboardMapData struct { diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 9be8c20b..bb5bf78b 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -4,11 +4,11 @@ import ( "net/http" "strconv" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" + "github.com/demodesk/neko/pkg/utils" ) type ScreenConfigurationPayload struct { diff --git a/internal/api/room/settings.go b/internal/api/room/settings.go index 468b4168..33e41552 100644 --- a/internal/api/room/settings.go +++ b/internal/api/room/settings.go @@ -3,7 +3,7 @@ package room import ( "net/http" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/utils" ) func (h *RoomHandler) settingsGet(w http.ResponseWriter, r *http.Request) error { diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index edb5cae4..bba7b989 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/utils" ) // TODO: Extract file uploading to custom utility. diff --git a/internal/api/router.go b/internal/api/router.go index b05115fd..3cf1d218 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -5,11 +5,11 @@ import ( "errors" "net/http" - "gitlab.com/demodesk/neko/server/internal/api/members" - "gitlab.com/demodesk/neko/server/internal/api/room" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/internal/api/members" + "github.com/demodesk/neko/internal/api/room" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type ApiManagerCtx struct { diff --git a/internal/api/session.go b/internal/api/session.go index f22cf199..3ea6cc41 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -3,9 +3,9 @@ package api import ( "net/http" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type SessionLoginPayload struct { diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 70f955de..6f032b33 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/gst" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/gst" + "github.com/demodesk/neko/pkg/types" ) type BroacastManagerCtx struct { diff --git a/internal/capture/manager.go b/internal/capture/manager.go index d4496e9f..61ef8edb 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/codec" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" ) type CaptureManagerCtx struct { diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 7bb73e60..0383c7f9 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -11,8 +11,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/gst" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/gst" + "github.com/demodesk/neko/pkg/types" ) // timeout between intervals, when screencast pipeline is checked diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index 354e829b..954ed452 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -11,9 +11,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/gst" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/codec" + "github.com/demodesk/neko/pkg/gst" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" ) var moveSinkListenerMu = sync.Mutex{} diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index 59e2632b..89abca08 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/gst" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/codec" + "github.com/demodesk/neko/pkg/gst" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" ) type StreamSrcManagerCtx struct { diff --git a/internal/config/capture.go b/internal/config/capture.go index e0c8d110..315735b8 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/codec" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" + "github.com/demodesk/neko/pkg/utils" ) type Capture struct { diff --git a/internal/config/member.go b/internal/config/member.go index 003ad154..8ef083d5 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/internal/member/file" - "gitlab.com/demodesk/neko/server/internal/member/object" + "github.com/demodesk/neko/internal/member/file" + "github.com/demodesk/neko/internal/member/object" ) type Member struct { diff --git a/internal/config/server.go b/internal/config/server.go index 1fe656a7..12ae00e4 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/utils" ) type Server struct { diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 50a2a642..126f1d5e 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) // default stun server diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index c7431b87..fcfce03d 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/xevent" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/xevent" ) func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) { diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index 4efd8420..ff6d9d0f 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -3,7 +3,7 @@ package desktop import ( "time" - "gitlab.com/demodesk/neko/server/pkg/drop" + "github.com/demodesk/neko/pkg/drop" ) // repeat move event multiple times diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index 5c4e5952..e5db4af6 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -4,7 +4,7 @@ import ( "errors" "os/exec" - "gitlab.com/demodesk/neko/server/pkg/xorg" + "github.com/demodesk/neko/pkg/xorg" ) // name of the window that is being controlled diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 289904bf..0dac38c9 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/pkg/xevent" - "gitlab.com/demodesk/neko/server/pkg/xorg" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/xevent" + "github.com/demodesk/neko/pkg/xorg" ) var mu = sync.Mutex{} diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index 8abcb03f..bbc4b46c 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -1,7 +1,7 @@ package desktop import ( - "gitlab.com/demodesk/neko/server/pkg/xevent" + "github.com/demodesk/neko/pkg/xevent" ) func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) { diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 0de6b74b..8912d13b 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/xorg" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/xorg" ) func (manager *DesktopManagerCtx) Move(x, y int) { diff --git a/internal/http/debug.go b/internal/http/debug.go index af63ded2..5e40e147 100644 --- a/internal/http/debug.go +++ b/internal/http/debug.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func pprofHandler(r types.Router) { diff --git a/internal/http/logger.go b/internal/http/logger.go index 783caede..ae804e97 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -8,8 +8,8 @@ import ( "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type logFormatter struct { diff --git a/internal/http/manager.go b/internal/http/manager.go index 63c767d2..07e10067 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -10,8 +10,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/types" ) type HttpManagerCtx struct { diff --git a/internal/http/router.go b/internal/http/router.go index 636cc4ca..ab7bd535 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type router struct { diff --git a/internal/member/dummy/provider.go b/internal/member/dummy/provider.go index 2f3cbee3..4ab0dd4a 100644 --- a/internal/member/dummy/provider.go +++ b/internal/member/dummy/provider.go @@ -3,7 +3,7 @@ package dummy import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func New() types.MemberProvider { diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index 1f1f6707..04acd191 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -5,7 +5,7 @@ import ( "io" "os" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func New(config Config) types.MemberProvider { diff --git a/internal/member/file/types.go b/internal/member/file/types.go index dc4a02d2..739e0814 100644 --- a/internal/member/file/types.go +++ b/internal/member/file/types.go @@ -1,7 +1,7 @@ package file import ( - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) type MemberEntry struct { diff --git a/internal/member/manager.go b/internal/member/manager.go index 83aeae0f..965ccf17 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -7,11 +7,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/member/dummy" - "gitlab.com/demodesk/neko/server/internal/member/file" - "gitlab.com/demodesk/neko/server/internal/member/object" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/internal/member/dummy" + "github.com/demodesk/neko/internal/member/file" + "github.com/demodesk/neko/internal/member/object" + "github.com/demodesk/neko/pkg/types" ) func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx { diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index c3cef2a7..7410ff39 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -1,7 +1,7 @@ package object import ( - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func New(config Config) types.MemberProvider { diff --git a/internal/member/object/types.go b/internal/member/object/types.go index b29894fa..ca1e519a 100644 --- a/internal/member/object/types.go +++ b/internal/member/object/types.go @@ -1,7 +1,7 @@ package object import ( - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) type MemberEntry struct { diff --git a/internal/plugins/dependency.go b/internal/plugins/dependency.go index 31f2dddc..b9f19388 100644 --- a/internal/plugins/dependency.go +++ b/internal/plugins/dependency.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) type dependency struct { diff --git a/internal/plugins/dependency_test.go b/internal/plugins/dependency_test.go index 259eba3c..7075450f 100644 --- a/internal/plugins/dependency_test.go +++ b/internal/plugins/dependency_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func Test_deps_addPlugin(t *testing.T) { diff --git a/internal/plugins/manager.go b/internal/plugins/manager.go index ea88ca61..027d9314 100644 --- a/internal/plugins/manager.go +++ b/internal/plugins/manager.go @@ -10,8 +10,8 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/types" ) type ManagerCtx struct { diff --git a/internal/session/auth.go b/internal/session/auth.go index 50b749dd..1248fad9 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token string) { diff --git a/internal/session/manager.go b/internal/session/manager.go index c7f43c1d..edfad97d 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) func New(config *config.Session) *SessionManagerCtx { diff --git a/internal/session/session.go b/internal/session/session.go index 445391ef..9590a1cd 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -5,8 +5,8 @@ import ( "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" ) type SessionCtx struct { diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 4411e324..ddfdcc18 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) func NewImage(desktop types.DesktopManager) *ImageCtx { diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 88cbe74d..34df576e 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "gitlab.com/demodesk/neko/server/internal/webrtc/payload" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/webrtc/payload" + "github.com/demodesk/neko/pkg/types" ) func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) error { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index cc8523a9..ccba66a8 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -13,13 +13,13 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/webrtc/cursor" - "gitlab.com/demodesk/neko/server/internal/webrtc/pionlog" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/codec" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/internal/webrtc/cursor" + "github.com/demodesk/neko/internal/webrtc/pionlog" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 69498ed1..aad26491 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -3,11 +3,11 @@ package webrtc import ( "sync" + "github.com/demodesk/neko/pkg/types" "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/demodesk/neko/server/pkg/types" ) type metrics struct { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 7bb3c668..0c38cd27 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -6,7 +6,7 @@ import ( "github.com/pion/webrtc/v3" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) type WebRTCPeerCtx struct { diff --git a/internal/webrtc/peerconnection.go b/internal/webrtc/peerconnection.go index 6554d113..bf8d013c 100644 --- a/internal/webrtc/peerconnection.go +++ b/internal/webrtc/peerconnection.go @@ -5,8 +5,8 @@ import ( "github.com/pion/webrtc/v3" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/internal/webrtc/pionlog" - "gitlab.com/demodesk/neko/server/pkg/types/codec" + "github.com/demodesk/neko/internal/webrtc/pionlog" + "github.com/demodesk/neko/pkg/types/codec" ) func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) { diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go index 2d2fa59b..423b21e0 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -10,7 +10,7 @@ import ( "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamSinkManager, logger zerolog.Logger) (*PeerStreamTrack, error) { diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index f42f5867..c2d0b992 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "gitlab.com/demodesk/neko/server/internal/webrtc/payload" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/webrtc/payload" + "github.com/demodesk/neko/pkg/types" ) func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index 0c02d082..3ee39238 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -1,9 +1,9 @@ package websocket import ( - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 5b9eac9d..97935cea 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/message" ) func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index e0cb2a52..0b3ff7a1 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -3,10 +3,10 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" - "gitlab.com/demodesk/neko/server/pkg/xorg" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" + "github.com/demodesk/neko/pkg/xorg" ) var ( diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index d87935b8..04b3f9dd 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -4,10 +4,10 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" + "github.com/demodesk/neko/pkg/utils" ) func New( diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index e8124fb3..02f7ff57 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/message" ) func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error { diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 01a2c256..189f5b52 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index df4f873b..211e5c83 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error { diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 64346807..2c759776 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -1,9 +1,9 @@ package handler import ( - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 1b61e0ea..d994ffd8 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error { diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 90440a1d..6d0f2f66 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) func (h *MessageHandlerCtx) systemInit(session types.Session) error { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 824da0a2..5963d9ab 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -10,11 +10,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/websocket/handler" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/internal/websocket/handler" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" + "github.com/demodesk/neko/pkg/utils" ) // send pings to peer with this period - must be less than pongWait diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 6ba83ce6..d4176ef9 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) type WebSocketPeerCtx struct { diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 12c24155..24c5b2fc 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type key int diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go index 94f242ad..fa9b89e3 100644 --- a/pkg/auth/auth_test.go +++ b/pkg/auth/auth_test.go @@ -6,9 +6,9 @@ import ( "reflect" "testing" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/session" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/internal/session" + "github.com/demodesk/neko/pkg/types" ) var i = 0 diff --git a/pkg/gst/gst.go b/pkg/gst/gst.go index dc1a1c04..80498dcb 100644 --- a/pkg/gst/gst.go +++ b/pkg/gst/gst.go @@ -16,7 +16,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) type Pipeline struct { diff --git a/pkg/types/capture.go b/pkg/types/capture.go index a2bf961b..0f599765 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -10,7 +10,7 @@ import ( "github.com/PaesslerAG/gval" "github.com/pion/webrtc/v3/pkg/media" - "gitlab.com/demodesk/neko/server/pkg/types/codec" + "github.com/demodesk/neko/pkg/types/codec" ) var ( diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index 8c6bfe61..24bfb67c 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -3,7 +3,7 @@ package message import ( "github.com/pion/webrtc/v3" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) ///////////////////////////// diff --git a/pkg/xorg/xorg.go b/pkg/xorg/xorg.go index 94a8126c..05e60ca7 100644 --- a/pkg/xorg/xorg.go +++ b/pkg/xorg/xorg.go @@ -15,7 +15,7 @@ import ( "time" "unsafe" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) //go:generate ./keysymdef.sh From b7926c335ead6b8599d6ee7350789c7eb7cb433f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jul 2022 01:04:45 +0200 Subject: [PATCH 721/876] dev config add round. --- dev/runtime/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/runtime/config.yml b/dev/runtime/config.yml index a37d7775..21fc2968 100644 --- a/dev/runtime/config.yml +++ b/dev/runtime/config.yml @@ -7,7 +7,7 @@ capture: fps: 25 gst_encoder: vp8enc gst_params: - target-bitrate: (3072 * 650) + target-bitrate: round(3072 * 650) cpu-used: 4 end-usage: cbr threads: 4 @@ -23,7 +23,7 @@ capture: fps: 25 gst_encoder: vp8enc gst_params: - target-bitrate: (1024 * 650) + target-bitrate: round(1024 * 650) cpu-used: 4 end-usage: cbr threads: 4 From d08829493ad2643a9c8e8c1795d42002470d5167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jul 2022 01:07:50 +0200 Subject: [PATCH 722/876] add plugins folder. --- .gitignore | 3 +++ build | 5 +++++ plugins/.gitkeep | 0 3 files changed, 8 insertions(+) create mode 100644 plugins/.gitkeep diff --git a/.gitignore b/.gitignore index 1e25df6c..3428a0df 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ runtime/fonts/* runtime/icon-theme/* !runtime/icon-theme/.gitkeep + +plugins/* +!plugins/.gitkeep diff --git a/build b/build index ea3ccae9..437dfeb0 100755 --- a/build +++ b/build @@ -64,6 +64,11 @@ rm -f bin/plugins/* # # build plugins for plugPath in ./plugins/*; do + if [ ! -d $plugPath ]; + then + continue + fi + pushd $plugPath echo "Building plugin: $plugPath" diff --git a/plugins/.gitkeep b/plugins/.gitkeep new file mode 100644 index 00000000..e69de29b From 52ba7d987f691b56b60899366c29f22aa0eb8678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 14 Jul 2022 23:47:45 +0200 Subject: [PATCH 723/876] plugins buildvcs. --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index 437dfeb0..3bf7f7da 100755 --- a/build +++ b/build @@ -81,7 +81,7 @@ for plugPath in ./plugins/*; do fi # build plugin - go build -modfile=go.plug.mod -buildmode=plugin -o "../../bin/plugins/${plugPath##*/}.so" + go build -modfile=go.plug.mod -buildmode=plugin -buildvcs=false -o "../../bin/plugins/${plugPath##*/}.so" popd done From c85d1f3159800bfec38ec3a6a00afc2d39e2b0fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 15 Jul 2022 00:29:57 +0200 Subject: [PATCH 724/876] Add GitHub Actions (#2) --- .github/workflows/build.yml | 44 +++++++++++++++++++++++++++++ .github/workflows/pull_requests.yml | 21 ++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/pull_requests.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..4c207153 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,44 @@ +name: Create and publish a Docker image + +on: + push: + branches: + - 'master' + tags: + - 'v*' + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-and-push-image: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Log in to the Container registry + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Build and push Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml new file mode 100644 index 00000000..f0740d0d --- /dev/null +++ b/.github/workflows/pull_requests.yml @@ -0,0 +1,21 @@ +name: Build a Docker image + +on: + pull_request: + branches: + - master + +jobs: + build-image: + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Build Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . From 472fd5f346b0263c402f63015a572d8ea7792225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 18 Jul 2022 22:08:47 +0200 Subject: [PATCH 725/876] add LICENSE. --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..012a8504 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2020 Nurdism , 2020-2022 m1k1o & Demodesk GmbH + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From c725e96c905e5b5179c24581a7181930d7869c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 28 Jul 2022 12:19:58 +0200 Subject: [PATCH 726/876] change shutdown order. (#4) --- cmd/serve.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/cmd/serve.go b/cmd/serve.go index 1d5fd9dc..63e1579f 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -176,26 +176,26 @@ func (c *serve) Start(cmd *cobra.Command) { func (c *serve) Shutdown() { var err error - err = c.managers.member.Disconnect() - c.logger.Err(err).Msg("member manager disconnect") - - err = c.managers.desktop.Shutdown() - c.logger.Err(err).Msg("desktop manager shutdown") - - err = c.managers.capture.Shutdown() - c.logger.Err(err).Msg("capture manager shutdown") - - err = c.managers.webRTC.Shutdown() - c.logger.Err(err).Msg("webrtc manager shutdown") - - err = c.managers.webSocket.Shutdown() - c.logger.Err(err).Msg("websocket manager shutdown") + err = c.managers.http.Shutdown() + c.logger.Err(err).Msg("http manager shutdown") err = c.managers.plugins.Shutdown() c.logger.Err(err).Msg("plugins manager shutdown") - err = c.managers.http.Shutdown() - c.logger.Err(err).Msg("http manager shutdown") + err = c.managers.webSocket.Shutdown() + c.logger.Err(err).Msg("websocket manager shutdown") + + err = c.managers.webRTC.Shutdown() + c.logger.Err(err).Msg("webrtc manager shutdown") + + err = c.managers.capture.Shutdown() + c.logger.Err(err).Msg("capture manager shutdown") + + err = c.managers.desktop.Shutdown() + c.logger.Err(err).Msg("desktop manager shutdown") + + err = c.managers.member.Disconnect() + c.logger.Err(err).Msg("member manager disconnect") } func (c *serve) Command(cmd *cobra.Command, args []string) { From babddacbf3b42090af911d6d1a2f09812e34156c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 28 Jul 2022 12:20:20 +0200 Subject: [PATCH 727/876] Go generics and changes in v1.18 (#5) * ArrayIn to use generics. * interface{} -> any. --- internal/api/room/broadcast.go | 4 ++-- internal/api/room/screen.go | 2 +- internal/desktop/clipboard.go | 2 +- internal/desktop/drop.go | 10 ++++----- internal/desktop/manager.go | 4 ++-- internal/desktop/xevent.go | 10 ++++----- internal/http/logger.go | 16 +++++++------- internal/session/manager.go | 28 ++++++++++++------------- internal/session/session.go | 2 +- internal/webrtc/peerconnection.go | 2 +- internal/webrtc/pionlog/logger.go | 10 ++++----- internal/webrtc/pionlog/nullog.go | 20 +++++++++--------- internal/websocket/filechooserdialog.go | 4 ++-- internal/websocket/handler/screen.go | 2 +- internal/websocket/handler/send.go | 2 +- internal/websocket/handler/session.go | 8 +++---- internal/websocket/manager.go | 8 +++---- internal/websocket/peer.go | 2 +- pkg/types/capture.go | 4 ++-- pkg/types/message/messages.go | 20 +++++++++--------- pkg/types/session.go | 8 +++---- pkg/types/websocket.go | 2 +- pkg/utils/array.go | 22 ++++++------------- pkg/utils/color.go | 2 +- pkg/utils/http.go | 10 ++++----- pkg/utils/json.go | 6 +++--- 26 files changed, 100 insertions(+), 110 deletions(-) diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index 1dde70df..75e047c0 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -46,7 +46,7 @@ func (h *RoomHandler) boradcastStart(w http.ResponseWriter, r *http.Request) err message.BroadcastStatus{ IsActive: broadcast.Started(), URL: broadcast.Url(), - }, nil) + }) return utils.HttpSuccess(w) } @@ -64,7 +64,7 @@ func (h *RoomHandler) boradcastStop(w http.ResponseWriter, r *http.Request) erro message.BroadcastStatus{ IsActive: broadcast.Started(), URL: broadcast.Url(), - }, nil) + }) return utils.HttpSuccess(w) } diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index bb5bf78b..b7001532 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -40,7 +40,7 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R } payload := message.ScreenSize(*data) - h.sessions.Broadcast(event.SCREEN_UPDATED, payload, nil) + h.sessions.Broadcast(event.SCREEN_UPDATED, payload) return utils.HttpSuccess(w, data) } diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index fcfce03d..f354fe38 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -67,7 +67,7 @@ func (manager *DesktopManagerCtx) ClipboardSetBinary(mime string, data []byte) e // TODO: Refactor. // We need to wait until the data came to the clipboard. wait := make(chan struct{}) - xevent.Emmiter.Once("clipboard-updated", func(payload ...interface{}) { + xevent.Emmiter.Once("clipboard-updated", func(payload ...any) { wait <- struct{}{} }) diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index ff6d9d0f..82332e52 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -18,20 +18,20 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { drop.Emmiter.Clear() - drop.Emmiter.Once("create", func(payload ...interface{}) { + drop.Emmiter.Once("create", func(payload ...any) { manager.Move(0, 0) }) - drop.Emmiter.Once("cursor-enter", func(payload ...interface{}) { + drop.Emmiter.Once("cursor-enter", func(payload ...any) { //nolint manager.ButtonDown(1) }) - drop.Emmiter.Once("button-press", func(payload ...interface{}) { + drop.Emmiter.Once("button-press", func(payload ...any) { manager.Move(x, y) }) - drop.Emmiter.Once("begin", func(payload ...interface{}) { + drop.Emmiter.Once("begin", func(payload ...any) { for i := 0; i < dropMoveRepeat; i++ { manager.Move(x, y) time.Sleep(dropMoveDelay) @@ -42,7 +42,7 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { }) finished := make(chan bool) - drop.Emmiter.Once("finish", func(payload ...interface{}) { + drop.Emmiter.Once("finish", func(payload ...any) { finished <- payload[0].(bool) }) diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 0dac38c9..d2aa542f 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -79,13 +79,13 @@ func (manager *DesktopManagerCtx) Start() { } func (manager *DesktopManagerCtx) OnBeforeScreenSizeChange(listener func()) { - manager.emmiter.On("before_screen_size_change", func(payload ...interface{}) { + manager.emmiter.On("before_screen_size_change", func(payload ...any) { listener() }) } func (manager *DesktopManagerCtx) OnAfterScreenSizeChange(listener func()) { - manager.emmiter.On("after_screen_size_change", func(payload ...interface{}) { + manager.emmiter.On("after_screen_size_change", func(payload ...any) { listener() }) } diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index bbc4b46c..59df1d7e 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -5,31 +5,31 @@ import ( ) func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) { - xevent.Emmiter.On("cursor-changed", func(payload ...interface{}) { + xevent.Emmiter.On("cursor-changed", func(payload ...any) { listener(payload[0].(uint64)) }) } func (manager *DesktopManagerCtx) OnClipboardUpdated(listener func()) { - xevent.Emmiter.On("clipboard-updated", func(payload ...interface{}) { + xevent.Emmiter.On("clipboard-updated", func(payload ...any) { listener() }) } func (manager *DesktopManagerCtx) OnFileChooserDialogOpened(listener func()) { - xevent.Emmiter.On("file-chooser-dialog-opened", func(payload ...interface{}) { + xevent.Emmiter.On("file-chooser-dialog-opened", func(payload ...any) { listener() }) } func (manager *DesktopManagerCtx) OnFileChooserDialogClosed(listener func()) { - xevent.Emmiter.On("file-chooser-dialog-closed", func(payload ...interface{}) { + xevent.Emmiter.On("file-chooser-dialog-closed", func(payload ...any) { listener() }) } func (manager *DesktopManagerCtx) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) { - xevent.Emmiter.On("event-error", func(payload ...interface{}) { + xevent.Emmiter.On("event-error", func(payload ...any) { listener(payload[0].(uint8), payload[1].(string), payload[2].(uint8), payload[3].(uint8)) }) } diff --git a/internal/http/logger.go b/internal/http/logger.go index ae804e97..3cdf5922 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -22,7 +22,7 @@ func (l *logFormatter) NewLogEntry(r *http.Request) middleware.LogEntry { return &nulllog{} } - req := map[string]interface{}{} + req := map[string]any{} if reqID := middleware.GetReqID(r.Context()); reqID != "" { req["id"] = reqID @@ -57,7 +57,7 @@ type logPanic struct { stack string } -func (e *logEntry) Panic(v interface{}, stack []byte) { +func (e *logEntry) Panic(v any, stack []byte) { e.panic = &logPanic{ message: fmt.Sprintf("%+v", v), stack: string(stack), @@ -72,8 +72,8 @@ func (e *logEntry) SetSession(session types.Session) { e.session = &session } -func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Duration, extra interface{}) { - res := map[string]interface{}{} +func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Duration, extra any) { + res := map[string]any{} res["time"] = time.Now().UTC().Format(time.RFC1123) res["status"] = status res["bytes"] = bytes @@ -128,8 +128,8 @@ func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Dur type nulllog struct{} -func (e *nulllog) Panic(v interface{}, stack []byte) {} -func (e *nulllog) Error(err error) {} -func (e *nulllog) SetSession(session types.Session) {} -func (e *nulllog) Write(status, bytes int, header http.Header, elapsed time.Duration, extra interface{}) { +func (e *nulllog) Panic(v any, stack []byte) {} +func (e *nulllog) Error(err error) {} +func (e *nulllog) SetSession(session types.Session) {} +func (e *nulllog) Write(status, bytes int, header http.Header, elapsed time.Duration, extra any) { } diff --git a/internal/session/manager.go b/internal/session/manager.go index edfad97d..ee82e7a3 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -237,13 +237,13 @@ func (manager *SessionManagerCtx) PopCursors() map[types.Session][]types.Cursor // broadcasts // --- -func (manager *SessionManagerCtx) Broadcast(event string, payload interface{}, exclude interface{}) { +func (manager *SessionManagerCtx) Broadcast(event string, payload any, exclude ...string) { for _, session := range manager.List() { if !session.State().IsConnected { continue } - if exclude != nil { + if len(exclude) > 0 { if in, _ := utils.ArrayIn(session.ID(), exclude); in { continue } @@ -253,13 +253,13 @@ func (manager *SessionManagerCtx) Broadcast(event string, payload interface{}, e } } -func (manager *SessionManagerCtx) AdminBroadcast(event string, payload interface{}, exclude interface{}) { +func (manager *SessionManagerCtx) AdminBroadcast(event string, payload any, exclude ...string) { for _, session := range manager.List() { if !session.State().IsConnected || !session.Profile().IsAdmin { continue } - if exclude != nil { + if len(exclude) > 0 { if in, _ := utils.ArrayIn(session.ID(), exclude); in { continue } @@ -269,13 +269,13 @@ func (manager *SessionManagerCtx) AdminBroadcast(event string, payload interface } } -func (manager *SessionManagerCtx) InactiveCursorsBroadcast(event string, payload interface{}, exclude interface{}) { +func (manager *SessionManagerCtx) InactiveCursorsBroadcast(event string, payload any, exclude ...string) { for _, session := range manager.List() { if !session.State().IsConnected || !session.Profile().CanSeeInactiveCursors { continue } - if exclude != nil { + if len(exclude) > 0 { if in, _ := utils.ArrayIn(session.ID(), exclude); in { continue } @@ -290,43 +290,43 @@ func (manager *SessionManagerCtx) InactiveCursorsBroadcast(event string, payload // --- func (manager *SessionManagerCtx) OnCreated(listener func(session types.Session)) { - manager.emmiter.On("created", func(payload ...interface{}) { + manager.emmiter.On("created", func(payload ...any) { listener(payload[0].(*SessionCtx)) }) } func (manager *SessionManagerCtx) OnDeleted(listener func(session types.Session)) { - manager.emmiter.On("deleted", func(payload ...interface{}) { + manager.emmiter.On("deleted", func(payload ...any) { listener(payload[0].(*SessionCtx)) }) } func (manager *SessionManagerCtx) OnConnected(listener func(session types.Session)) { - manager.emmiter.On("connected", func(payload ...interface{}) { + manager.emmiter.On("connected", func(payload ...any) { listener(payload[0].(*SessionCtx)) }) } func (manager *SessionManagerCtx) OnDisconnected(listener func(session types.Session)) { - manager.emmiter.On("disconnected", func(payload ...interface{}) { + manager.emmiter.On("disconnected", func(payload ...any) { listener(payload[0].(*SessionCtx)) }) } func (manager *SessionManagerCtx) OnProfileChanged(listener func(session types.Session)) { - manager.emmiter.On("profile_changed", func(payload ...interface{}) { + manager.emmiter.On("profile_changed", func(payload ...any) { listener(payload[0].(*SessionCtx)) }) } func (manager *SessionManagerCtx) OnStateChanged(listener func(session types.Session)) { - manager.emmiter.On("state_changed", func(payload ...interface{}) { + manager.emmiter.On("state_changed", func(payload ...any) { listener(payload[0].(*SessionCtx)) }) } func (manager *SessionManagerCtx) OnHostChanged(listener func(session types.Session)) { - manager.emmiter.On("host_changed", func(payload ...interface{}) { + manager.emmiter.On("host_changed", func(payload ...any) { if payload[0] == nil { listener(nil) } else { @@ -336,7 +336,7 @@ func (manager *SessionManagerCtx) OnHostChanged(listener func(session types.Sess } func (manager *SessionManagerCtx) OnSettingsChanged(listener func(new types.Settings, old types.Settings)) { - manager.emmiter.On("settings_changed", func(payload ...interface{}) { + manager.emmiter.On("settings_changed", func(payload ...any) { listener(payload[0].(types.Settings), payload[1].(types.Settings)) }) } diff --git a/internal/session/session.go b/internal/session/session.go index 9590a1cd..43af7173 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -119,7 +119,7 @@ func (session *SessionCtx) GetWebSocketPeer() types.WebSocketPeer { return session.websocketPeer } -func (session *SessionCtx) Send(event string, payload interface{}) { +func (session *SessionCtx) Send(event string, payload any) { peer := session.GetWebSocketPeer() if peer != nil { peer.Send(event, payload) diff --git a/internal/webrtc/peerconnection.go b/internal/webrtc/peerconnection.go index bf8d013c..c2d6ab15 100644 --- a/internal/webrtc/peerconnection.go +++ b/internal/webrtc/peerconnection.go @@ -83,7 +83,7 @@ func (manager *WebRTCManagerCtx) peerConfiguration() webrtc.Configuration { ICEServers := []webrtc.ICEServer{} for _, server := range manager.config.ICEServers { - var credential interface{} + var credential any if server.Credential != "" { credential = server.Credential } else { diff --git a/internal/webrtc/pionlog/logger.go b/internal/webrtc/pionlog/logger.go index f9e66172..0bb0c292 100644 --- a/internal/webrtc/pionlog/logger.go +++ b/internal/webrtc/pionlog/logger.go @@ -16,7 +16,7 @@ func (l logger) Trace(msg string) { l.logger.Trace().Msg(strings.TrimSpace(msg)) } -func (l logger) Tracef(format string, args ...interface{}) { +func (l logger) Tracef(format string, args ...any) { msg := fmt.Sprintf(format, args...) l.logger.Trace().Msg(strings.TrimSpace(msg)) } @@ -25,7 +25,7 @@ func (l logger) Debug(msg string) { l.logger.Debug().Msg(strings.TrimSpace(msg)) } -func (l logger) Debugf(format string, args ...interface{}) { +func (l logger) Debugf(format string, args ...any) { msg := fmt.Sprintf(format, args...) l.logger.Debug().Msg(strings.TrimSpace(msg)) } @@ -38,7 +38,7 @@ func (l logger) Info(msg string) { l.logger.Info().Msg(strings.TrimSpace(msg)) } -func (l logger) Infof(format string, args ...interface{}) { +func (l logger) Infof(format string, args ...any) { msg := fmt.Sprintf(format, args...) if strings.Contains(msg, "duplicated packet") { return @@ -51,7 +51,7 @@ func (l logger) Warn(msg string) { l.logger.Warn().Msg(strings.TrimSpace(msg)) } -func (l logger) Warnf(format string, args ...interface{}) { +func (l logger) Warnf(format string, args ...any) { msg := fmt.Sprintf(format, args...) l.logger.Warn().Msg(strings.TrimSpace(msg)) } @@ -60,7 +60,7 @@ func (l logger) Error(msg string) { l.logger.Error().Msg(strings.TrimSpace(msg)) } -func (l logger) Errorf(format string, args ...interface{}) { +func (l logger) Errorf(format string, args ...any) { msg := fmt.Sprintf(format, args...) l.logger.Error().Msg(strings.TrimSpace(msg)) } diff --git a/internal/webrtc/pionlog/nullog.go b/internal/webrtc/pionlog/nullog.go index 4b9c9e90..2d136d04 100644 --- a/internal/webrtc/pionlog/nullog.go +++ b/internal/webrtc/pionlog/nullog.go @@ -2,13 +2,13 @@ package pionlog type nulllog struct{} -func (l nulllog) Trace(msg string) {} -func (l nulllog) Tracef(format string, args ...interface{}) {} -func (l nulllog) Debug(msg string) {} -func (l nulllog) Debugf(format string, args ...interface{}) {} -func (l nulllog) Info(msg string) {} -func (l nulllog) Infof(format string, args ...interface{}) {} -func (l nulllog) Warn(msg string) {} -func (l nulllog) Warnf(format string, args ...interface{}) {} -func (l nulllog) Error(msg string) {} -func (l nulllog) Errorf(format string, args ...interface{}) {} +func (l nulllog) Trace(msg string) {} +func (l nulllog) Tracef(format string, args ...any) {} +func (l nulllog) Debug(msg string) {} +func (l nulllog) Debugf(format string, args ...any) {} +func (l nulllog) Info(msg string) {} +func (l nulllog) Infof(format string, args ...any) {} +func (l nulllog) Warn(msg string) {} +func (l nulllog) Warnf(format string, args ...any) {} +func (l nulllog) Error(msg string) {} +func (l nulllog) Errorf(format string, args ...any) {} diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index 3ee39238..a2fab187 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -26,7 +26,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { event.FILE_CHOOSER_DIALOG_OPENED, message.SessionID{ ID: host.ID(), - }, nil) + }) }) // when dialog closes, everyone should be notified. @@ -37,7 +37,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { go manager.sessions.Broadcast( event.FILE_CHOOSER_DIALOG_CLOSED, - message.SessionID{}, nil) + message.SessionID{}) }) // when new user joins, and someone holds dialog, he shouldd be notified about it. diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index 189f5b52..a01abd35 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -18,6 +18,6 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc return err } - h.sessions.Broadcast(event.SCREEN_UPDATED, payload, nil) + h.sessions.Broadcast(event.SCREEN_UPDATED, payload) return nil } diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index 211e5c83..d836e952 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -33,7 +33,7 @@ func (h *MessageHandlerCtx) sendBroadcast(session types.Session, payload *messag Sender: session.ID(), Subject: payload.Subject, Body: payload.Body, - }, []string{session.ID()}) + }, session.ID()) return nil } diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 2c759776..8d621026 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -13,7 +13,7 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { ID: session.ID(), Profile: session.Profile(), State: session.State(), - }, nil) + }) return nil } @@ -23,7 +23,7 @@ func (h *MessageHandlerCtx) SessionDeleted(session types.Session) error { event.SESSION_DELETED, message.SessionID{ ID: session.ID(), - }, nil) + }) return nil } @@ -58,7 +58,7 @@ func (h *MessageHandlerCtx) SessionProfileChanged(session types.Session) error { message.MemberProfile{ ID: session.ID(), MemberProfile: session.Profile(), - }, nil) + }) return nil } @@ -69,7 +69,7 @@ func (h *MessageHandlerCtx) SessionStateChanged(session types.Session) error { message.SessionState{ ID: session.ID(), SessionState: session.State(), - }, nil) + }) return nil } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 5963d9ab..b5eb0ad2 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -105,7 +105,7 @@ func (manager *WebSocketManagerCtx) Start() { payload.HostID = session.ID() } - manager.sessions.Broadcast(event.CONTROL_HOST, payload, nil) + manager.sessions.Broadcast(event.CONTROL_HOST, payload) manager.logger.Info(). Bool("has_host", payload.HasHost). @@ -124,7 +124,7 @@ func (manager *WebSocketManagerCtx) Start() { manager.stopInactiveCursors() } - manager.sessions.Broadcast(event.SYSTEM_SETTINGS, new, nil) + manager.sessions.Broadcast(event.SYSTEM_SETTINGS, new) manager.logger.Info(). Interface("new", new). Interface("old", old). @@ -347,7 +347,7 @@ func (manager *WebSocketManagerCtx) startInactiveCursors() { // remove last cursor entries and send empty message _ = manager.sessions.PopCursors() - manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, []message.SessionCursors{}, nil) + manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, []message.SessionCursors{}) return case <-ticker.C: cursorsMap := manager.sessions.PopCursors() @@ -369,7 +369,7 @@ func (manager *WebSocketManagerCtx) startInactiveCursors() { ) } - manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, sessionCursors, nil) + manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, sessionCursors) } } }() diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index d4176ef9..6d5b1d1a 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -36,7 +36,7 @@ func (peer *WebSocketPeerCtx) setSessionID(sessionId string) { peer.logger = peer.logger.With().Str("session_id", sessionId).Logger() } -func (peer *WebSocketPeerCtx) Send(event string, payload interface{}) { +func (peer *WebSocketPeerCtx) Send(event string, payload any) { peer.mu.Lock() defer peer.mu.Unlock() diff --git a/pkg/types/capture.go b/pkg/types/capture.go index 0f599765..e424e56b 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -79,14 +79,14 @@ type VideoConfig struct { } func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { - values := map[string]interface{}{ + values := map[string]any{ "width": screen.Width, "height": screen.Height, "fps": screen.Rate, } language := []gval.Language{ - gval.Function("round", func(args ...interface{}) (interface{}, error) { + gval.Function("round", func(args ...any) (any, error) { return (int)(math.Round(args[0].(float64))), nil }), } diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index 24bfb67c..cb8470a5 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -32,9 +32,9 @@ type SystemAdmin struct { type SystemLogs = []SystemLog type SystemLog struct { - Level string `json:"level"` - Fields map[string]interface{} `json:"fields"` - Message string `json:"message"` + Level string `json:"level"` + Fields map[string]any `json:"fields"` + Message string `json:"message"` } type SystemDisconnect struct { @@ -163,14 +163,14 @@ type BroadcastStatus struct { ///////////////////////////// type SendUnicast struct { - Sender string `json:"sender"` - Receiver string `json:"receiver"` - Subject string `json:"subject"` - Body interface{} `json:"body"` + Sender string `json:"sender"` + Receiver string `json:"receiver"` + Subject string `json:"subject"` + Body any `json:"body"` } type SendBroadcast struct { - Sender string `json:"sender"` - Subject string `json:"subject"` - Body interface{} `json:"body"` + Sender string `json:"sender"` + Subject string `json:"subject"` + Body any `json:"body"` } diff --git a/pkg/types/session.go b/pkg/types/session.go index 841b1854..10e93244 100644 --- a/pkg/types/session.go +++ b/pkg/types/session.go @@ -43,7 +43,7 @@ type Session interface { SetWebSocketPeer(websocketPeer WebSocketPeer) SetWebSocketConnected(websocketPeer WebSocketPeer, connected bool) GetWebSocketPeer() WebSocketPeer - Send(event string, payload interface{}) + Send(event string, payload any) // webrtc SetWebRTCPeer(webrtcPeer WebRTCPeer) @@ -66,9 +66,9 @@ type SessionManager interface { SetCursor(cursor Cursor, session Session) PopCursors() map[Session][]Cursor - Broadcast(event string, payload interface{}, exclude interface{}) - AdminBroadcast(event string, payload interface{}, exclude interface{}) - InactiveCursorsBroadcast(event string, payload interface{}, exclude interface{}) + Broadcast(event string, payload any, exclude ...string) + AdminBroadcast(event string, payload any, exclude ...string) + InactiveCursorsBroadcast(event string, payload any, exclude ...string) OnCreated(listener func(session Session)) OnDeleted(listener func(session Session)) diff --git a/pkg/types/websocket.go b/pkg/types/websocket.go index 70ce0cb9..213d3af7 100644 --- a/pkg/types/websocket.go +++ b/pkg/types/websocket.go @@ -15,7 +15,7 @@ type WebSocketHandler func(Session, WebSocketMessage) bool type CheckOrigin func(r *http.Request) bool type WebSocketPeer interface { - Send(event string, payload interface{}) + Send(event string, payload any) Ping() error Destroy(reason string) } diff --git a/pkg/utils/array.go b/pkg/utils/array.go index 20b4f8d7..a84853be 100644 --- a/pkg/utils/array.go +++ b/pkg/utils/array.go @@ -1,22 +1,12 @@ package utils -import ( - "reflect" -) +func ArrayIn[T comparable](val T, array []T) (exists bool, index int) { + exists, index = false, -1 -func ArrayIn(val interface{}, array interface{}) (exists bool, index int) { - exists = false - index = -1 - - switch reflect.TypeOf(array).Kind() { - case reflect.Slice: - s := reflect.ValueOf(array) - for i := 0; i < s.Len(); i++ { - if reflect.DeepEqual(val, s.Index(i).Interface()) { - index = i - exists = true - return - } + for i, a := range array { + if a == val { + exists, index = true, i + return } } diff --git a/pkg/utils/color.go b/pkg/utils/color.go index 919887c2..09f0981d 100644 --- a/pkg/utils/color.go +++ b/pkg/utils/color.go @@ -29,6 +29,6 @@ func Color(str string) string { return result + str[lastIndex:] } -func Colorf(format string, a ...interface{}) string { +func Colorf(format string, a ...any) string { return fmt.Sprintf(Color(format), a...) } diff --git a/pkg/utils/http.go b/pkg/utils/http.go index f2b6e79f..e95cf6b4 100644 --- a/pkg/utils/http.go +++ b/pkg/utils/http.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog/log" ) -func HttpJsonRequest(w http.ResponseWriter, r *http.Request, res interface{}) error { +func HttpJsonRequest(w http.ResponseWriter, r *http.Request, res any) error { err := json.NewDecoder(r.Body).Decode(res) if err == nil { @@ -23,7 +23,7 @@ func HttpJsonRequest(w http.ResponseWriter, r *http.Request, res interface{}) er return HttpBadRequest("unable to parse provided data").WithInternalErr(err) } -func HttpJsonResponse(w http.ResponseWriter, code int, res interface{}) { +func HttpJsonResponse(w http.ResponseWriter, code int, res any) { w.Header().Set("Content-Type", "application/json") w.WriteHeader(code) @@ -32,7 +32,7 @@ func HttpJsonResponse(w http.ResponseWriter, code int, res interface{}) { } } -func HttpSuccess(w http.ResponseWriter, res ...interface{}) error { +func HttpSuccess(w http.ResponseWriter, res ...any) error { if len(res) == 0 { w.WriteHeader(http.StatusNoContent) } else { @@ -78,13 +78,13 @@ func (e *HTTPError) WithInternalMsg(msg string) *HTTPError { } // WithInternalMsg adds internal formated message information to the error -func (e *HTTPError) WithInternalMsgf(fmtStr string, args ...interface{}) *HTTPError { +func (e *HTTPError) WithInternalMsgf(fmtStr string, args ...any) *HTTPError { e.InternalMsg = fmt.Sprintf(fmtStr, args...) return e } // Sends error with custom formated message -func (e *HTTPError) Msgf(fmtSt string, args ...interface{}) *HTTPError { +func (e *HTTPError) Msgf(fmtSt string, args ...any) *HTTPError { e.Message = fmt.Sprintf(fmtSt, args...) return e } diff --git a/pkg/utils/json.go b/pkg/utils/json.go index 752a08e1..ff4883b0 100644 --- a/pkg/utils/json.go +++ b/pkg/utils/json.go @@ -5,15 +5,15 @@ import ( "reflect" ) -func Unmarshal(in interface{}, raw []byte, callback func() error) error { +func Unmarshal(in any, raw []byte, callback func() error) error { if err := json.Unmarshal(raw, &in); err != nil { return err } return callback() } -func JsonStringAutoDecode(m interface{}) func(rf reflect.Kind, rt reflect.Kind, data interface{}) (interface{}, error) { - return func(rf reflect.Kind, rt reflect.Kind, data interface{}) (interface{}, error) { +func JsonStringAutoDecode(m any) func(rf reflect.Kind, rt reflect.Kind, data any) (any, error) { + return func(rf reflect.Kind, rt reflect.Kind, data any) (any, error) { if rf != reflect.String || rt == reflect.String { return data, nil } From 81531d74c14e795e1340facb79917c0a515a679b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 21 Jul 2022 18:28:32 +0200 Subject: [PATCH 728/876] websocket move cursor & scroll. --- internal/websocket/handler/control.go | 18 ++++++++++++++++++ internal/websocket/handler/handler.go | 10 ++++++++++ pkg/types/event/events.go | 4 ++-- pkg/types/message/messages.go | 13 +++---------- 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 0b3ff7a1..2533dab2 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -59,6 +59,24 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { return nil } +func (h *MessageHandlerCtx) controlMove(session types.Session, payload *message.ControlPos) error { + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err + } + + h.desktop.Move(payload.X, payload.Y) + return nil +} + +func (h *MessageHandlerCtx) controlScroll(session types.Session, payload *message.ControlPos) error { + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err + } + + h.desktop.Scroll(payload.X, payload.Y) + return nil +} + func (h *MessageHandlerCtx) controlKeyPress(session types.Session, payload *message.ControlKey) error { if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 04b3f9dd..d8bb781e 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -77,6 +77,16 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM err = h.controlRelease(session) case event.CONTROL_REQUEST: err = h.controlRequest(session) + case event.CONTROL_MOVE: + payload := &message.ControlPos{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlMove(session, payload) + }) + case event.CONTROL_SCROLL: + payload := &message.ControlPos{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlScroll(session, payload) + }) case event.CONTROL_KEYPRESS: payload := &message.ControlKey{} err = utils.Unmarshal(payload, data.Payload, func() error { diff --git a/pkg/types/event/events.go b/pkg/types/event/events.go index 60973e40..a72e73f5 100644 --- a/pkg/types/event/events.go +++ b/pkg/types/event/events.go @@ -32,8 +32,8 @@ const ( CONTROL_RELEASE = "control/release" CONTROL_REQUEST = "control/request" // mouse - CONTROL_MOVE = "control/move" // TODO: New. (fallback) - CONTROL_SCROLL = "control/scroll" // TODO: New. (fallback) + CONTROL_MOVE = "control/move" + CONTROL_SCROLL = "control/scroll" // keyboard CONTROL_KEYPRESS = "control/keypress" CONTROL_KEYDOWN = "control/keydown" diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index cb8470a5..9b61c048 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -101,16 +101,9 @@ type ControlHost struct { HostID string `json:"host_id,omitempty"` } -// TODO: New. -type ControlMove struct { - X uint16 `json:"x"` - Y uint16 `json:"y"` -} - -// TODO: New. -type ControlScroll struct { - X int16 `json:"x"` - Y int16 `json:"y"` +type ControlPos struct { + X int `json:"x"` + Y int `json:"y"` } type ControlKey struct { From f4a4e0152ec516cd11609cb26b0651f162515de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 21 Jul 2022 18:28:51 +0200 Subject: [PATCH 729/876] webrtc SetCursorPosition. --- internal/webrtc/manager.go | 4 ++++ internal/websocket/handler/control.go | 2 ++ pkg/types/webrtc.go | 1 + 3 files changed, 7 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index ccba66a8..f7dab19e 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -446,3 +446,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return offer, nil } + +func (manager *WebRTCManagerCtx) SetCursorPosition(x, y int) { + manager.curPosition.Set(x, y) +} diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 2533dab2..9c3f8dfc 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -64,7 +64,9 @@ func (h *MessageHandlerCtx) controlMove(session types.Session, payload *message. return err } + // handle active cursor movement h.desktop.Move(payload.X, payload.Y) + h.webrtc.SetCursorPosition(payload.X, payload.Y) return nil } diff --git a/pkg/types/webrtc.go b/pkg/types/webrtc.go index ab323431..6063f203 100644 --- a/pkg/types/webrtc.go +++ b/pkg/types/webrtc.go @@ -41,4 +41,5 @@ type WebRTCManager interface { ICEServers() []ICEServer CreatePeer(session Session, videoID string) (*webrtc.SessionDescription, error) + SetCursorPosition(x, y int) } From 7d5ec0190a520b226883affefce513f6e5ad252a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 23 Jul 2022 00:22:26 +0200 Subject: [PATCH 730/876] add button events to control WebSocket. --- internal/desktop/xorg.go | 7 +++++++ internal/websocket/handler/control.go | 24 ++++++++++++++++++++++++ internal/websocket/handler/handler.go | 16 ++++++++++++++++ pkg/types/desktop.go | 1 + pkg/types/event/events.go | 7 +++++-- pkg/types/message/messages.go | 4 ++++ 6 files changed, 57 insertions(+), 2 deletions(-) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 8912d13b..a990b144 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -38,6 +38,13 @@ func (manager *DesktopManagerCtx) KeyUp(code uint32) error { return xorg.KeyUp(code) } +func (manager *DesktopManagerCtx) ButtonPress(code uint32) error { + xorg.ResetKeys() + defer xorg.ResetKeys() + + return xorg.ButtonDown(code) +} + func (manager *DesktopManagerCtx) KeyPress(codes ...uint32) error { xorg.ResetKeys() defer xorg.ResetKeys() diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 9c3f8dfc..729d962b 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -79,6 +79,30 @@ func (h *MessageHandlerCtx) controlScroll(session types.Session, payload *messag return nil } +func (h *MessageHandlerCtx) controlButtonPress(session types.Session, payload *message.ControlButton) error { + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err + } + + return h.desktop.ButtonPress(payload.Code) +} + +func (h *MessageHandlerCtx) controlButtonDown(session types.Session, payload *message.ControlButton) error { + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err + } + + return h.desktop.ButtonDown(payload.Code) +} + +func (h *MessageHandlerCtx) controlButtonUp(session types.Session, payload *message.ControlButton) error { + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err + } + + return h.desktop.ButtonUp(payload.Code) +} + func (h *MessageHandlerCtx) controlKeyPress(session types.Session, payload *message.ControlKey) error { if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index d8bb781e..c128c064 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -87,6 +87,21 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM err = utils.Unmarshal(payload, data.Payload, func() error { return h.controlScroll(session, payload) }) + case event.CONTROL_BUTTONPRESS: + payload := &message.ControlButton{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlButtonPress(session, payload) + }) + case event.CONTROL_BUTTONDOWN: + payload := &message.ControlButton{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlButtonDown(session, payload) + }) + case event.CONTROL_BUTTONUP: + payload := &message.ControlButton{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlButtonUp(session, payload) + }) case event.CONTROL_KEYPRESS: payload := &message.ControlKey{} err = utils.Unmarshal(payload, data.Payload, func() error { @@ -102,6 +117,7 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM err = utils.Unmarshal(payload, data.Payload, func() error { return h.controlKeyUp(session, payload) }) + // actions case event.CONTROL_CUT: err = h.controlCut(session) case event.CONTROL_COPY: diff --git a/pkg/types/desktop.go b/pkg/types/desktop.go index f55c877a..ed06c0bf 100644 --- a/pkg/types/desktop.go +++ b/pkg/types/desktop.go @@ -54,6 +54,7 @@ type DesktopManager interface { KeyDown(code uint32) error ButtonUp(code uint32) error KeyUp(code uint32) error + ButtonPress(code uint32) error KeyPress(codes ...uint32) error ResetKeys() ScreenConfigurations() map[int]ScreenConfiguration diff --git a/pkg/types/event/events.go b/pkg/types/event/events.go index a72e73f5..3e773a9c 100644 --- a/pkg/types/event/events.go +++ b/pkg/types/event/events.go @@ -32,8 +32,11 @@ const ( CONTROL_RELEASE = "control/release" CONTROL_REQUEST = "control/request" // mouse - CONTROL_MOVE = "control/move" - CONTROL_SCROLL = "control/scroll" + CONTROL_MOVE = "control/move" + CONTROL_SCROLL = "control/scroll" + CONTROL_BUTTONPRESS = "control/buttonpress" + CONTROL_BUTTONDOWN = "control/buttondown" + CONTROL_BUTTONUP = "control/buttonup" // keyboard CONTROL_KEYPRESS = "control/keypress" CONTROL_KEYDOWN = "control/keydown" diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index 9b61c048..0319be32 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -106,6 +106,10 @@ type ControlPos struct { Y int `json:"y"` } +type ControlButton struct { + Code uint32 `json:"code"` +} + type ControlKey struct { Keysym uint32 `json:"keysym"` } From a6813f994cfc2b055bab6366c82301497cf615ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 23 Jul 2022 00:33:26 +0200 Subject: [PATCH 731/876] ws control buttons & keys add optional pos. --- internal/websocket/handler/control.go | 36 ++++++++++++++++++++++----- pkg/types/message/messages.go | 2 ++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 729d962b..67cfcfa4 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -80,7 +80,11 @@ func (h *MessageHandlerCtx) controlScroll(session types.Session, payload *messag } func (h *MessageHandlerCtx) controlButtonPress(session types.Session, payload *message.ControlButton) error { - if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + if payload.ControlPos != nil { + if err := h.controlMove(session, payload.ControlPos); err != nil { + return err + } + } else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err } @@ -88,7 +92,11 @@ func (h *MessageHandlerCtx) controlButtonPress(session types.Session, payload *m } func (h *MessageHandlerCtx) controlButtonDown(session types.Session, payload *message.ControlButton) error { - if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + if payload.ControlPos != nil { + if err := h.controlMove(session, payload.ControlPos); err != nil { + return err + } + } else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err } @@ -96,7 +104,11 @@ func (h *MessageHandlerCtx) controlButtonDown(session types.Session, payload *me } func (h *MessageHandlerCtx) controlButtonUp(session types.Session, payload *message.ControlButton) error { - if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + if payload.ControlPos != nil { + if err := h.controlMove(session, payload.ControlPos); err != nil { + return err + } + } else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err } @@ -104,7 +116,11 @@ func (h *MessageHandlerCtx) controlButtonUp(session types.Session, payload *mess } func (h *MessageHandlerCtx) controlKeyPress(session types.Session, payload *message.ControlKey) error { - if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + if payload.ControlPos != nil { + if err := h.controlMove(session, payload.ControlPos); err != nil { + return err + } + } else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err } @@ -112,7 +128,11 @@ func (h *MessageHandlerCtx) controlKeyPress(session types.Session, payload *mess } func (h *MessageHandlerCtx) controlKeyDown(session types.Session, payload *message.ControlKey) error { - if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + if payload.ControlPos != nil { + if err := h.controlMove(session, payload.ControlPos); err != nil { + return err + } + } else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err } @@ -120,7 +140,11 @@ func (h *MessageHandlerCtx) controlKeyDown(session types.Session, payload *messa } func (h *MessageHandlerCtx) controlKeyUp(session types.Session, payload *message.ControlKey) error { - if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + if payload.ControlPos != nil { + if err := h.controlMove(session, payload.ControlPos); err != nil { + return err + } + } else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err } diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index 0319be32..cc4172f9 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -107,10 +107,12 @@ type ControlPos struct { } type ControlButton struct { + *ControlPos Code uint32 `json:"code"` } type ControlKey struct { + *ControlPos Keysym uint32 `json:"keysym"` } From 5612b806345f4d1a509a68beda074fa2dea7007f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 1 Aug 2022 00:26:53 +0200 Subject: [PATCH 732/876] add README. --- README.md | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb4b5bc1..290d3623 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,37 @@ -# n.eko core +# neko +This app uses WebRTC to stream a desktop inside of a docker container. Client can be found here: [demodesk/neko-client](https://github.com/demodesk/neko-client). -Virtual environment backend. +For **community edition** neko with GUI and _plug & play_ deployment visit [m1k1o/neko](https://github.com/m1k1o/neko). + +### **m1k1o/neko** vs **demodesk/neko**, why do we have two of them? + +This project started as a fork of [m1k1o/neko](https://github.com/m1k1o/neko). But over time, development went way ahead of the original one in terms of features, updates and refactoring. The goal is to rebase [m1k1o/neko](https://github.com/m1k1o/neko) repository onto this one and move all extra features (such as chat and emotes) to a standalone plugin. + +- This project is aimed to be the engine providing foundation for all applications that are streaming desktop environment using WebRTC to the browser. +- [m1k1o/neko](https://github.com/m1k1o/neko) is meant to be self-hosted replacement for [rabb.it](https://en.wikipedia.org/wiki/Rabb.it): Community edition with well-known GUI, all the social functions (such as chat and emotes) and easy deployment. + +Notable differences to the [m1k1o/neko](https://github.com/m1k1o/neko) are: + +- Go plugin support. +- Multiple encoding qualities simulcast. +- Single cursor for host - cursor image proxying. +- Custom cursor style/badge for participants. +- Inactive cursors (participants that are not hosting). +- Fallback mode and reconnection improvements: + - Watching using screencasting. + - Controlling using websockets. +- Members handling: + - Access control (view, interactivity, clipboard). + - Posibility to add external members providers. + - Persistent login (using cookies). + - Split members and sessions. +- Drag and drop passthrough. +- File upload passthrough (experimental). +- Microphone passthrough. +- Webcam passthrough (experimental). +- Bi-directional text/html clipboard. +- Keyboard layouts/variants. + +## Docs + +*TBD.* From 691150900b29310b72e033239576ccefdee8995c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 26 Aug 2022 20:16:40 +0200 Subject: [PATCH 733/876] Temporary websocket disconnect handling (#6) * fix websocket close log error. * logger session interface no pointer. * websocket delayet disconnect. * session host: save id not pointer to a session. * fix if hostId not stored. --- internal/api/room/control.go | 21 ++++---- internal/http/logger.go | 6 +-- internal/session/manager.go | 27 ++++++---- internal/session/session.go | 41 ++++++++++++++- internal/websocket/filechooserdialog.go | 4 +- internal/websocket/handler/control.go | 2 +- internal/websocket/handler/system.go | 12 +++-- internal/websocket/manager.go | 66 +++++++++++++++---------- pkg/types/session.go | 4 +- 9 files changed, 122 insertions(+), 61 deletions(-) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 7395db33..ad6d27b3 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -19,23 +19,22 @@ type ControlTargetPayload struct { } func (h *RoomHandler) controlStatus(w http.ResponseWriter, r *http.Request) error { - host := h.sessions.GetHost() + host, hasHost := h.sessions.GetHost() - if host != nil { - return utils.HttpSuccess(w, ControlStatusPayload{ - HasHost: true, - HostId: host.ID(), - }) + var hostId string + if hasHost { + hostId = host.ID() } return utils.HttpSuccess(w, ControlStatusPayload{ - HasHost: false, + HasHost: hasHost, + HostId: hostId, }) } func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) error { - host := h.sessions.GetHost() - if host != nil { + _, hasHost := h.sessions.GetHost() + if hasHost { return utils.HttpUnprocessableEntity("there is already a host") } @@ -82,9 +81,9 @@ func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) error } func (h *RoomHandler) controlReset(w http.ResponseWriter, r *http.Request) error { - host := h.sessions.GetHost() + _, hasHost := h.sessions.GetHost() - if host != nil { + if hasHost { h.desktop.ResetKeys() h.sessions.ClearHost() } diff --git a/internal/http/logger.go b/internal/http/logger.go index 3cdf5922..258eec54 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -49,7 +49,7 @@ type logEntry struct { logger zerolog.Logger err error panic *logPanic - session *types.Session + session types.Session } type logPanic struct { @@ -69,7 +69,7 @@ func (e *logEntry) Error(err error) { } func (e *logEntry) SetSession(session types.Session) { - e.session = &session + e.session = session } func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Duration, extra any) { @@ -83,7 +83,7 @@ func (e *logEntry) Write(status, bytes int, header http.Header, elapsed time.Dur // add session ID to logs (if exists) if e.session != nil { - logger = logger.With().Str("session_id", (*e.session).ID()).Logger() + logger = logger.With().Str("session_id", e.session.ID()).Logger() } // handle panic error message diff --git a/internal/session/manager.go b/internal/session/manager.go index ee82e7a3..6498d18d 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -3,6 +3,7 @@ package session import ( "errors" "sync" + "sync/atomic" "github.com/kataras/go-events" "github.com/rs/zerolog" @@ -62,8 +63,7 @@ type SessionManagerCtx struct { sessions map[string]*SessionCtx sessionsMu sync.Mutex - host types.Session - hostMu sync.Mutex + hostId atomic.Value cursors map[types.Session][]types.Cursor cursorsMu sync.Mutex @@ -188,24 +188,33 @@ func (manager *SessionManagerCtx) List() []types.Session { // --- func (manager *SessionManagerCtx) SetHost(host types.Session) { - manager.hostMu.Lock() - manager.host = host - manager.hostMu.Unlock() + var hostId string + if host != nil { + hostId = host.ID() + } + manager.hostId.Store(hostId) manager.emmiter.Emit("host_changed", host) } -func (manager *SessionManagerCtx) GetHost() types.Session { - manager.hostMu.Lock() - defer manager.hostMu.Unlock() +func (manager *SessionManagerCtx) GetHost() (types.Session, bool) { + hostId, ok := manager.hostId.Load().(string) + if !ok || hostId == "" { + return nil, false + } - return manager.host + return manager.Get(hostId) } func (manager *SessionManagerCtx) ClearHost() { manager.SetHost(nil) } +func (manager *SessionManagerCtx) isHost(host types.Session) bool { + hostId, ok := manager.hostId.Load().(string) + return ok && hostId == host.ID() +} + // --- // cursors // --- diff --git a/internal/session/session.go b/internal/session/session.go index 43af7173..ec1dff77 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -2,6 +2,7 @@ package session import ( "sync" + "time" "github.com/rs/zerolog" @@ -9,6 +10,10 @@ import ( "github.com/demodesk/neko/pkg/types/event" ) +// client is expected to reconnect within 5 second +// if some unexpected websocket disconnect happens +const WS_DELAYED_DURATION = 5 * time.Second + type SessionCtx struct { id string token string @@ -20,6 +25,10 @@ type SessionCtx struct { websocketPeer types.WebSocketPeer websocketMu sync.Mutex + // websocket delayed set connected events + wsDelayedMu sync.Mutex + wsDelayedTimer *time.Timer + webrtcPeer types.WebRTCPeer webrtcMu sync.Mutex } @@ -56,7 +65,7 @@ func (session *SessionCtx) State() types.SessionState { } func (session *SessionCtx) IsHost() bool { - return session.manager.GetHost() == session + return session.manager.isHost(session) } func (session *SessionCtx) PrivateModeEnabled() bool { @@ -83,7 +92,7 @@ func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { } } -func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPeer, connected bool) { +func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPeer, connected bool, delayed bool) { session.websocketMu.Lock() isCurrentPeer := websocketPeer == session.websocketPeer session.websocketMu.Unlock() @@ -94,8 +103,36 @@ func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPe session.logger.Info(). Bool("connected", connected). + Bool("delayed", delayed). Msg("set websocket connected") + // + // ws delayed + // + + var wsDelayedTimer *time.Timer + + if delayed { + wsDelayedTimer = time.AfterFunc(WS_DELAYED_DURATION, func() { + session.SetWebSocketConnected(websocketPeer, connected, false) + }) + } + + session.wsDelayedMu.Lock() + if session.wsDelayedTimer != nil { + session.wsDelayedTimer.Stop() + } + session.wsDelayedTimer = wsDelayedTimer + session.wsDelayedMu.Unlock() + + if delayed { + return + } + + // + // not delayed + // + session.state.IsConnected = connected if connected { diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index a2fab187..e134930e 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -13,8 +13,8 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { manager.desktop.OnFileChooserDialogOpened(func() { manager.logger.Info().Msg("file chooser dialog opened") - host := manager.sessions.GetHost() - if host == nil { + host, hasHost := manager.sessions.GetHost() + if !hasHost { manager.logger.Warn().Msg("no host for file chooser dialog found, closing") go manager.desktop.CloseFileChooserDialog() return diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 67cfcfa4..9a21cd1d 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -42,7 +42,7 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { if !h.sessions.Settings().ImplicitHosting { // tell session if there is a host - if host := h.sessions.GetHost(); host != nil { + if host, hasHost := h.sessions.GetHost(); hasHost { session.Send( event.CONTROL_HOST, message.ControlHost{ diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 6d0f2f66..446c4330 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -12,14 +12,16 @@ import ( ) func (h *MessageHandlerCtx) systemInit(session types.Session) error { - host := h.sessions.GetHost() + host, hasHost := h.sessions.GetHost() - controlHost := message.ControlHost{ - HasHost: host != nil, + var hostID string + if hasHost { + hostID = host.ID() } - if controlHost.HasHost { - controlHost.HostID = host.ID() + controlHost := message.ControlHost{ + HasHost: hasHost, + HostID: hostID, } size := h.desktop.GetScreenSize() diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index b5eb0ad2..ac9b3656 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -132,8 +132,8 @@ func (manager *WebSocketManagerCtx) Start() { }) manager.desktop.OnClipboardUpdated(func() { - session := manager.sessions.GetHost() - if session == nil || !session.Profile().CanAccessClipboard { + host, hasHost := manager.sessions.GetHost() + if !hasHost || !host.Profile().CanAccessClipboard { return } @@ -145,7 +145,7 @@ func (manager *WebSocketManagerCtx) Start() { return } - session.Send( + host.Send( event.CLIPBOARD_UPDATED, message.ClipboardData{ Text: data.Text, @@ -232,26 +232,47 @@ func (manager *WebSocketManagerCtx) connect(connection *websocket.Conn, r *http. Str("agent", r.UserAgent()). Msg("connection started") - session.SetWebSocketConnected(peer, true) + session.SetWebSocketConnected(peer, true, false) - defer func() { - logger.Info(). - Str("address", connection.RemoteAddr().String()). - Str("agent", r.UserAgent()). - Msg("connection ended") + // this is a blocking function that lives + // throughout whole websocket connection + err = manager.handle(connection, peer, session) - session.SetWebSocketConnected(peer, false) - }() + logger.Info(). + Str("address", connection.RemoteAddr().String()). + Str("agent", r.UserAgent()). + Msg("connection ended") - manager.handle(connection, peer, session) + delayedDisconnect := false + + e, ok := err.(*websocket.CloseError) + if !ok { + logger.Err(err).Msg("read message error") + // client is expected to reconnect soon + delayedDisconnect = true + } else { + switch e.Code { + case websocket.CloseNormalClosure: + logger.Info().Str("reason", e.Text).Msg("websocket close") + case websocket.CloseGoingAway: + logger.Info().Str("reason", "going away").Msg("websocket close") + default: + logger.Warn().Err(err).Msg("websocket close") + // abnormal websocket closure: + // client is expected to reconnect soon + delayedDisconnect = true + } + } + + session.SetWebSocketConnected(peer, false, delayedDisconnect) } -func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer types.WebSocketPeer, session types.Session) { +func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer types.WebSocketPeer, session types.Session) error { // add session id to logger context logger := manager.logger.With().Str("session_id", session.ID()).Logger() bytes := make(chan []byte) - cancel := make(chan struct{}) + cancel := make(chan error) ticker := time.NewTicker(pingPeriod) defer ticker.Stop() @@ -263,13 +284,7 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer type for { _, raw, err := connection.ReadMessage() if err != nil { - if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { - logger.Warn().Err(err).Msg("read message error") - } else { - logger.Debug().Err(err).Msg("read message error") - } - - close(cancel) + cancel <- err break } @@ -306,15 +321,14 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer type if !handled { logger.Warn().Str("event", data.Event).Msg("unhandled message") } - case <-cancel: - return + case err := <-cancel: + return err case <-manager.shutdown: peer.Destroy("connection shutdown") - return + return nil case <-ticker.C: if err := peer.Ping(); err != nil { - logger.Err(err).Msg("ping message has failed") - return + return err } } } diff --git a/pkg/types/session.go b/pkg/types/session.go index 10e93244..97b8183c 100644 --- a/pkg/types/session.go +++ b/pkg/types/session.go @@ -41,7 +41,7 @@ type Session interface { // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) - SetWebSocketConnected(websocketPeer WebSocketPeer, connected bool) + SetWebSocketConnected(websocketPeer WebSocketPeer, connected bool, delayed bool) GetWebSocketPeer() WebSocketPeer Send(event string, payload any) @@ -60,7 +60,7 @@ type SessionManager interface { List() []Session SetHost(host Session) - GetHost() Session + GetHost() (Session, bool) ClearHost() SetCursor(cursor Cursor, session Session) From 291750c1d7551c33fa982ea7ca63d4c385bb9285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 26 Aug 2022 20:21:00 +0200 Subject: [PATCH 734/876] fix build git repo check. --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index 3bf7f7da..fc8b1fb9 100755 --- a/build +++ b/build @@ -13,7 +13,7 @@ fi # # set git build variables if git exists -if git version > /dev/null && [ -z $GIT_COMMIT ] && [ -z $GIT_BRANCH ] && [ -z $GIT_TAG ]; +if git status 2> /dev/null && [ -z $GIT_COMMIT ] && [ -z $GIT_BRANCH ] && [ -z $GIT_TAG ]; then GIT_COMMIT=`git rev-parse --short HEAD` GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` From 938ea38cd695273039560e69c0e2c10495402a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 27 Aug 2022 16:59:02 +0200 Subject: [PATCH 735/876] fix build git repo check. --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index fc8b1fb9..d52c69ef 100755 --- a/build +++ b/build @@ -13,7 +13,7 @@ fi # # set git build variables if git exists -if git status 2> /dev/null && [ -z $GIT_COMMIT ] && [ -z $GIT_BRANCH ] && [ -z $GIT_TAG ]; +if git status 2>&1 > /dev/null && [ -z $GIT_COMMIT ] && [ -z $GIT_BRANCH ] && [ -z $GIT_TAG ]; then GIT_COMMIT=`git rev-parse --short HEAD` GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` From 0488976dd6e107d1d04e68c5610f6a4f7400a483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 10 Sep 2022 23:18:16 +0200 Subject: [PATCH 736/876] gstreamer add API. --- pkg/gst/gst.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- pkg/gst/gst.go | 48 +++++++++++++++++++++++++++++++++++++++++++++++- pkg/gst/gst.h | 4 ++++ 3 files changed, 99 insertions(+), 2 deletions(-) diff --git a/pkg/gst/gst.c b/pkg/gst/gst.c index 1bc9cab8..edcc4a29 100644 --- a/pkg/gst/gst.c +++ b/pkg/gst/gst.c @@ -47,7 +47,7 @@ static gboolean gstreamer_bus_call(GstBus *bus, GstMessage *msg, gpointer user_d gstreamer_pipeline_log(ctx, "debug", "got tags from element %s", GST_OBJECT_NAME(msg->src)); - + gst_tag_list_unref(tags); break; } @@ -163,3 +163,50 @@ void gstreamer_pipeline_push(GstPipelineCtx *ctx, void *buffer, int bufferLen) { gst_app_src_push_buffer(GST_APP_SRC(ctx->appsrc), buffer); } } + +gboolean gstreamer_pipeline_set_prop_int(GstPipelineCtx *ctx, char *binName, char *prop, gint value) { + GstElement *el = gst_bin_get_by_name(GST_BIN(ctx->pipeline), binName); + if (el == NULL) return FALSE; + + g_object_set(G_OBJECT(el), + prop, value, + NULL); + + gst_object_unref(el); + return TRUE; +} + +gboolean gstreamer_pipeline_set_caps_framerate(GstPipelineCtx *ctx, const gchar* binName, gint numerator, gint denominator) { + GstElement *el = gst_bin_get_by_name(GST_BIN(ctx->pipeline), binName); + if (el == NULL) return FALSE; + + GstCaps *caps = gst_caps_new_simple("video/x-raw", + "framerate", GST_TYPE_FRACTION, numerator, denominator, + NULL); + + g_object_set(G_OBJECT(el), + "caps", caps, + NULL); + + gst_caps_unref(caps); + gst_object_unref(el); + return TRUE; +} + +gboolean gstreamer_pipeline_set_caps_resolution(GstPipelineCtx *ctx, const gchar* binName, gint width, gint height) { + GstElement *el = gst_bin_get_by_name(GST_BIN(ctx->pipeline), binName); + if (el == NULL) return FALSE; + + GstCaps *caps = gst_caps_new_simple("video/x-raw", + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + NULL); + + g_object_set(G_OBJECT(el), + "caps", caps, + NULL); + + gst_caps_unref(caps); + gst_object_unref(el); + return TRUE; +} diff --git a/pkg/gst/gst.go b/pkg/gst/gst.go index 80498dcb..e98d80fd 100644 --- a/pkg/gst/gst.go +++ b/pkg/gst/gst.go @@ -21,6 +21,7 @@ import ( type Pipeline struct { id int + logger zerolog.Logger Src string Ctx *C.GstPipelineCtx Sample chan types.Sample @@ -56,7 +57,11 @@ func CreatePipeline(pipelineStr string) (*Pipeline, error) { } p := &Pipeline{ - id: int(id), + id: int(id), + logger: log.With(). + Str("module", "capture"). + Str("submodule", "gstreamer"). + Int("pipeline_id", int(id)).Logger(), Src: pipelineStr, Ctx: ctx, Sample: make(chan types.Sample), @@ -107,6 +112,47 @@ func (p *Pipeline) Push(buffer []byte) { C.gstreamer_pipeline_push(p.Ctx, bytes, C.int(len(buffer))) } +func (p *Pipeline) SetPropInt(binName string, prop string, value int) bool { + cBinName := C.CString(binName) + defer C.free(unsafe.Pointer(cBinName)) + + cProp := C.CString(prop) + defer C.free(unsafe.Pointer(cProp)) + + cValue := C.int(value) + + p.logger.Debug().Msgf("setting prop %s of %s to %d", prop, binName, value) + + ok := C.gstreamer_pipeline_set_prop_int(p.Ctx, cBinName, cProp, cValue) + return ok == C.TRUE +} + +func (p *Pipeline) SetCapsFramerate(binName string, numerator, denominator int) bool { + cBinName := C.CString(binName) + cNumerator := C.int(numerator) + cDenominator := C.int(denominator) + + defer C.free(unsafe.Pointer(cBinName)) + + p.logger.Debug().Msgf("setting caps framerate of %s to %d/%d", binName, numerator, denominator) + + ok := C.gstreamer_pipeline_set_caps_framerate(p.Ctx, cBinName, cNumerator, cDenominator) + return ok == C.TRUE +} + +func (p *Pipeline) SetCapsResolution(binName string, width, height int) bool { + cBinName := C.CString(binName) + cWidth := C.int(width) + cHeight := C.int(height) + + defer C.free(unsafe.Pointer(cBinName)) + + p.logger.Debug().Msgf("setting caps resolution of %s to %dx%d", binName, width, height) + + ok := C.gstreamer_pipeline_set_caps_resolution(p.Ctx, cBinName, cWidth, cHeight) + return ok == C.TRUE +} + // gst-inspect-1.0 func CheckPlugins(plugins []string) error { var plugin *C.GstPlugin diff --git a/pkg/gst/gst.h b/pkg/gst/gst.h index f2af6a2e..64598569 100644 --- a/pkg/gst/gst.h +++ b/pkg/gst/gst.h @@ -22,5 +22,9 @@ void gstreamer_pipeline_pause(GstPipelineCtx *ctx); void gstreamer_pipeline_destory(GstPipelineCtx *ctx); void gstreamer_pipeline_push(GstPipelineCtx *ctx, void *buffer, int bufferLen); +gboolean gstreamer_pipeline_set_prop_int(GstPipelineCtx *ctx, char *binName, char *prop, gint value); +gboolean gstreamer_pipeline_set_caps_framerate(GstPipelineCtx *ctx, const gchar* binName, gint numerator, gint denominator); +gboolean gstreamer_pipeline_set_caps_resolution(GstPipelineCtx *ctx, const gchar* binName, gint width, gint height); + void gstreamer_init(void); void gstreamer_loop(void); From 6d2ba7b640a095baf289f1c5e3258b461dc23628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 10 Sep 2022 23:24:27 +0200 Subject: [PATCH 737/876] name caps and encoder. --- pkg/types/capture.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/types/capture.go b/pkg/types/capture.go index e424e56b..5c7a5ab4 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -104,7 +104,7 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { return "", err } - fpsPipeline = fmt.Sprintf("! video/x-raw,framerate=%d/100 ! videoconvert ! queue", int(val*100)) + fpsPipeline = fmt.Sprintf("! capsfilter caps=video/x-raw,framerate=%d/100 name=framerate ! videoconvert ! queue", int(val*100)) } // get scale pipeline @@ -130,11 +130,11 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { return "", err } - scalePipeline = fmt.Sprintf("! videoscale ! video/x-raw,width=%d,height=%d ! queue", w, h) + scalePipeline = fmt.Sprintf("! videoscale ! capsfilter caps=video/x-raw,width=%d,height=%d name=resolution ! queue", w, h) } // get encoder pipeline - encPipeline := fmt.Sprintf("! %s", config.GstEncoder) + encPipeline := fmt.Sprintf("! %s name=encoder", config.GstEncoder) for key, expr := range config.GstParams { if expr == "" { continue From c793ff1ff6d68d136e57b6d3d5cc07a87c2acff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 11 Sep 2022 22:48:55 +0200 Subject: [PATCH 738/876] kataras/go-events@v0.0.3 Once workaround. --- internal/desktop/drop.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index 82332e52..3cb13bcf 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -43,7 +43,12 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { finished := make(chan bool) drop.Emmiter.Once("finish", func(payload ...any) { - finished <- payload[0].(bool) + b, ok := payload[0].(bool) + // workaround until https://github.com/kataras/go-events/pull/8 is merged + if !ok { + b = (payload[0].([]any))[0].(bool) + } + finished <- b }) manager.ResetKeys() From d35c237f48736ff048bb2215406ce88c8d995e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 11 Sep 2022 22:56:17 +0200 Subject: [PATCH 739/876] gst remove main loop. --- pkg/gst/gst.c | 10 ---------- pkg/gst/gst.go | 4 +--- pkg/gst/gst.h | 3 --- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/pkg/gst/gst.c b/pkg/gst/gst.c index edcc4a29..e538f5d1 100644 --- a/pkg/gst/gst.c +++ b/pkg/gst/gst.c @@ -1,15 +1,5 @@ #include "gst.h" -void gstreamer_init(void) { - gst_init(NULL, NULL); -} - -GMainLoop *gstreamer_main_loop = NULL; -void gstreamer_loop(void) { - gstreamer_main_loop = g_main_loop_new (NULL, FALSE); - g_main_loop_run(gstreamer_main_loop); -} - static void gstreamer_pipeline_log(GstPipelineCtx *ctx, char* level, const char* format, ...) { va_list argptr; va_start(argptr, format); diff --git a/pkg/gst/gst.go b/pkg/gst/gst.go index e98d80fd..e21afda1 100644 --- a/pkg/gst/gst.go +++ b/pkg/gst/gst.go @@ -33,9 +33,7 @@ var pipelinesLock sync.Mutex var registry *C.GstRegistry func init() { - C.gstreamer_init() - go C.gstreamer_loop() - + C.gst_init(nil, nil) registry = C.gst_registry_get() } diff --git a/pkg/gst/gst.h b/pkg/gst/gst.h index 64598569..a562ec34 100644 --- a/pkg/gst/gst.h +++ b/pkg/gst/gst.h @@ -25,6 +25,3 @@ void gstreamer_pipeline_push(GstPipelineCtx *ctx, void *buffer, int bufferLen); gboolean gstreamer_pipeline_set_prop_int(GstPipelineCtx *ctx, char *binName, char *prop, gint value); gboolean gstreamer_pipeline_set_caps_framerate(GstPipelineCtx *ctx, const gchar* binName, gint numerator, gint denominator); gboolean gstreamer_pipeline_set_caps_resolution(GstPipelineCtx *ctx, const gchar* binName, gint width, gint height); - -void gstreamer_init(void); -void gstreamer_loop(void); From 23ce5c0cdd21df1694a9d533734435b5334ba5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 11 Sep 2022 23:02:17 +0200 Subject: [PATCH 740/876] switch to gtk popup window. --- pkg/drop/drop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/drop/drop.c b/pkg/drop/drop.c index 25568c07..daae0d16 100644 --- a/pkg/drop/drop.c +++ b/pkg/drop/drop.c @@ -39,7 +39,7 @@ void dragWindowOpen(char **uris) { gtk_init(NULL, NULL); - GtkWidget *widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);; + GtkWidget *widget = gtk_window_new(GTK_WINDOW_POPUP); GtkWindow *window = GTK_WINDOW(widget); gtk_window_move(window, 0, 0); From f512b977084327566dd7078dfba51e9349f0f526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 13 Sep 2022 22:21:08 +0200 Subject: [PATCH 741/876] fix whitespace. --- pkg/xorg/xorg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/xorg/xorg.c b/pkg/xorg/xorg.c index bc545c46..613e95c9 100644 --- a/pkg/xorg/xorg.c +++ b/pkg/xorg/xorg.c @@ -250,14 +250,14 @@ char *XGetScreenshot(int *w, int *h) { *h = height; char *pixels = (char *)malloc(width * height * 3); - for (int row = 0; row < height; row++) { - for (int col = 0; col < width; col++) { - int pos = ((row * width) + col) * 3; + for (int row = 0; row < height; row++) { + for (int col = 0; col < width; col++) { + int pos = ((row * width) + col) * 3; unsigned long pixel = XGetPixel(ximage, col, row); - pixels[pos] = (pixel & ximage->red_mask) >> 16; - pixels[pos+1] = (pixel & ximage->green_mask) >> 8; - pixels[pos+2] = pixel & ximage->blue_mask; + pixels[pos] = (pixel & ximage->red_mask) >> 16; + pixels[pos+1] = (pixel & ximage->green_mask) >> 8; + pixels[pos+2] = pixel & ximage->blue_mask; } } From d5863d8b9578a55696aeb3ab73cf83619395c5e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 13 Sep 2022 22:21:56 +0200 Subject: [PATCH 742/876] set WebRTC video codec H.264 profile-level-id to 42e01f to be compatible with Firefox clients. --- pkg/types/codec/codecs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/types/codec/codecs.go b/pkg/types/codec/codecs.go index d53a5509..b1c9d4ae 100644 --- a/pkg/types/codec/codecs.go +++ b/pkg/types/codec/codecs.go @@ -110,7 +110,7 @@ func H264() RTPCodec { MimeType: webrtc.MimeTypeH264, ClockRate: 90000, Channels: 0, - SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", + SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42e01f", RTCPFeedback: RTCPFeedback, }, // https://gstreamer.freedesktop.org/documentation/x264/index.html From a6f117686f9219de7afecaed26fe4efaaa790f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 17 Sep 2022 17:52:55 +0200 Subject: [PATCH 743/876] create pipeline fn return error. --- internal/capture/manager.go | 24 ++++++++++++++---------- internal/capture/streamsink.go | 24 +++++++++++++----------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 61ef8edb..c1ae62e2 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -67,27 +67,31 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt for video_id, cnf := range config.VideoPipelines { pipelineConf := cnf - createPipeline := func() string { + createPipeline := func() (string, error) { if pipelineConf.GstPipeline != "" { - return strings.Replace(pipelineConf.GstPipeline, "{display}", config.Display, 1) + return strings.Replace(pipelineConf.GstPipeline, "{display}", config.Display, 1), nil } screen := desktop.GetScreenSize() pipeline, err := pipelineConf.GetPipeline(*screen) if err != nil { - logger.Panic().Err(err). - Str("video_id", video_id). - Msg("unable to get video pipeline") + return "", err } return fmt.Sprintf( "ximagesrc display-name=%s show-pointer=false use-damage=false "+ "%s ! appsink name=appsink", config.Display, pipeline, - ) + ), nil } // trigger function to catch evaluation errors at startup - pipeline := createPipeline() + pipeline, err := createPipeline() + if err != nil { + logger.Panic().Err(err). + Str("video_id", video_id). + Msg("failed to create video pipeline") + } + logger.Info(). Str("video_id", video_id). Str("pipeline", pipeline). @@ -104,9 +108,9 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt // sinks broadcast: broadcastNew(broadcastPipeline), screencast: screencastNew(config.ScreencastEnabled, screencastPipeline), - audio: streamSinkNew(config.AudioCodec, func() string { + audio: streamSinkNew(config.AudioCodec, func() (string, error) { if config.AudioPipeline != "" { - return config.AudioPipeline + return config.AudioPipeline, nil } return fmt.Sprintf( @@ -116,7 +120,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! queue "+ "! %s "+ "! appsink name=appsink", config.AudioDevice, config.AudioCodec.Pipeline, - ) + ), nil }, "audio"), videos: videos, videoIDs: config.VideoIDs, diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index 954ed452..a6ab78d8 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -23,10 +23,10 @@ type StreamSinkManagerCtx struct { mu sync.Mutex wg sync.WaitGroup - codec codec.RTPCodec - pipeline *gst.Pipeline - pipelineMu sync.Mutex - pipelineStr func() string + codec codec.RTPCodec + pipeline *gst.Pipeline + pipelineMu sync.Mutex + pipelineFn func() (string, error) listeners map[uintptr]*func(sample types.Sample) listenersMu sync.Mutex @@ -37,17 +37,17 @@ type StreamSinkManagerCtx struct { pipelinesActive prometheus.Gauge } -func streamSinkNew(codec codec.RTPCodec, pipelineStr func() string, video_id string) *StreamSinkManagerCtx { +func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), video_id string) *StreamSinkManagerCtx { logger := log.With(). Str("module", "capture"). Str("submodule", "stream-sink"). Str("video_id", video_id).Logger() manager := &StreamSinkManagerCtx{ - logger: logger, - codec: codec, - pipelineStr: pipelineStr, - listeners: map[uintptr]*func(sample types.Sample){}, + logger: logger, + codec: codec, + pipelineFn: pipelineFn, + listeners: map[uintptr]*func(sample types.Sample){}, // metrics currentListeners: promauto.NewGauge(prometheus.GaugeOpts{ @@ -249,9 +249,11 @@ func (manager *StreamSinkManagerCtx) createPipeline() error { return types.ErrCapturePipelineAlreadyExists } - var err error + pipelineStr, err := manager.pipelineFn() + if err != nil { + return err + } - pipelineStr := manager.pipelineStr() manager.logger.Info(). Str("codec", manager.codec.Name). Str("src", pipelineStr). From 3eedbbf8eae161a61987d79df3a2ceb857fee9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 17 Sep 2022 18:00:25 +0200 Subject: [PATCH 744/876] broadcast pipeline fn. --- internal/capture/broadcast.go | 25 +++++++++---------- internal/capture/manager.go | 46 +++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 6f032b33..012505b9 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -1,7 +1,6 @@ package capture import ( - "strings" "sync" "github.com/prometheus/client_golang/prometheus" @@ -17,9 +16,9 @@ type BroacastManagerCtx struct { logger zerolog.Logger mu sync.Mutex - pipeline *gst.Pipeline - pipelineStr string - pipelineMu sync.Mutex + pipeline *gst.Pipeline + pipelineMu sync.Mutex + pipelineFn func(url string) (string, error) url string started bool @@ -29,17 +28,17 @@ type BroacastManagerCtx struct { pipelinesActive prometheus.Gauge } -func broadcastNew(pipelineStr string) *BroacastManagerCtx { +func broadcastNew(pipelineFn func(url string) (string, error), defaultUrl string) *BroacastManagerCtx { logger := log.With(). Str("module", "capture"). Str("submodule", "broadcast"). Logger() return &BroacastManagerCtx{ - logger: logger, - pipelineStr: pipelineStr, - url: "", - started: false, + logger: logger, + pipelineFn: pipelineFn, + url: defaultUrl, + started: defaultUrl != "", // metrics pipelinesCounter: promauto.NewCounter(prometheus.CounterOpts{ @@ -119,10 +118,10 @@ func (manager *BroacastManagerCtx) createPipeline() error { return types.ErrCapturePipelineAlreadyExists } - var err error - - // replace {url} with valid URL - pipelineStr := strings.Replace(manager.pipelineStr, "{url}", manager.url, 1) + pipelineStr, err := manager.pipelineFn(manager.url) + if err != nil { + return err + } manager.logger.Info(). Str("src", pipelineStr). diff --git a/internal/capture/manager.go b/internal/capture/manager.go index c1ae62e2..61ecc2ee 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -32,25 +32,6 @@ type CaptureManagerCtx struct { func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { logger := log.With().Str("module", "capture").Logger() - broadcastPipeline := config.BroadcastPipeline - if broadcastPipeline == "" { - broadcastPipeline = fmt.Sprintf( - "flvmux name=mux ! rtmpsink location='{url} live=1' "+ - "pulsesrc device=%s "+ - "! audio/x-raw,channels=2 "+ - "! audioconvert "+ - "! queue "+ - "! voaacenc bitrate=%d "+ - "! mux. "+ - "ximagesrc display-name=%s show-pointer=true use-damage=false "+ - "! video/x-raw "+ - "! videoconvert "+ - "! queue "+ - "! x264enc threads=4 bitrate=%d key-int-max=15 byte-stream=true tune=zerolatency speed-preset=%s "+ - "! mux.", config.AudioDevice, config.BroadcastAudioBitrate*1000, config.Display, config.BroadcastVideoBitrate, config.BroadcastPreset, - ) - } - screencastPipeline := config.ScreencastPipeline if screencastPipeline == "" { screencastPipeline = fmt.Sprintf( @@ -69,6 +50,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt createPipeline := func() (string, error) { if pipelineConf.GstPipeline != "" { + // replace {display} with valid display return strings.Replace(pipelineConf.GstPipeline, "{display}", config.Display, 1), nil } @@ -106,11 +88,33 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt desktop: desktop, // sinks - broadcast: broadcastNew(broadcastPipeline), + broadcast: broadcastNew(func(url string) (string, error) { + if config.BroadcastPipeline != "" { + // replace {url} with valid URL + return strings.Replace(config.BroadcastPipeline, "{url}", url, 1), nil + } + + return fmt.Sprintf( + "flvmux name=mux ! rtmpsink location='%s live=1' "+ + "pulsesrc device=%s "+ + "! audio/x-raw,channels=2 "+ + "! audioconvert "+ + "! queue "+ + "! voaacenc bitrate=%d "+ + "! mux. "+ + "ximagesrc display-name=%s show-pointer=true use-damage=false "+ + "! video/x-raw "+ + "! videoconvert "+ + "! queue "+ + "! x264enc threads=4 bitrate=%d key-int-max=15 byte-stream=true tune=zerolatency speed-preset=%s "+ + "! mux.", url, config.AudioDevice, config.BroadcastAudioBitrate*1000, config.Display, config.BroadcastVideoBitrate, config.BroadcastPreset, + ), nil + }, ""), screencast: screencastNew(config.ScreencastEnabled, screencastPipeline), audio: streamSinkNew(config.AudioCodec, func() (string, error) { if config.AudioPipeline != "" { - return config.AudioPipeline, nil + // replace {device} with valid device + return strings.Replace(config.AudioPipeline, "{device}", config.AudioDevice, 1), nil } return fmt.Sprintf( From da24f92e7259d0ad64272d3d0e10b4ab8cc16d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 21 Sep 2022 18:58:46 +0200 Subject: [PATCH 745/876] broadcast log url. --- internal/capture/broadcast.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 012505b9..f256818b 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -124,6 +124,7 @@ func (manager *BroacastManagerCtx) createPipeline() error { } manager.logger.Info(). + Str("url", manager.url). Str("src", pipelineStr). Msgf("starting pipeline") From 194fd29679dd5d29a44ffbf6db50676ed610599d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 21 Sep 2022 19:05:42 +0200 Subject: [PATCH 746/876] capture fix replaces for pipelines. --- internal/capture/manager.go | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 61ecc2ee..04de4615 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -32,18 +32,6 @@ type CaptureManagerCtx struct { func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { logger := log.With().Str("module", "capture").Logger() - screencastPipeline := config.ScreencastPipeline - if screencastPipeline == "" { - screencastPipeline = fmt.Sprintf( - "ximagesrc display-name=%s show-pointer=true use-damage=false "+ - "! video/x-raw,framerate=%s "+ - "! videoconvert "+ - "! queue "+ - "! jpegenc quality=%s "+ - "! appsink name=appsink", config.Display, config.ScreencastRate, config.ScreencastQuality, - ) - } - videos := map[string]*StreamSinkManagerCtx{} for video_id, cnf := range config.VideoPipelines { pipelineConf := cnf @@ -90,8 +78,13 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt // sinks broadcast: broadcastNew(func(url string) (string, error) { if config.BroadcastPipeline != "" { + var pipeline = config.BroadcastPipeline + // replace {display} with valid display + pipeline = strings.Replace(pipeline, "{display}", config.Display, 1) + // replace {device} with valid device + pipeline = strings.Replace(pipeline, "{device}", config.AudioDevice, 1) // replace {url} with valid URL - return strings.Replace(config.BroadcastPipeline, "{url}", url, 1), nil + return strings.Replace(pipeline, "{url}", url, 1), nil } return fmt.Sprintf( @@ -110,7 +103,21 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! mux.", url, config.AudioDevice, config.BroadcastAudioBitrate*1000, config.Display, config.BroadcastVideoBitrate, config.BroadcastPreset, ), nil }, ""), - screencast: screencastNew(config.ScreencastEnabled, screencastPipeline), + screencast: screencastNew(config.ScreencastEnabled, func() string { + if config.ScreencastPipeline != "" { + // replace {display} with valid display + return strings.Replace(config.ScreencastPipeline, "{display}", config.Display, 1) + } + + return fmt.Sprintf( + "ximagesrc display-name=%s show-pointer=true use-damage=false "+ + "! video/x-raw,framerate=%s "+ + "! videoconvert "+ + "! queue "+ + "! jpegenc quality=%s "+ + "! appsink name=appsink", config.Display, config.ScreencastRate, config.ScreencastQuality, + ) + }()), audio: streamSinkNew(config.AudioCodec, func() (string, error) { if config.AudioPipeline != "" { // replace {device} with valid device From c34a76c8a3dcbc2de3acb714419e404ad4711e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 21 Sep 2022 19:08:29 +0200 Subject: [PATCH 747/876] broadcast url in config. --- internal/capture/manager.go | 2 +- internal/config/capture.go | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 04de4615..eaee2423 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -102,7 +102,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! x264enc threads=4 bitrate=%d key-int-max=15 byte-stream=true tune=zerolatency speed-preset=%s "+ "! mux.", url, config.AudioDevice, config.BroadcastAudioBitrate*1000, config.Display, config.BroadcastVideoBitrate, config.BroadcastPreset, ), nil - }, ""), + }, config.BroadcastUrl), screencast: screencastNew(config.ScreencastEnabled, func() string { if config.ScreencastPipeline != "" { // replace {display} with valid display diff --git a/internal/config/capture.go b/internal/config/capture.go index 315735b8..a02e0ea7 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -28,6 +28,7 @@ type Capture struct { BroadcastVideoBitrate int BroadcastPreset string BroadcastPipeline string + BroadcastUrl string ScreencastEnabled bool ScreencastRate string @@ -97,6 +98,11 @@ func (Capture) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().String("capture.broadcast.url", "", "initial URL for broadcasting, setting this value will automatically start broadcasting") + if err := viper.BindPFlag("capture.broadcast.url", cmd.PersistentFlags().Lookup("capture.broadcast.url")); err != nil { + return err + } + // screencast cmd.PersistentFlags().Bool("capture.screencast.enabled", false, "enable screencast") if err := viper.BindPFlag("capture.screencast.enabled", cmd.PersistentFlags().Lookup("capture.screencast.enabled")); err != nil { @@ -211,6 +217,7 @@ func (s *Capture) Set() { s.BroadcastVideoBitrate = viper.GetInt("capture.broadcast.video_bitrate") s.BroadcastPreset = viper.GetString("capture.broadcast.preset") s.BroadcastPipeline = viper.GetString("capture.broadcast.pipeline") + s.BroadcastUrl = viper.GetString("capture.broadcast.url") // screencast s.ScreencastEnabled = viper.GetBool("capture.screencast.enabled") From 0badeeee36a08fc2958a70bfdfc54d6c678aba68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 4 Oct 2022 20:21:40 +0200 Subject: [PATCH 748/876] Fix cursor size. (#10) * fix cursor size. * folders -> config. --- Dockerfile | 1 + runtime/.Xresources | 1 + 2 files changed, 2 insertions(+) create mode 100644 runtime/.Xresources diff --git a/Dockerfile b/Dockerfile index d64f563f..8c9b04ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,6 +99,7 @@ RUN set -eux; \ # # copy runtime configs +COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources COPY runtime/dbus /usr/bin/dbus COPY runtime/default.pa /etc/pulse/default.pa COPY runtime/supervisord.conf /etc/neko/supervisord.conf diff --git a/runtime/.Xresources b/runtime/.Xresources new file mode 100644 index 00000000..13e6900f --- /dev/null +++ b/runtime/.Xresources @@ -0,0 +1 @@ +Xcursor.size: 16 From 095f9fe8ee9da88c9a6956f1cf8454dca7985b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 13 Oct 2022 19:57:31 +0200 Subject: [PATCH 749/876] gst as interface. (#11) --- internal/capture/broadcast.go | 2 +- internal/capture/screencast.go | 6 +- internal/capture/streamsink.go | 4 +- internal/capture/streamsrc.go | 2 +- pkg/gst/gst.go | 104 ++++++++++++++++++++------------- 5 files changed, 72 insertions(+), 46 deletions(-) diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index f256818b..2ded2cd0 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -16,7 +16,7 @@ type BroacastManagerCtx struct { logger zerolog.Logger mu sync.Mutex - pipeline *gst.Pipeline + pipeline gst.Pipeline pipelineMu sync.Mutex pipelineFn func(url string) (string, error) diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 0383c7f9..272b3964 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -23,7 +23,7 @@ type ScreencastManagerCtx struct { mu sync.Mutex wg sync.WaitGroup - pipeline *gst.Pipeline + pipeline gst.Pipeline pipelineStr string pipelineMu sync.Mutex @@ -202,7 +202,7 @@ func (manager *ScreencastManagerCtx) createPipeline() error { // get first image select { - case image, ok := <-manager.pipeline.Sample: + case image, ok := <-manager.pipeline.Sample(): if !ok { return errors.New("unable to get first image") } else { @@ -220,7 +220,7 @@ func (manager *ScreencastManagerCtx) createPipeline() error { defer manager.wg.Done() for { - image, ok := <-pipeline.Sample + image, ok := <-pipeline.Sample() if !ok { manager.logger.Debug().Msg("stopped receiving images") return diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index a6ab78d8..25df5259 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -24,7 +24,7 @@ type StreamSinkManagerCtx struct { wg sync.WaitGroup codec codec.RTPCodec - pipeline *gst.Pipeline + pipeline gst.Pipeline pipelineMu sync.Mutex pipelineFn func() (string, error) @@ -275,7 +275,7 @@ func (manager *StreamSinkManagerCtx) createPipeline() error { defer manager.wg.Done() for { - sample, ok := <-pipeline.Sample + sample, ok := <-pipeline.Sample() if !ok { manager.logger.Debug().Msg("stopped emitting samples") return diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index 89abca08..a3bec254 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -20,7 +20,7 @@ type StreamSrcManagerCtx struct { codecPipeline map[string]string // codec -> pipeline codec codec.RTPCodec - pipeline *gst.Pipeline + pipeline gst.Pipeline pipelineMu sync.Mutex pipelineStr string diff --git a/pkg/gst/gst.go b/pkg/gst/gst.go index e21afda1..3a9e686a 100644 --- a/pkg/gst/gst.go +++ b/pkg/gst/gst.go @@ -19,25 +19,44 @@ import ( "github.com/demodesk/neko/pkg/types" ) -type Pipeline struct { - id int - logger zerolog.Logger - Src string - Ctx *C.GstPipelineCtx - Sample chan types.Sample -} - -var pSerial int32 -var pipelines = make(map[int]*Pipeline) -var pipelinesLock sync.Mutex -var registry *C.GstRegistry +var ( + pSerial int32 + pipelines = make(map[int]*pipeline) + pipelinesLock sync.Mutex + registry *C.GstRegistry +) func init() { C.gst_init(nil, nil) registry = C.gst_registry_get() } -func CreatePipeline(pipelineStr string) (*Pipeline, error) { +type Pipeline interface { + Src() string + Sample() chan types.Sample + // attach sink or src to pipeline + AttachAppsink(sinkName string) + AttachAppsrc(srcName string) + // control pipeline lifecycle + Play() + Pause() + Destroy() + Push(buffer []byte) + // modify the property of a bin + SetPropInt(binName string, prop string, value int) bool + SetCapsFramerate(binName string, numerator, denominator int) bool + SetCapsResolution(binName string, width, height int) bool +} + +type pipeline struct { + id int + logger zerolog.Logger + src string + ctx *C.GstPipelineCtx + sample chan types.Sample +} + +func CreatePipeline(pipelineStr string) (Pipeline, error) { id := atomic.AddInt32(&pSerial, 1) pipelineStrUnsafe := C.CString(pipelineStr) @@ -54,63 +73,70 @@ func CreatePipeline(pipelineStr string) (*Pipeline, error) { return nil, fmt.Errorf("(pipeline error) %s", C.GoString(gstError.message)) } - p := &Pipeline{ + p := &pipeline{ id: int(id), logger: log.With(). Str("module", "capture"). Str("submodule", "gstreamer"). Int("pipeline_id", int(id)).Logger(), - Src: pipelineStr, - Ctx: ctx, - Sample: make(chan types.Sample), + src: pipelineStr, + ctx: ctx, + sample: make(chan types.Sample), } pipelines[p.id] = p return p, nil } -func (p *Pipeline) AttachAppsink(sinkName string) { +func (p *pipeline) Src() string { + return p.src +} + +func (p *pipeline) Sample() chan types.Sample { + return p.sample +} + +func (p *pipeline) AttachAppsink(sinkName string) { sinkNameUnsafe := C.CString(sinkName) defer C.free(unsafe.Pointer(sinkNameUnsafe)) - C.gstreamer_pipeline_attach_appsink(p.Ctx, sinkNameUnsafe) + C.gstreamer_pipeline_attach_appsink(p.ctx, sinkNameUnsafe) } -func (p *Pipeline) AttachAppsrc(srcName string) { +func (p *pipeline) AttachAppsrc(srcName string) { srcNameUnsafe := C.CString(srcName) defer C.free(unsafe.Pointer(srcNameUnsafe)) - C.gstreamer_pipeline_attach_appsrc(p.Ctx, srcNameUnsafe) + C.gstreamer_pipeline_attach_appsrc(p.ctx, srcNameUnsafe) } -func (p *Pipeline) Play() { - C.gstreamer_pipeline_play(p.Ctx) +func (p *pipeline) Play() { + C.gstreamer_pipeline_play(p.ctx) } -func (p *Pipeline) Pause() { - C.gstreamer_pipeline_pause(p.Ctx) +func (p *pipeline) Pause() { + C.gstreamer_pipeline_pause(p.ctx) } -func (p *Pipeline) Destroy() { - C.gstreamer_pipeline_destory(p.Ctx) +func (p *pipeline) Destroy() { + C.gstreamer_pipeline_destory(p.ctx) pipelinesLock.Lock() delete(pipelines, p.id) pipelinesLock.Unlock() - close(p.Sample) - C.free(unsafe.Pointer(p.Ctx)) - p = nil + close(p.sample) + C.free(unsafe.Pointer(p.ctx)) } -func (p *Pipeline) Push(buffer []byte) { +func (p *pipeline) Push(buffer []byte) { bytes := C.CBytes(buffer) defer C.free(bytes) - C.gstreamer_pipeline_push(p.Ctx, bytes, C.int(len(buffer))) + C.gstreamer_pipeline_push(p.ctx, bytes, C.int(len(buffer))) } -func (p *Pipeline) SetPropInt(binName string, prop string, value int) bool { +func (p *pipeline) SetPropInt(binName string, prop string, value int) bool { cBinName := C.CString(binName) defer C.free(unsafe.Pointer(cBinName)) @@ -121,11 +147,11 @@ func (p *Pipeline) SetPropInt(binName string, prop string, value int) bool { p.logger.Debug().Msgf("setting prop %s of %s to %d", prop, binName, value) - ok := C.gstreamer_pipeline_set_prop_int(p.Ctx, cBinName, cProp, cValue) + ok := C.gstreamer_pipeline_set_prop_int(p.ctx, cBinName, cProp, cValue) return ok == C.TRUE } -func (p *Pipeline) SetCapsFramerate(binName string, numerator, denominator int) bool { +func (p *pipeline) SetCapsFramerate(binName string, numerator, denominator int) bool { cBinName := C.CString(binName) cNumerator := C.int(numerator) cDenominator := C.int(denominator) @@ -134,11 +160,11 @@ func (p *Pipeline) SetCapsFramerate(binName string, numerator, denominator int) p.logger.Debug().Msgf("setting caps framerate of %s to %d/%d", binName, numerator, denominator) - ok := C.gstreamer_pipeline_set_caps_framerate(p.Ctx, cBinName, cNumerator, cDenominator) + ok := C.gstreamer_pipeline_set_caps_framerate(p.ctx, cBinName, cNumerator, cDenominator) return ok == C.TRUE } -func (p *Pipeline) SetCapsResolution(binName string, width, height int) bool { +func (p *pipeline) SetCapsResolution(binName string, width, height int) bool { cBinName := C.CString(binName) cWidth := C.int(width) cHeight := C.int(height) @@ -147,7 +173,7 @@ func (p *Pipeline) SetCapsResolution(binName string, width, height int) bool { p.logger.Debug().Msgf("setting caps resolution of %s to %dx%d", binName, width, height) - ok := C.gstreamer_pipeline_set_caps_resolution(p.Ctx, cBinName, cWidth, cHeight) + ok := C.gstreamer_pipeline_set_caps_resolution(p.ctx, cBinName, cWidth, cHeight) return ok == C.TRUE } @@ -175,7 +201,7 @@ func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.i pipelinesLock.Unlock() if ok { - pipeline.Sample <- types.Sample{ + pipeline.sample <- types.Sample{ Data: C.GoBytes(buffer, bufferLen), Duration: time.Duration(duration), } From 5ad5daa6bb58f8c3644ffde2bbdab7964c48468a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 17 Oct 2022 13:39:31 +0200 Subject: [PATCH 750/876] Stream bucket manager (#12) * refactor webrtc. * bind track with a single connection. * audio+video codec. * move stream selection to bucket manager. * audio w/o bucket manager. * revert peer changes. * return video IDs. * destroy & recreate all. * add video ID change. * Track -> Recevier. --- internal/capture/buckets.go | 86 ++++++++++++++++ internal/capture/manager.go | 37 ++----- internal/webrtc/manager.go | 136 ++++++++++++++++++++---- internal/webrtc/peer.go | 60 +++++++++++ internal/webrtc/peerconnection.go | 104 ------------------- internal/webrtc/peerstreamtrack.go | 137 ------------------------- internal/webrtc/send.go | 66 ------------ internal/webrtc/track.go | 148 +++++++++++++++++++++++++++ internal/websocket/handler/signal.go | 2 +- internal/websocket/handler/system.go | 2 +- pkg/types/capture.go | 16 ++- 11 files changed, 438 insertions(+), 356 deletions(-) create mode 100644 internal/capture/buckets.go delete mode 100644 internal/webrtc/peerconnection.go delete mode 100644 internal/webrtc/peerstreamtrack.go delete mode 100644 internal/webrtc/send.go create mode 100644 internal/webrtc/track.go diff --git a/internal/capture/buckets.go b/internal/capture/buckets.go new file mode 100644 index 00000000..c35986aa --- /dev/null +++ b/internal/capture/buckets.go @@ -0,0 +1,86 @@ +package capture + +import ( + "errors" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" +) + +type BucketsManagerCtx struct { + logger zerolog.Logger + codec codec.RTPCodec + streams map[string]*StreamSinkManagerCtx + streamIDs []string +} + +func bucketsNew(codec codec.RTPCodec, streams map[string]*StreamSinkManagerCtx, streamIDs []string) *BucketsManagerCtx { + logger := log.With(). + Str("module", "capture"). + Str("submodule", "buckets"). + Logger() + + return &BucketsManagerCtx{ + logger: logger, + codec: codec, + streams: streams, + streamIDs: streamIDs, + } +} + +func (m *BucketsManagerCtx) shutdown() { + m.logger.Info().Msgf("shutdown") +} + +func (m *BucketsManagerCtx) destroyAll() { + for _, video := range m.streams { + if video.Started() { + video.destroyPipeline() + } + } +} + +func (m *BucketsManagerCtx) recreateAll() error { + for _, video := range m.streams { + if video.Started() { + err := video.createPipeline() + if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { + return err + } + } + } + + return nil +} + +func (m *BucketsManagerCtx) IDs() []string { + return m.streamIDs +} + +func (m *BucketsManagerCtx) Codec() codec.RTPCodec { + return m.codec +} + +func (m *BucketsManagerCtx) SetReceiver(receiver types.Receiver) error { + receiver.OnVideoIdChange(func(videoID string) error { + videoStream, ok := m.streams[videoID] + if !ok { + return types.ErrWebRTCVideoNotFound + } + + return receiver.SetStream(videoStream) + }) + + // TODO: Save receiver. + return nil +} + +func (m *BucketsManagerCtx) RemoveReceiver(receiver types.Receiver) error { + // TODO: Unsubribe from OnVideoIdChange. + // TODO: Remove receiver. + receiver.RemoveStream() + return nil +} diff --git a/internal/capture/manager.go b/internal/capture/manager.go index eaee2423..c15b22fc 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -21,8 +21,7 @@ type CaptureManagerCtx struct { broadcast *BroacastManagerCtx screencast *ScreencastManagerCtx audio *StreamSinkManagerCtx - videos map[string]*StreamSinkManagerCtx - videoIDs []string + video *BucketsManagerCtx // sources webcam *StreamSrcManagerCtx @@ -118,6 +117,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! appsink name=appsink", config.Display, config.ScreencastRate, config.ScreencastQuality, ) }()), + audio: streamSinkNew(config.AudioCodec, func() (string, error) { if config.AudioPipeline != "" { // replace {device} with valid device @@ -133,8 +133,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! appsink name=appsink", config.AudioDevice, config.AudioCodec.Pipeline, ), nil }, "audio"), - videos: videos, - videoIDs: config.VideoIDs, + video: bucketsNew(config.VideoCodec, videos, config.VideoIDs), // sources webcam: streamSrcNew(config.WebcamEnabled, map[string]string{ @@ -195,11 +194,7 @@ func (manager *CaptureManagerCtx) Start() { } manager.desktop.OnBeforeScreenSizeChange(func() { - for _, video := range manager.videos { - if video.Started() { - video.destroyPipeline() - } - } + manager.video.destroyAll() if manager.broadcast.Started() { manager.broadcast.destroyPipeline() @@ -211,13 +206,9 @@ func (manager *CaptureManagerCtx) Start() { }) manager.desktop.OnAfterScreenSizeChange(func() { - for _, video := range manager.videos { - if video.Started() { - err := video.createPipeline() - if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { - manager.logger.Panic().Err(err).Msg("unable to recreate video pipeline") - } - } + err := manager.video.recreateAll() + if err != nil { + manager.logger.Panic().Err(err).Msg("unable to recreate video pipelines") } if manager.broadcast.Started() { @@ -243,10 +234,7 @@ func (manager *CaptureManagerCtx) Shutdown() error { manager.screencast.shutdown() manager.audio.shutdown() - - for _, video := range manager.videos { - video.shutdown() - } + manager.video.shutdown() manager.webcam.shutdown() manager.microphone.shutdown() @@ -266,13 +254,8 @@ func (manager *CaptureManagerCtx) Audio() types.StreamSinkManager { return manager.audio } -func (manager *CaptureManagerCtx) Video(videoID string) (types.StreamSinkManager, bool) { - video, ok := manager.videos[videoID] - return video, ok -} - -func (manager *CaptureManagerCtx) VideoIDs() []string { - return manager.videoIDs +func (manager *CaptureManagerCtx) Video() types.BucketsManager { + return manager.video } func (manager *CaptureManagerCtx) Webcam() types.StreamSrcManager { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index f7dab19e..48f68a92 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -8,6 +8,7 @@ import ( "time" "github.com/pion/ice/v2" + "github.com/pion/interceptor" "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/rs/zerolog" @@ -35,11 +36,37 @@ const keepAliveInterval = 2 * time.Second const rtcpPLIInterval = 3 * time.Second func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { + configuration := webrtc.Configuration{ + SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, + } + + if !config.ICELite { + ICEServers := []webrtc.ICEServer{} + for _, server := range config.ICEServers { + var credential any + if server.Credential != "" { + credential = server.Credential + } else { + credential = false + } + + ICEServers = append(ICEServers, webrtc.ICEServer{ + URLs: server.URLs, + Username: server.Username, + Credential: credential, + }) + } + + configuration.ICEServers = ICEServers + } + return &WebRTCManagerCtx{ logger: log.With().Str("module", "webrtc").Logger(), config: config, metrics: newMetrics(), + webrtcConfiguration: configuration, + desktop: desktop, capture: capture, curImage: cursor.NewImage(desktop), @@ -58,6 +85,8 @@ type WebRTCManagerCtx struct { curImage *cursor.ImageCtx curPosition *cursor.PositionCtx + webrtcConfiguration webrtc.Configuration + tcpMux ice.TCPMux udpMux ice.UDPMux @@ -121,6 +150,70 @@ func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { return manager.config.ICEServers } +func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) { + // create media engine + engine := &webrtc.MediaEngine{} + for _, codec := range codecs { + if err := codec.Register(engine); err != nil { + return nil, err + } + } + + // create setting engine + settings := webrtc.SettingEngine{ + LoggerFactory: pionlog.New(logger), + } + + settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) + settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) + settings.SetLite(manager.config.ICELite) + + var networkType []webrtc.NetworkType + + // udp candidates + if manager.udpMux != nil { + settings.SetICEUDPMux(manager.udpMux) + networkType = append(networkType, + webrtc.NetworkTypeUDP4, + webrtc.NetworkTypeUDP6, + ) + } else if manager.config.EphemeralMax != 0 { + _ = settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) + networkType = append(networkType, + webrtc.NetworkTypeUDP4, + webrtc.NetworkTypeUDP6, + ) + } + + // tcp candidates + if manager.tcpMux != nil { + settings.SetICETCPMux(manager.tcpMux) + networkType = append(networkType, + webrtc.NetworkTypeTCP4, + webrtc.NetworkTypeTCP6, + ) + } + + // enable support for TCP and UDP ICE candidates + settings.SetNetworkTypes(networkType) + + // create interceptor registry + registry := &interceptor.Registry{} + if err := webrtc.RegisterDefaultInterceptors(engine, registry); err != nil { + return nil, err + } + + // create new API + api := webrtc.NewAPI( + webrtc.WithMediaEngine(engine), + webrtc.WithSettingEngine(settings), + webrtc.WithInterceptorRegistry(registry), + ) + + // create new peer connection + return api.NewPeerConnection(manager.webrtcConfiguration) +} + func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) { id := atomic.AddInt32(&manager.peerId, 1) manager.metrics.NewConnection(session) @@ -130,19 +223,16 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin logger.Info().Msg("creating webrtc peer") // all audios must have the same codec - audioStream := manager.capture.Audio() + audio := manager.capture.Audio() + audioCodec := audio.Codec() // all videos must have the same codec - videoStream, ok := manager.capture.Video(videoID) - if !ok { - return nil, types.ErrWebRTCVideoNotFound - } - - manager.metrics.SetVideoID(session, videoID) + video := manager.capture.Video() + videoCodec := video.Codec() connection, err := manager.newPeerConnection([]codec.RTPCodec{ - audioStream.Codec(), - videoStream.Codec(), + audioCodec, + videoCodec, }, logger) if err != nil { return nil, err @@ -166,26 +256,37 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin // audio track - audioTrack, err := manager.newPeerStreamTrack(audioStream, logger) + audioTrack, err := NewTrack(logger, audioCodec, connection) if err != nil { return nil, err } - if err := audioTrack.AddToConnection(connection); err != nil { + // set stream for audio track + err = audioTrack.SetStream(audio) + if err != nil { return nil, err } // video track - videoTrack, err := manager.newPeerStreamTrack(videoStream, logger) + videoTrack, err := NewTrack(logger, videoCodec, connection) if err != nil { return nil, err } - if err := videoTrack.AddToConnection(connection); err != nil { + // let video stream bucket manager handle stream subscriptions + err = video.SetReceiver(videoTrack) + if err != nil { return nil, err } + // set default video id + err = videoTrack.SetVideoID(videoID) + if err != nil { + return nil, err + } + manager.metrics.SetVideoID(session, videoID) + // data channel dataChannel, err := connection.CreateDataChannel("data", nil) @@ -198,13 +299,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin connection: connection, dataChannel: dataChannel, changeVideo: func(videoID string) error { - videoStream, ok := manager.capture.Video(videoID) - if !ok { - return types.ErrWebRTCVideoNotFound + if err := videoTrack.SetVideoID(videoID); err != nil { + return err } manager.metrics.SetVideoID(session, videoID) - return videoTrack.SetStream(videoStream) + return nil }, setPaused: func(isPaused bool) { videoTrack.SetPaused(isPaused) @@ -318,7 +418,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin connection.Close() case webrtc.PeerConnectionStateClosed: session.SetWebRTCConnected(peer, false) - videoTrack.RemoveStream() + video.RemoveReceiver(videoTrack) audioTrack.RemoveStream() } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 0c38cd27..e9be20f1 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -1,11 +1,14 @@ package webrtc import ( + "bytes" + "encoding/binary" "sync" "github.com/pion/webrtc/v3" "github.com/rs/zerolog" + "github.com/demodesk/neko/internal/webrtc/payload" "github.com/demodesk/neko/pkg/types" ) @@ -136,6 +139,63 @@ func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { return nil } +func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { + peer.mu.Lock() + defer peer.mu.Unlock() + + if peer.dataChannel == nil { + return types.ErrWebRTCDataChannelNotFound + } + + data := payload.CursorPosition{ + Header: payload.Header{ + Event: payload.OP_CURSOR_POSITION, + Length: 7, + }, + X: uint16(x), + Y: uint16(y), + } + + buffer := &bytes.Buffer{} + if err := binary.Write(buffer, binary.BigEndian, data); err != nil { + return err + } + + return peer.dataChannel.Send(buffer.Bytes()) +} + +func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage, img []byte) error { + peer.mu.Lock() + defer peer.mu.Unlock() + + if peer.dataChannel == nil { + return types.ErrWebRTCDataChannelNotFound + } + + data := payload.CursorImage{ + Header: payload.Header{ + Event: payload.OP_CURSOR_IMAGE, + Length: uint16(11 + len(img)), + }, + Width: cur.Width, + Height: cur.Height, + Xhot: cur.Xhot, + Yhot: cur.Yhot, + } + + buffer := &bytes.Buffer{} + + if err := binary.Write(buffer, binary.BigEndian, data); err != nil { + return err + } + + if err := binary.Write(buffer, binary.BigEndian, img); err != nil { + return err + } + + return peer.dataChannel.Send(buffer.Bytes()) +} + func (peer *WebRTCPeerCtx) Destroy() { peer.mu.Lock() defer peer.mu.Unlock() diff --git a/internal/webrtc/peerconnection.go b/internal/webrtc/peerconnection.go deleted file mode 100644 index c2d6ab15..00000000 --- a/internal/webrtc/peerconnection.go +++ /dev/null @@ -1,104 +0,0 @@ -package webrtc - -import ( - "github.com/pion/interceptor" - "github.com/pion/webrtc/v3" - "github.com/rs/zerolog" - - "github.com/demodesk/neko/internal/webrtc/pionlog" - "github.com/demodesk/neko/pkg/types/codec" -) - -func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) { - // create media engine - engine := &webrtc.MediaEngine{} - for _, codec := range codecs { - if err := codec.Register(engine); err != nil { - return nil, err - } - } - - // create setting engine - settings := webrtc.SettingEngine{ - LoggerFactory: pionlog.New(logger), - } - - settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) - settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) - settings.SetLite(manager.config.ICELite) - - var networkType []webrtc.NetworkType - - // udp candidates - if manager.udpMux != nil { - settings.SetICEUDPMux(manager.udpMux) - networkType = append(networkType, - webrtc.NetworkTypeUDP4, - webrtc.NetworkTypeUDP6, - ) - } else if manager.config.EphemeralMax != 0 { - _ = settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax) - networkType = append(networkType, - webrtc.NetworkTypeUDP4, - webrtc.NetworkTypeUDP6, - ) - } - - // tcp candidates - if manager.tcpMux != nil { - settings.SetICETCPMux(manager.tcpMux) - networkType = append(networkType, - webrtc.NetworkTypeTCP4, - webrtc.NetworkTypeTCP6, - ) - } - - // enable support for TCP and UDP ICE candidates - settings.SetNetworkTypes(networkType) - - // create interceptor registry - registry := &interceptor.Registry{} - if err := webrtc.RegisterDefaultInterceptors(engine, registry); err != nil { - return nil, err - } - - // create new API - api := webrtc.NewAPI( - webrtc.WithMediaEngine(engine), - webrtc.WithSettingEngine(settings), - webrtc.WithInterceptorRegistry(registry), - ) - - // create new peer connection - configuration := manager.peerConfiguration() - return api.NewPeerConnection(configuration) -} - -func (manager *WebRTCManagerCtx) peerConfiguration() webrtc.Configuration { - if manager.config.ICELite { - return webrtc.Configuration{ - SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, - } - } - - ICEServers := []webrtc.ICEServer{} - for _, server := range manager.config.ICEServers { - var credential any - if server.Credential != "" { - credential = server.Credential - } else { - credential = false - } - - ICEServers = append(ICEServers, webrtc.ICEServer{ - URLs: server.URLs, - Username: server.Username, - Credential: credential, - }) - } - - return webrtc.Configuration{ - ICEServers: ICEServers, - SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, - } -} diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go deleted file mode 100644 index 423b21e0..00000000 --- a/internal/webrtc/peerstreamtrack.go +++ /dev/null @@ -1,137 +0,0 @@ -package webrtc - -import ( - "errors" - "io" - "sync" - - "github.com/pion/rtcp" - "github.com/pion/webrtc/v3" - "github.com/pion/webrtc/v3/pkg/media" - "github.com/rs/zerolog" - - "github.com/demodesk/neko/pkg/types" -) - -func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamSinkManager, logger zerolog.Logger) (*PeerStreamTrack, error) { - codec := stream.Codec() - - id := codec.Type.String() - track, err := webrtc.NewTrackLocalStaticSample(codec.Capability, id, "stream") - if err != nil { - return nil, err - } - - logger = logger.With().Str("id", id).Logger() - - peer := &PeerStreamTrack{ - logger: logger, - track: track, - } - - peer.listener = func(sample types.Sample) { - if peer.paused { - return - } - - err := track.WriteSample(media.Sample(sample)) - if err != nil && errors.Is(err, io.ErrClosedPipe) { - logger.Warn().Err(err).Msg("pipeline failed to write") - } - } - - err = peer.SetStream(stream) - return peer, err -} - -type PeerStreamTrack struct { - logger zerolog.Logger - track *webrtc.TrackLocalStaticSample - paused bool - listener func(sample types.Sample) - - stream types.StreamSinkManager - streamMu sync.Mutex - - onRtcp func(rtcp.Packet) - onRtcpMu sync.RWMutex -} - -func (peer *PeerStreamTrack) SetStream(stream types.StreamSinkManager) error { - peer.streamMu.Lock() - defer peer.streamMu.Unlock() - - var err error - if peer.stream != nil { - err = peer.stream.MoveListenerTo(&peer.listener, stream) - } else { - err = stream.AddListener(&peer.listener) - } - - if err == nil { - peer.stream = stream - } - - return err -} - -func (peer *PeerStreamTrack) RemoveStream() { - peer.streamMu.Lock() - defer peer.streamMu.Unlock() - - if peer.stream != nil { - _ = peer.stream.RemoveListener(&peer.listener) - peer.stream = nil - } -} - -func (peer *PeerStreamTrack) AddToConnection(connection *webrtc.PeerConnection) error { - sender, err := connection.AddTrack(peer.track) - if err != nil { - return err - } - - go func() { - rtcpBuf := make([]byte, 1500) - for { - n, _, err := sender.Read(rtcpBuf) - if err != nil { - if err == io.EOF || err == io.ErrClosedPipe { - return - } - - peer.logger.Err(err).Msg("RTCP read error") - continue - } - - packets, err := rtcp.Unmarshal(rtcpBuf[:n]) - if err != nil { - peer.logger.Err(err).Msg("RTCP unmarshal error") - continue - } - - peer.onRtcpMu.RLock() - handler := peer.onRtcp - peer.onRtcpMu.RUnlock() - - for _, packet := range packets { - if handler != nil { - go handler(packet) - } - } - } - }() - - return nil -} - -func (peer *PeerStreamTrack) SetPaused(paused bool) { - peer.paused = paused -} - -func (peer *PeerStreamTrack) OnRTCP(f func(rtcp.Packet)) { - peer.onRtcpMu.Lock() - defer peer.onRtcpMu.Unlock() - - peer.onRtcp = f -} diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go deleted file mode 100644 index c2d0b992..00000000 --- a/internal/webrtc/send.go +++ /dev/null @@ -1,66 +0,0 @@ -package webrtc - -import ( - "bytes" - "encoding/binary" - - "github.com/demodesk/neko/internal/webrtc/payload" - "github.com/demodesk/neko/pkg/types" -) - -func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { - peer.mu.Lock() - defer peer.mu.Unlock() - - if peer.dataChannel == nil { - return types.ErrWebRTCDataChannelNotFound - } - - data := payload.CursorPosition{ - Header: payload.Header{ - Event: payload.OP_CURSOR_POSITION, - Length: 7, - }, - X: uint16(x), - Y: uint16(y), - } - - buffer := &bytes.Buffer{} - if err := binary.Write(buffer, binary.BigEndian, data); err != nil { - return err - } - - return peer.dataChannel.Send(buffer.Bytes()) -} - -func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage, img []byte) error { - peer.mu.Lock() - defer peer.mu.Unlock() - - if peer.dataChannel == nil { - return types.ErrWebRTCDataChannelNotFound - } - - data := payload.CursorImage{ - Header: payload.Header{ - Event: payload.OP_CURSOR_IMAGE, - Length: uint16(11 + len(img)), - }, - Width: cur.Width, - Height: cur.Height, - Xhot: cur.Xhot, - Yhot: cur.Yhot, - } - - buffer := &bytes.Buffer{} - - if err := binary.Write(buffer, binary.BigEndian, data); err != nil { - return err - } - - if err := binary.Write(buffer, binary.BigEndian, img); err != nil { - return err - } - - return peer.dataChannel.Send(buffer.Bytes()) -} diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go new file mode 100644 index 00000000..6f32282f --- /dev/null +++ b/internal/webrtc/track.go @@ -0,0 +1,148 @@ +package webrtc + +import ( + "errors" + "fmt" + "io" + "sync" + + "github.com/pion/rtcp" + "github.com/pion/webrtc/v3" + "github.com/pion/webrtc/v3/pkg/media" + "github.com/rs/zerolog" + + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" +) + +type Track struct { + logger zerolog.Logger + track *webrtc.TrackLocalStaticSample + paused bool + listener func(sample types.Sample) + + stream types.StreamSinkManager + streamMu sync.Mutex + + onRtcp func(rtcp.Packet) + onRtcpMu sync.RWMutex + + videoIdChange func(string) error +} + +func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.PeerConnection) (*Track, error) { + id := codec.Type.String() + track, err := webrtc.NewTrackLocalStaticSample(codec.Capability, id, "stream") + if err != nil { + return nil, err + } + + logger = logger.With().Str("id", id).Logger() + + t := &Track{ + logger: logger, + track: track, + } + + t.listener = func(sample types.Sample) { + if t.paused { + return + } + + err := track.WriteSample(media.Sample(sample)) + if err != nil && errors.Is(err, io.ErrClosedPipe) { + logger.Warn().Err(err).Msg("pipeline failed to write") + } + } + + sender, err := connection.AddTrack(t.track) + if err != nil { + return nil, err + } + + go t.rtcpReader(sender) + + return t, nil +} + +func (t *Track) rtcpReader(sender *webrtc.RTPSender) { + rtcpBuf := make([]byte, 1500) + for { + n, _, err := sender.Read(rtcpBuf) + if err != nil { + if err == io.EOF || err == io.ErrClosedPipe { + return + } + + t.logger.Err(err).Msg("RTCP read error") + continue + } + + packets, err := rtcp.Unmarshal(rtcpBuf[:n]) + if err != nil { + t.logger.Err(err).Msg("RTCP unmarshal error") + continue + } + + t.onRtcpMu.RLock() + handler := t.onRtcp + t.onRtcpMu.RUnlock() + + for _, packet := range packets { + if handler != nil { + go handler(packet) + } + } + } +} + +func (t *Track) SetStream(stream types.StreamSinkManager) error { + t.streamMu.Lock() + defer t.streamMu.Unlock() + + var err error + if t.stream != nil { + err = t.stream.MoveListenerTo(&t.listener, stream) + } else { + err = stream.AddListener(&t.listener) + } + + if err == nil { + t.stream = stream + } + + return err +} + +func (t *Track) RemoveStream() { + t.streamMu.Lock() + defer t.streamMu.Unlock() + + if t.stream != nil { + _ = t.stream.RemoveListener(&t.listener) + t.stream = nil + } +} + +func (t *Track) SetPaused(paused bool) { + t.paused = paused +} + +func (t *Track) OnRTCP(f func(rtcp.Packet)) { + t.onRtcpMu.Lock() + defer t.onRtcpMu.Unlock() + + t.onRtcp = f +} + +func (t *Track) SetVideoID(videoID string) error { + if t.videoIdChange == nil { + return fmt.Errorf("video id change not supported") + } + + return t.videoIdChange(videoID) +} + +func (t *Track) OnVideoIdChange(f func(string) error) { + t.videoIdChange = f +} diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index d994ffd8..5fa65597 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -15,7 +15,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag // use default first video, if not provided if payload.Video == "" { - videos := h.capture.VideoIDs() + videos := h.capture.Video().IDs() payload.Video = videos[0] } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 446c4330..d914d3cf 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -49,7 +49,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { Settings: h.sessions.Settings(), ScreencastEnabled: h.capture.Screencast().Enabled(), WebRTC: message.SystemWebRTC{ - Videos: h.capture.VideoIDs(), + Videos: h.capture.Video().IDs(), }, }) diff --git a/pkg/types/capture.go b/pkg/types/capture.go index 5c7a5ab4..857132f2 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -19,6 +19,19 @@ var ( type Sample media.Sample +type Receiver interface { + SetStream(stream StreamSinkManager) error + RemoveStream() + OnVideoIdChange(f func(string) error) +} + +type BucketsManager interface { + IDs() []string + Codec() codec.RTPCodec + SetReceiver(receiver Receiver) error + RemoveReceiver(receiver Receiver) error +} + type BroadcastManager interface { Start(url string) error Stop() @@ -60,8 +73,7 @@ type CaptureManager interface { Broadcast() BroadcastManager Screencast() ScreencastManager Audio() StreamSinkManager - Video(videoID string) (StreamSinkManager, bool) - VideoIDs() []string + Video() BucketsManager Webcam() StreamSrcManager Microphone() StreamSrcManager From d608e312ebea41a20f461f6c1ecbcbad879a9bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 23 Oct 2022 11:31:25 +0200 Subject: [PATCH 751/876] check if we already listen to requested stream. (#13) --- internal/webrtc/track.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index 6f32282f..b62c4800 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -100,6 +100,11 @@ func (t *Track) SetStream(stream types.StreamSinkManager) error { t.streamMu.Lock() defer t.streamMu.Unlock() + // if we already listen to the stream, do nothing + if t.stream == stream { + return nil + } + var err error if t.stream != nil { err = t.stream.MoveListenerTo(&t.listener, stream) From e0bee67e85a4c4dee429d5c649227581b9e2c479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 24 Oct 2022 22:54:28 +0200 Subject: [PATCH 752/876] fix build pipe redirection. --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index d52c69ef..ee092a8c 100755 --- a/build +++ b/build @@ -13,7 +13,7 @@ fi # # set git build variables if git exists -if git status 2>&1 > /dev/null && [ -z $GIT_COMMIT ] && [ -z $GIT_BRANCH ] && [ -z $GIT_TAG ]; +if git status > /dev/null 2>&1 && [ -z $GIT_COMMIT ] && [ -z $GIT_BRANCH ] && [ -z $GIT_TAG ]; then GIT_COMMIT=`git rev-parse --short HEAD` GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` From 6067367acd0a6ed08e8d42e12fcda1467862eb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 25 Oct 2022 20:25:00 +0200 Subject: [PATCH 753/876] Capture bandwidth switch (#14) * Handle bitrate change by finding the stream with closest bitrate as peer * Convert video id into bitrate when creating peer or changing bitrate * Try to fix prometheus panic * Revert metrics label name change * minor fixes. * bitrate selector. * skip if moving to the same stream. * no closure for getting target bitrate. * fix: high res switch to lo video, stream bitrate out of range * revert dev config change. * white space. Co-authored-by: Aleksandar Sukovic --- internal/capture/buckets.go | 45 ++++++++++++++++++++-------- internal/capture/manager.go | 19 ++++++++++-- internal/capture/streamsink.go | 28 +++++++++++++---- internal/webrtc/manager.go | 22 +++++++++----- internal/webrtc/peer.go | 17 ++++++++--- internal/webrtc/track.go | 14 ++++----- internal/websocket/handler/signal.go | 38 ++++++++++++++++++----- pkg/types/capture.go | 44 ++++++++++++++++++++++++++- pkg/types/message/messages.go | 5 ++-- pkg/types/webrtc.go | 6 ++-- 10 files changed, 186 insertions(+), 52 deletions(-) diff --git a/internal/capture/buckets.go b/internal/capture/buckets.go index c35986aa..04a87f09 100644 --- a/internal/capture/buckets.go +++ b/internal/capture/buckets.go @@ -2,6 +2,8 @@ package capture import ( "errors" + "fmt" + "math" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -36,17 +38,17 @@ func (m *BucketsManagerCtx) shutdown() { } func (m *BucketsManagerCtx) destroyAll() { - for _, video := range m.streams { - if video.Started() { - video.destroyPipeline() + for _, stream := range m.streams { + if stream.Started() { + stream.destroyPipeline() } } } func (m *BucketsManagerCtx) recreateAll() error { - for _, video := range m.streams { - if video.Started() { - err := video.createPipeline() + for _, stream := range m.streams { + if stream.Started() { + err := stream.createPipeline() if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { return err } @@ -65,22 +67,39 @@ func (m *BucketsManagerCtx) Codec() codec.RTPCodec { } func (m *BucketsManagerCtx) SetReceiver(receiver types.Receiver) error { - receiver.OnVideoIdChange(func(videoID string) error { - videoStream, ok := m.streams[videoID] + receiver.OnBitrateChange(func(bitrate int) error { + stream, ok := m.findNearestStream(bitrate) if !ok { - return types.ErrWebRTCVideoNotFound + return fmt.Errorf("no stream found for bitrate %d", bitrate) } - return receiver.SetStream(videoStream) + return receiver.SetStream(stream) }) - // TODO: Save receiver. return nil } +func (m *BucketsManagerCtx) findNearestStream(bitrate int) (ss *StreamSinkManagerCtx, ok bool) { + minDiff := math.MaxInt + for _, s := range m.streams { + streamBitrate, err := s.Bitrate() + if err != nil { + m.logger.Error().Err(err).Msgf("failed to get bitrate for stream %s", s.ID()) + continue + } + + diffAbs := int(math.Abs(float64(bitrate - streamBitrate))) + + if diffAbs < minDiff { + minDiff, ss = diffAbs, s + } + } + ok = ss != nil + return +} + func (m *BucketsManagerCtx) RemoveReceiver(receiver types.Receiver) error { - // TODO: Unsubribe from OnVideoIdChange. - // TODO: Remove receiver. + receiver.OnBitrateChange(nil) receiver.RemoveStream() return nil } diff --git a/internal/capture/manager.go b/internal/capture/manager.go index c15b22fc..2f96c8e1 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -16,6 +16,7 @@ import ( type CaptureManagerCtx struct { logger zerolog.Logger desktop types.DesktopManager + config *config.Capture // sinks broadcast *BroacastManagerCtx @@ -66,13 +67,18 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt Str("pipeline", pipeline). Msg("syntax check for video stream pipeline passed") + getVideoBitrate := pipelineConf.GetBitrateFn(desktop.GetScreenSize) + if err != nil { + logger.Panic().Err(err).Msg("unable to get video bitrate") + } // append to videos - videos[video_id] = streamSinkNew(config.VideoCodec, createPipeline, video_id) + videos[video_id] = streamSinkNew(config.VideoCodec, createPipeline, video_id, getVideoBitrate) } return &CaptureManagerCtx{ logger: logger, desktop: desktop, + config: config, // sinks broadcast: broadcastNew(func(url string) (string, error) { @@ -132,7 +138,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! %s "+ "! appsink name=appsink", config.AudioDevice, config.AudioCodec.Pipeline, ), nil - }, "audio"), + }, "audio", nil), video: bucketsNew(config.VideoCodec, videos, config.VideoIDs), // sources @@ -242,6 +248,15 @@ func (manager *CaptureManagerCtx) Shutdown() error { return nil } +func (manager *CaptureManagerCtx) GetBitrateFromVideoID(videoID string) (int, error) { + cfg, ok := manager.config.VideoPipelines[videoID] + if !ok { + return 0, fmt.Errorf("video config not found for %s", videoID) + } + + return cfg.GetBitrateFn(manager.desktop.GetScreenSize)() +} + func (manager *CaptureManagerCtx) Broadcast() types.BroadcastManager { return manager.broadcast } diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index 25df5259..cb6225af 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -19,6 +19,9 @@ import ( var moveSinkListenerMu = sync.Mutex{} type StreamSinkManagerCtx struct { + id string + getBitrate func() (int, error) + logger zerolog.Logger mu sync.Mutex wg sync.WaitGroup @@ -37,13 +40,16 @@ type StreamSinkManagerCtx struct { pipelinesActive prometheus.Gauge } -func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), video_id string) *StreamSinkManagerCtx { +func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), id string, getBitrate func() (int, error)) *StreamSinkManagerCtx { logger := log.With(). Str("module", "capture"). Str("submodule", "stream-sink"). - Str("video_id", video_id).Logger() + Str("id", id).Logger() manager := &StreamSinkManagerCtx{ + id: id, + getBitrate: getBitrate, + logger: logger, codec: codec, pipelineFn: pipelineFn, @@ -56,7 +62,7 @@ func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), vide Subsystem: "capture", Help: "Current number of listeners for a pipeline.", ConstLabels: map[string]string{ - "video_id": video_id, + "video_id": id, "codec_name": codec.Name, "codec_type": codec.Type.String(), }, @@ -68,7 +74,7 @@ func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), vide Help: "Total number of created pipelines.", ConstLabels: map[string]string{ "submodule": "streamsink", - "video_id": video_id, + "video_id": id, "codec_name": codec.Name, "codec_type": codec.Type.String(), }, @@ -80,7 +86,7 @@ func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), vide Help: "Total number of active pipelines.", ConstLabels: map[string]string{ "submodule": "streamsink", - "video_id": video_id, + "video_id": id, "codec_name": codec.Name, "codec_type": codec.Type.String(), }, @@ -103,6 +109,18 @@ func (manager *StreamSinkManagerCtx) shutdown() { manager.wg.Wait() } +func (manager *StreamSinkManagerCtx) ID() string { + return manager.id +} + +func (manager *StreamSinkManagerCtx) Bitrate() (int, error) { + if manager.getBitrate == nil { + return 0, nil + } + // recalculate bitrate every time, take screen resolution (and fps) into account + return manager.getBitrate() +} + func (manager *StreamSinkManagerCtx) Codec() codec.RTPCodec { return manager.codec } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 48f68a92..33a6f3df 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -214,7 +214,7 @@ func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logg return api.NewPeerConnection(manager.webrtcConfiguration) } -func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) { +func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int) (*webrtc.SessionDescription, error) { id := atomic.AddInt32(&manager.peerId, 1) manager.metrics.NewConnection(session) @@ -280,11 +280,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin return nil, err } - // set default video id - err = videoTrack.SetVideoID(videoID) - if err != nil { + // set initial video bitrate + if err = videoTrack.SetBitrate(bitrate); err != nil { return nil, err } + + videoID := videoTrack.stream.ID() manager.metrics.SetVideoID(session, videoID) // data channel @@ -298,14 +299,19 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin logger: logger, connection: connection, dataChannel: dataChannel, - changeVideo: func(videoID string) error { - if err := videoTrack.SetVideoID(videoID); err != nil { + changeVideo: func(bitrate int) error { + if err := videoTrack.SetBitrate(bitrate); err != nil { return err } + videoID := videoTrack.stream.ID() manager.metrics.SetVideoID(session, videoID) return nil }, + // TODO: Refactor. + videoId: func() string { + return videoTrack.stream.ID() + }, setPaused: func(isPaused bool) { videoTrack.SetPaused(isPaused) audioTrack.SetPaused(isPaused) @@ -418,7 +424,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin connection.Close() case webrtc.PeerConnectionStateClosed: session.SetWebRTCConnected(peer, false) - video.RemoveReceiver(videoTrack) + if err = video.RemoveReceiver(videoTrack); err != nil { + logger.Err(err).Msg("failed to remove video receiver") + } audioTrack.RemoveStream() } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index e9be20f1..bee30a64 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -17,7 +17,8 @@ type WebRTCPeerCtx struct { logger zerolog.Logger connection *webrtc.PeerConnection dataChannel *webrtc.DataChannel - changeVideo func(videoID string) error + changeVideo func(bitrate int) error + videoId func() string setPaused func(isPaused bool) iceTrickle bool } @@ -114,7 +115,7 @@ func (peer *WebRTCPeerCtx) SetCandidate(candidate webrtc.ICECandidateInit) error return peer.connection.AddICECandidate(candidate) } -func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { +func (peer *WebRTCPeerCtx) SetVideoBitrate(bitrate int) error { peer.mu.Lock() defer peer.mu.Unlock() @@ -122,8 +123,16 @@ func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { return types.ErrWebRTCConnectionNotFound } - peer.logger.Info().Str("video_id", videoID).Msg("change video id") - return peer.changeVideo(videoID) + peer.logger.Info().Int("bitrate", bitrate).Msg("change video bitrate") + return peer.changeVideo(bitrate) +} + +// TODO: Refactor. +func (peer *WebRTCPeerCtx) GetVideoId() string { + peer.mu.Lock() + defer peer.mu.Unlock() + + return peer.videoId() } func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index b62c4800..516af9bf 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -27,7 +27,7 @@ type Track struct { onRtcp func(rtcp.Packet) onRtcpMu sync.RWMutex - videoIdChange func(string) error + bitrateChange func(int) error } func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.PeerConnection) (*Track, error) { @@ -140,14 +140,14 @@ func (t *Track) OnRTCP(f func(rtcp.Packet)) { t.onRtcp = f } -func (t *Track) SetVideoID(videoID string) error { - if t.videoIdChange == nil { - return fmt.Errorf("video id change not supported") +func (t *Track) SetBitrate(bitrate int) error { + if t.bitrateChange == nil { + return fmt.Errorf("bitrate change not supported") } - return t.videoIdChange(videoID) + return t.bitrateChange(bitrate) } -func (t *Track) OnVideoIdChange(f func(string) error) { - t.videoIdChange = f +func (t *Track) OnBitrateChange(f func(int) error) { + t.bitrateChange = f } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 5fa65597..9da371e8 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -19,14 +19,27 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag payload.Video = videos[0] } - offer, err := h.webrtc.CreatePeer(session, payload.Video) + var err error + if payload.Bitrate == 0 { + // get bitrate from video id + payload.Bitrate, err = h.capture.GetBitrateFromVideoID(payload.Video) + if err != nil { + return err + } + } + + offer, err := h.webrtc.CreatePeer(session, payload.Bitrate) if err != nil { return err } - // set webrtc as paused if session has private mode enabled - if webrtcPeer := session.GetWebRTCPeer(); webrtcPeer != nil && session.PrivateModeEnabled() { - webrtcPeer.SetPaused(true) + if webrtcPeer := session.GetWebRTCPeer(); webrtcPeer != nil { + // set webrtc as paused if session has private mode enabled + if session.PrivateModeEnabled() { + webrtcPeer.SetPaused(true) + } + + payload.Video = webrtcPeer.GetVideoId() } session.Send( @@ -34,7 +47,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag message.SignalProvide{ SDP: offer.SDP, ICEServers: h.webrtc.ICEServers(), - Video: payload.Video, + Video: payload.Video, // TODO: Refactor. }) return nil @@ -110,15 +123,24 @@ func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message. return errors.New("webRTC peer does not exist") } - err := peer.SetVideoID(payload.Video) - if err != nil { + var err error + if payload.Bitrate == 0 { + // get bitrate from video id + payload.Bitrate, err = h.capture.GetBitrateFromVideoID(payload.Video) + if err != nil { + return err + } + } + + if err = peer.SetVideoBitrate(payload.Bitrate); err != nil { return err } session.Send( event.SIGNAL_VIDEO, message.SignalVideo{ - Video: payload.Video, + Video: peer.GetVideoId(), // TODO: Refactor. + Bitrate: payload.Bitrate, }) return nil diff --git a/pkg/types/capture.go b/pkg/types/capture.go index 857132f2..a3a490ee 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -22,7 +22,7 @@ type Sample media.Sample type Receiver interface { SetStream(stream StreamSinkManager) error RemoveStream() - OnVideoIdChange(f func(string) error) + OnBitrateChange(f func(int) error) } type BucketsManager interface { @@ -46,6 +46,7 @@ type ScreencastManager interface { } type StreamSinkManager interface { + ID() string Codec() codec.RTPCodec AddListener(listener *func(sample Sample)) error @@ -70,6 +71,8 @@ type CaptureManager interface { Start() Shutdown() error + GetBitrateFromVideoID(videoID string) (int, error) + Broadcast() BroadcastManager Screencast() ScreencastManager Audio() StreamSinkManager @@ -83,6 +86,7 @@ type VideoConfig struct { Width string `mapstructure:"width"` // expression Height string `mapstructure:"height"` // expression Fps string `mapstructure:"fps"` // expression + Bitrate int `mapstructure:"bitrate"` // pipeline bitrate GstPrefix string `mapstructure:"gst_prefix"` // pipeline prefix, starts with ! GstEncoder string `mapstructure:"gst_encoder"` // gst encoder name GstParams map[string]string `mapstructure:"gst_params"` // map of expressions @@ -173,3 +177,41 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { config.GstSuffix, }[:], " "), nil } + +func (config *VideoConfig) GetBitrateFn(getScreen func() *ScreenSize) func() (int, error) { + return func() (int, error) { + if config.Bitrate > 0 { + return config.Bitrate, nil + } + + screen := getScreen() + if screen == nil { + return 0, fmt.Errorf("screen is nil") + } + + values := map[string]any{ + "width": screen.Width, + "height": screen.Height, + "fps": screen.Rate, + } + + language := []gval.Language{ + gval.Function("round", func(args ...any) (any, error) { + return (int)(math.Round(args[0].(float64))), nil + }), + } + + // TODO: This is only for vp8. + expr, ok := config.GstParams["target-bitrate"] + if !ok { + return 0, fmt.Errorf("target-bitrate not found") + } + + targetBitrate, err := gval.Evaluate(expr, values, language...) + if err != nil { + return 0, err + } + + return targetBitrate.(int), nil + } +} diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index cc4172f9..c263a006 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -48,7 +48,7 @@ type SystemDisconnect struct { type SignalProvide struct { SDP string `json:"sdp"` ICEServers []types.ICEServer `json:"iceservers"` - Video string `json:"video"` + Video string `json:"video"` // TODO: Refactor. } type SignalCandidate struct { @@ -60,7 +60,8 @@ type SignalDescription struct { } type SignalVideo struct { - Video string `json:"video"` + Video string `json:"video"` // TODO: Refactor. + Bitrate int `json:"bitrate"` } ///////////////////////////// diff --git a/pkg/types/webrtc.go b/pkg/types/webrtc.go index 6063f203..c67f4857 100644 --- a/pkg/types/webrtc.go +++ b/pkg/types/webrtc.go @@ -7,7 +7,6 @@ import ( ) var ( - ErrWebRTCVideoNotFound = errors.New("webrtc video not found") ErrWebRTCDataChannelNotFound = errors.New("webrtc data channel not found") ErrWebRTCConnectionNotFound = errors.New("webrtc connection not found") ) @@ -25,7 +24,8 @@ type WebRTCPeer interface { SetAnswer(sdp string) error SetCandidate(candidate webrtc.ICECandidateInit) error - SetVideoID(videoID string) error + SetVideoBitrate(bitrate int) error + GetVideoId() string SetPaused(isPaused bool) error SendCursorPosition(x, y int) error @@ -40,6 +40,6 @@ type WebRTCManager interface { ICEServers() []ICEServer - CreatePeer(session Session, videoID string) (*webrtc.SessionDescription, error) + CreatePeer(session Session, bitrate int) (*webrtc.SessionDescription, error) SetCursorPosition(x, y int) } From d894e888b829627f710bd08fa701cc74da6cbda5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 25 Oct 2022 22:46:21 +0200 Subject: [PATCH 754/876] fix generic plugin error message. --- pkg/auth/auth.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 24c5b2fc..e578e05b 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -80,13 +80,17 @@ func PluginsGenericOnly[V comparable](key string, exp V) func(w http.ResponseWri plugins := session.Profile().Plugins + if plugins[key] == nil { + return nil, utils.HttpForbidden(fmt.Sprintf("missing plugin permission: %s=%T", key, exp)) + } + val, ok := plugins[key].(V) if !ok { - return nil, utils.HttpForbidden(fmt.Sprintf("%s is %T, but expected %T", key, plugins[key], exp)) + return nil, utils.HttpForbidden(fmt.Sprintf("invalid plugin permission type: %s=%T expected %T", key, plugins[key], exp)) } if val != exp { - return nil, utils.HttpForbidden(fmt.Sprintf("%s is set to %v, but expected %v", key, val, exp)) + return nil, utils.HttpForbidden(fmt.Sprintf("wrong plugin permission value for %s=%T", key, exp)) } return nil, nil From 3d131bb42a321fac0979479018c65055b8940d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 10 Nov 2022 18:18:39 +0100 Subject: [PATCH 755/876] supervisord separate logging. --- runtime/supervisord.conf | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf index 0acbaec4..c144c253 100644 --- a/runtime/supervisord.conf +++ b/runtime/supervisord.conf @@ -2,9 +2,8 @@ nodaemon=true user=root pidfile=/var/run/supervisord.pid -logfile=/dev/null +logfile=/dev/stderr logfile_maxbytes=0 -loglevel=debug [include] files=/etc/neko/supervisord/*.conf @@ -15,9 +14,8 @@ command=/usr/bin/dbus autorestart=true priority=100 user=root -stdout_logfile=/var/log/neko/dbus.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 +stdout_logfile=/dev/stderr +stdout_logfile_maxbytes=0 redirect_stderr=true [program:x-server] @@ -26,9 +24,8 @@ command=/usr/bin/X %(ENV_DISPLAY)s -config /etc/neko/xorg.conf -noreset -noliste autorestart=true priority=300 user=%(ENV_USER)s -stdout_logfile=/var/log/neko/xorg.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 +stdout_logfile=/dev/stderr +stdout_logfile_maxbytes=0 redirect_stderr=true [program:pulseaudio] @@ -37,9 +34,8 @@ command=/usr/bin/pulseaudio --log-level=info --disallow-module-loading --disallo autorestart=true priority=300 user=%(ENV_USER)s -stdout_logfile=/var/log/neko/pulseaudio.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 +stdout_logfile=/dev/stderr +stdout_logfile_maxbytes=0 redirect_stderr=true [program:neko] @@ -50,9 +46,8 @@ stopwaitsecs=3 autorestart=true priority=800 user=%(ENV_USER)s -stdout_logfile=/var/log/neko/neko.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 redirect_stderr=true [unix_http_server] From 482476489e6932bf49a951c53001a2fed987f6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 11 Nov 2022 17:40:50 +0100 Subject: [PATCH 756/876] supervisord add -s flag (#15) * fix duplicate supervisord logs. * add -s flag. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8c9b04ce..33ced06e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -134,4 +134,4 @@ HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ # # run neko -CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"] +CMD ["/usr/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"] From 2cb64d15a09858cc16c0414986a782d2cf4199b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 11 Nov 2022 17:58:54 +0100 Subject: [PATCH 757/876] send heartbeat with ping. (#16) --- internal/websocket/manager.go | 13 ++++++++++++- internal/websocket/peer.go | 7 +++++++ pkg/types/event/events.go | 1 + pkg/types/websocket.go | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index ac9b3656..083efd4b 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -23,6 +23,16 @@ const pingPeriod = 10 * time.Second // period for sending inactive cursor messages const inactiveCursorsPeriod = 750 * time.Millisecond +// events that are not logged in debug mode +var nologEvents = []string{ + // don't log twice + event.SYSTEM_LOGS, + // don't log heartbeat + event.SYSTEM_HEARTBEAT, + // don't log every cursor update + event.SESSION_CURSORS, +} + func New( sessions types.SessionManager, desktop types.DesktopManager, @@ -301,7 +311,8 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer type break } - if data.Event != event.SYSTEM_LOGS { + // log events if not ignored + if ok, _ := utils.ArrayIn(data.Event, nologEvents); !ok { logger.Debug(). Str("address", connection.RemoteAddr().String()). Str("event", data.Event). diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 6d5b1d1a..52dacf06 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -75,6 +75,13 @@ func (peer *WebSocketPeerCtx) Ping() error { return errors.New("peer connection not found") } + // application level heartbeat + if err := peer.connection.WriteJSON(types.WebSocketMessage{ + Event: event.SYSTEM_HEARTBEAT, + }); err != nil { + return err + } + return peer.connection.WriteMessage(websocket.PingMessage, nil) } diff --git a/pkg/types/event/events.go b/pkg/types/event/events.go index 3e773a9c..5a3f37dc 100644 --- a/pkg/types/event/events.go +++ b/pkg/types/event/events.go @@ -6,6 +6,7 @@ const ( SYSTEM_SETTINGS = "system/settings" SYSTEM_LOGS = "system/logs" SYSTEM_DISCONNECT = "system/disconnect" + SYSTEM_HEARTBEAT = "system/heartbeat" ) const ( diff --git a/pkg/types/websocket.go b/pkg/types/websocket.go index 213d3af7..a99dc344 100644 --- a/pkg/types/websocket.go +++ b/pkg/types/websocket.go @@ -7,7 +7,7 @@ import ( type WebSocketMessage struct { Event string `json:"event"` - Payload json.RawMessage `json:"payload"` + Payload json.RawMessage `json:"payload,omitempty"` } type WebSocketHandler func(Session, WebSocketMessage) bool From 7946afaffe5ea0de6fae24b607bf02f84edd6875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 11 Nov 2022 19:43:09 +0100 Subject: [PATCH 758/876] fix dev supervisord. --- dev/runtime/supervisord.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev/runtime/supervisord.conf b/dev/runtime/supervisord.conf index d14ef4ad..bcd958fe 100644 --- a/dev/runtime/supervisord.conf +++ b/dev/runtime/supervisord.conf @@ -5,7 +5,6 @@ stopsignal=INT autorestart=true priority=500 user=%(ENV_USER)s -stdout_logfile=/var/log/neko/xfce.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 +stdout_logfile=/dev/stderr +stdout_logfile_maxbytes=0 redirect_stderr=true From 09f213f4428d59d8c540cc7ba2f8b7a84d8bfbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 11 Nov 2022 19:46:25 +0100 Subject: [PATCH 759/876] remove /var/log/neko fom Dockerfile. --- .devcontainer/Dockerfile | 4 +--- Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2382ca2a..0b844def 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -65,9 +65,7 @@ RUN set -eux; \ chown $USERNAME /tmp/.X11-unix/; \ # # make directories for neko - mkdir -p /etc/neko /var/www /var/log/neko; \ - chmod 1777 /var/log/neko; \ - chown $USERNAME /var/log/neko/; \ + mkdir -p /etc/neko /var/www; \ chown -R $USERNAME:$USERNAME /home/$USERNAME; \ # # install fonts diff --git a/Dockerfile b/Dockerfile index 33ced06e..256020e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,9 +75,7 @@ RUN set -eux; \ chown $USERNAME /tmp/.X11-unix/; \ # # make directories for neko - mkdir -p /etc/neko /var/www /var/log/neko; \ - chmod 1777 /var/log/neko; \ - chown $USERNAME /var/log/neko/; \ + mkdir -p /etc/neko /var/www; \ chown -R $USERNAME:$USERNAME /home/$USERNAME; \ # # install fonts From 833c0d5e86c6b728620a6d17c1dc8d4b5c44a77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 28 Nov 2022 21:32:20 +0100 Subject: [PATCH 760/876] upgrade dependencies. --- go.mod | 62 ++++++++++++------------- go.sum | 139 ++++++++++++++++++++++++++++++++------------------------- 2 files changed, 110 insertions(+), 91 deletions(-) diff --git a/go.mod b/go.mod index 116de496..bc828f8c 100644 --- a/go.mod +++ b/go.mod @@ -3,67 +3,67 @@ module github.com/demodesk/neko go 1.18 require ( - github.com/PaesslerAG/gval v1.2.0 + github.com/PaesslerAG/gval v1.2.1 github.com/go-chi/chi v1.5.4 github.com/go-chi/cors v1.2.1 github.com/gorilla/websocket v1.5.0 github.com/kataras/go-events v0.0.3 - github.com/pion/ice/v2 v2.2.6 - github.com/pion/interceptor v0.1.11 + github.com/pion/ice/v2 v2.2.12 + github.com/pion/interceptor v0.1.12 github.com/pion/logging v0.2.2 - github.com/pion/rtcp v1.2.9 - github.com/pion/webrtc/v3 v3.1.42 - github.com/prometheus/client_golang v1.12.2 - github.com/rs/zerolog v1.27.0 - github.com/spf13/cobra v1.5.0 - github.com/spf13/viper v1.12.0 - github.com/stretchr/testify v1.8.0 + github.com/pion/rtcp v1.2.10 + github.com/pion/webrtc/v3 v3.1.49 + github.com/prometheus/client_golang v1.14.0 + github.com/rs/zerolog v1.28.0 + github.com/spf13/cobra v1.6.1 + github.com/spf13/viper v1.14.0 + github.com/stretchr/testify v1.8.1 ) require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/magiconair/properties v1.8.6 // indirect - github.com/mattn/go-colorable v0.1.12 // indirect - github.com/mattn/go-isatty v0.0.14 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.16 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/pion/datachannel v1.5.2 // indirect github.com/pion/dtls/v2 v2.1.5 // indirect github.com/pion/mdns v0.0.5 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtp v1.7.13 // indirect - github.com/pion/sctp v1.8.2 // indirect - github.com/pion/sdp/v3 v3.0.5 // indirect - github.com/pion/srtp/v2 v2.0.9 // indirect + github.com/pion/sctp v1.8.3 // indirect + github.com/pion/sdp/v3 v3.0.6 // indirect + github.com/pion/srtp/v2 v2.0.10 // indirect github.com/pion/stun v0.3.5 // indirect - github.com/pion/transport v0.13.1 // indirect + github.com/pion/transport v0.14.0 // indirect github.com/pion/turn/v2 v2.0.8 // indirect github.com/pion/udp v0.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.35.0 // indirect - github.com/prometheus/procfs v0.7.3 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.37.0 // indirect + github.com/prometheus/procfs v0.8.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.4.0 // indirect - golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect - golang.org/x/net v0.0.0-20220630215102-69896b714898 // indirect - golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect - golang.org/x/text v0.3.7 // indirect - google.golang.org/protobuf v1.28.0 // indirect - gopkg.in/ini.v1 v1.66.6 // indirect + github.com/subosito/gotenv v1.4.1 // indirect + golang.org/x/crypto v0.3.0 // indirect + golang.org/x/net v0.2.0 // indirect + golang.org/x/sys v0.2.0 // indirect + golang.org/x/text v0.4.0 // indirect + google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 44f44a47..29366697 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/PaesslerAG/gval v1.2.0 h1:DA7PsxmtzlUU4bYxV35MKp9KDDVWcrJJRhlaCohMhsM= -github.com/PaesslerAG/gval v1.2.0/go.mod h1:XRFLwvmkTEdYziLdaCeCa5ImcGVrfQbeNUbVR+C6xac= +github.com/PaesslerAG/gval v1.2.1 h1:Ggwtej1xCyt1994VuDCSjycybIDo3duDCDghK/xc/A0= +github.com/PaesslerAG/gval v1.2.1/go.mod h1:XRFLwvmkTEdYziLdaCeCa5ImcGVrfQbeNUbVR+C6xac= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -76,8 +76,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= -github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4= @@ -137,7 +137,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -168,8 +168,8 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -193,12 +193,15 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -219,47 +222,49 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= -github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= +github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= -github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus= github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c= github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY= -github.com/pion/ice/v2 v2.2.6 h1:R/vaLlI1J2gCx141L5PEwtuGAGcyS6e7E0hDeJFq5Ig= -github.com/pion/ice/v2 v2.2.6/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE= -github.com/pion/interceptor v0.1.11 h1:00U6OlqxA3FFB50HSg25J/8cWi7P6FbSzw4eFn24Bvs= +github.com/pion/ice/v2 v2.2.12 h1:n3M3lUMKQM5IoofhJo73D3qVla+mJN2nVvbSPq32Nig= +github.com/pion/ice/v2 v2.2.12/go.mod h1:z2KXVFyRkmjetRlaVRgjO9U3ShKwzhlUylvxKfHfd5A= github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8= +github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8= +github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U= github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo= +github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc= +github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I= github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= -github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA= -github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= -github.com/pion/sdp/v3 v3.0.5 h1:ouvI7IgGl+V4CrqskVtr3AaTrPvPisEOxwgpdktctkU= -github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= -github.com/pion/srtp/v2 v2.0.9 h1:JJq3jClmDFBPX/F5roEb0U19jSU7eUhyDqR/NZ34EKQ= -github.com/pion/srtp/v2 v2.0.9/go.mod h1:5TtM9yw6lsH0ppNCehB/EjEUli7VkUgKSPJqWVqbhQ4= +github.com/pion/sctp v1.8.3 h1:LWcciN2ptLkw9Ugp/Ks2E76fiWy7yk3Wm79D6oFbFNo= +github.com/pion/sctp v1.8.3/go.mod h1:OHbDjdk7kg+L+7TJim9q/qGVefdEJohuA2SZyihccgI= +github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw= +github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= +github.com/pion/srtp/v2 v2.0.10 h1:b8ZvEuI+mrL8hbr/f1YiJFB34UMrOac3R3N1yq2UN0w= +github.com/pion/srtp/v2 v2.0.10/go.mod h1:XEeSWaK9PfuMs7zxXyiN252AHPbH12NX5q/CFDWtUuA= github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g= -github.com/pion/transport v0.13.1 h1:/UH5yLeQtwm2VZIPjxwnNFxjS4DFhyLfS4GlfuKUzfA= github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg= +github.com/pion/transport v0.14.0 h1:mUjwPXjhazKXtGkgQR5hH5VWvnTB78sHxkzLDyASVhs= +github.com/pion/transport v0.14.0/go.mod h1:saq45sbsC6W/F6qJsuOeM5tapjbL/BWTS0wW/eSAeEo= github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw= github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/webrtc/v3 v3.1.42 h1:wJEQFIXVanptnQcHOLTuIo4AtGB2+mG2x4OhIhnITOA= -github.com/pion/webrtc/v3 v3.1.42/go.mod h1:ffD9DulDrPxyWvDPUIPAOSAWx9GUlOExiJPf7cCcMLA= +github.com/pion/webrtc/v3 v3.1.49 h1:rbsNGxK9jMYts+xE6zYAJMUQHnGwmk/JYze8yttW+to= +github.com/pion/webrtc/v3 v3.1.49/go.mod h1:kHf/o47QW4No1rgpsFux/h7lUhtUnwFnSFDZOXeLapw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -271,30 +276,32 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= -github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.35.0 h1:Eyr+Pw2VymWejHqCugNaQXkAi6KayVNxaHeu6khmFBE= -github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= -github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs= -github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY= +github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= @@ -302,21 +309,22 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= +github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= -github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= +github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= +github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= -github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= +github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= +github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -324,15 +332,16 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs= -github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= +github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -346,12 +355,12 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY= -golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= +golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -385,6 +394,7 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -428,11 +438,12 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220630215102-69896b714898 h1:K7wO6V1IrczY9QOQ2WkVpw4JQSwCd52UsxVEirZUfiw= -golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -454,6 +465,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -506,13 +518,18 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -520,8 +537,9 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -573,6 +591,7 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -667,8 +686,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -676,8 +695,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= -gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 05c4fa34c576a850147f67c4b854c458036ee368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 28 Nov 2022 22:09:33 +0100 Subject: [PATCH 761/876] fix indirect dependencies. --- go.mod | 18 +++++++++--------- go.sum | 30 +++++++++++------------------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index bc828f8c..64a7806f 100644 --- a/go.mod +++ b/go.mod @@ -30,12 +30,12 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/magiconair/properties v1.8.6 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.6 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/pion/datachannel v1.5.2 // indirect github.com/pion/dtls/v2 v2.1.5 // indirect github.com/pion/mdns v0.0.5 // indirect @@ -45,7 +45,7 @@ require ( github.com/pion/sdp/v3 v3.0.6 // indirect github.com/pion/srtp/v2 v2.0.10 // indirect github.com/pion/stun v0.3.5 // indirect - github.com/pion/transport v0.14.0 // indirect + github.com/pion/transport v0.13.1 // indirect github.com/pion/turn/v2 v2.0.8 // indirect github.com/pion/udp v0.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -53,14 +53,14 @@ require ( github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/spf13/afero v1.9.3 // indirect + github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.1 // indirect - golang.org/x/crypto v0.3.0 // indirect - golang.org/x/net v0.2.0 // indirect - golang.org/x/sys v0.2.0 // indirect + golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2 // indirect + golang.org/x/net v0.1.0 // indirect + golang.org/x/sys v0.1.0 // indirect golang.org/x/text v0.4.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 29366697..c8bdb9be 100644 --- a/go.sum +++ b/go.sum @@ -193,15 +193,12 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -222,8 +219,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= -github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= +github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c= @@ -256,9 +253,8 @@ github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2U github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g= +github.com/pion/transport v0.13.1 h1:/UH5yLeQtwm2VZIPjxwnNFxjS4DFhyLfS4GlfuKUzfA= github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg= -github.com/pion/transport v0.14.0 h1:mUjwPXjhazKXtGkgQR5hH5VWvnTB78sHxkzLDyASVhs= -github.com/pion/transport v0.14.0/go.mod h1:saq45sbsC6W/F6qJsuOeM5tapjbL/BWTS0wW/eSAeEo= github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw= github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= @@ -309,8 +305,8 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= +github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= @@ -358,9 +354,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2 h1:x8vtB3zMecnlqZIwJNUUpwYKYSqCz5jXbiyv0ZJJZeI= golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -441,9 +436,8 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= -golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -522,11 +516,9 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= From 919a554a9e41f2f8b01dbfa6f18df57f28114ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 12 Dec 2022 22:53:26 +0100 Subject: [PATCH 762/876] track WriteSample fix log message. --- internal/webrtc/track.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index 516af9bf..16cb12c9 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -50,8 +50,8 @@ func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.Pe } err := track.WriteSample(media.Sample(sample)) - if err != nil && errors.Is(err, io.ErrClosedPipe) { - logger.Warn().Err(err).Msg("pipeline failed to write") + if err != nil && !errors.Is(err, io.ErrClosedPipe) { + logger.Warn().Err(err).Msg("failed to write sample to track") } } From 6b39e8e0e804937bce49470bb4bb57aaa13d4c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 13 Dec 2022 11:35:03 +0100 Subject: [PATCH 763/876] Fix WebRTC mux issues (#17) * use NewMultiUDPMuxFromPort. * tcp mux add write buffer size. --- internal/webrtc/manager.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 33a6f3df..e227d6df 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -109,21 +109,24 @@ func (manager *WebRTCManagerCtx) Start() { manager.logger.Panic().Err(err).Msg("unable to setup ice TCP mux") } - manager.tcpMux = webrtc.NewICETCPMux(logger.NewLogger("ice-tcp"), tcpListener, 32) + manager.tcpMux = ice.NewTCPMuxDefault(ice.TCPMuxParams{ + Listener: tcpListener, + Logger: logger.NewLogger("ice-tcp"), + ReadBufferSize: 32, // receiving channel size + WriteBufferSize: 4 * 1024 * 1024, // write buffer size, 4MB + }) } // add UDP Mux listener if manager.config.UDPMux > 0 { - udpListener, err := net.ListenUDP("udp", &net.UDPAddr{ - IP: net.IP{0, 0, 0, 0}, - Port: manager.config.UDPMux, - }) + var err error + manager.udpMux, err = ice.NewMultiUDPMuxFromPort(manager.config.UDPMux, + ice.UDPMuxFromPortWithLogger(logger.NewLogger("ice-udp")), + ) if err != nil { manager.logger.Panic().Err(err).Msg("unable to setup ice UDP mux") } - - manager.udpMux = webrtc.NewICEUDPMux(logger.NewLogger("ice-udp"), udpListener) } manager.logger.Info(). From b49f545094fd3abcd6bfba2c53f2913d7baab5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 15 Dec 2022 22:15:50 +0100 Subject: [PATCH 764/876] properly log unhandled panics. --- cmd/root.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmd/root.go b/cmd/root.go index 79c91229..3e681137 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -20,6 +20,14 @@ import ( ) func Execute() error { + // properly log unhandled panics + defer func() { + panicVal := recover() + if panicVal != nil { + log.Panic().Msgf("%v", panicVal) + } + }() + return root.Execute() } From fb8462b56ab2371dfd045dfdf7bd328495b98e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 16 Dec 2022 13:49:51 +0100 Subject: [PATCH 765/876] Add WebRTC candidate metrics (#18) * stats: add protocol to iceCandidates. * add ice candidates used metric. * NewICECandidate use whole struct. --- internal/webrtc/manager.go | 20 +++++++++- internal/webrtc/metrics.go | 75 ++++++++++++++++++++++++++++++++++---- 2 files changed, 86 insertions(+), 9 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index e227d6df..794fda3a 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -545,13 +545,31 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int) manager.metrics.SetSctpTransportStats(session, data) } + remoteCandidates := map[string]webrtc.ICECandidateStats{} + nominatedRemoteCandidates := map[string]struct{}{} for _, entry := range stats { // only remote ice candidate stats candidate, ok := entry.(webrtc.ICECandidateStats) if ok && candidate.Type == webrtc.StatsTypeRemoteCandidate { - manager.metrics.NewICECandidate(session, candidate.ID) + manager.metrics.NewICECandidate(session, candidate) + remoteCandidates[candidate.ID] = candidate + } + + // only nominated ice candidate pair stats + pair, ok := entry.(webrtc.ICECandidatePairStats) + if ok && pair.Nominated { + nominatedRemoteCandidates[pair.RemoteCandidateID] = struct{}{} } } + + iceCandidatesUsed := []webrtc.ICECandidateStats{} + for id := range nominatedRemoteCandidates { + if candidate, ok := remoteCandidates[id]; ok { + iceCandidatesUsed = append(iceCandidatesUsed, candidate) + } + } + + manager.metrics.SetICECandidatesUsed(session, iceCandidatesUsed) } }() diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index aad26491..dce22809 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -15,9 +15,13 @@ type metrics struct { connectionStateCount prometheus.Counter connectionCount prometheus.Counter - iceCandidates map[string]struct{} - iceCandidatesMu *sync.Mutex - iceCandidatesCount prometheus.Counter + iceCandidates map[string]struct{} + iceCandidatesMu *sync.Mutex + iceCandidatesUdpCount prometheus.Counter + iceCandidatesTcpCount prometheus.Counter + + iceCandidatesUsedUdp prometheus.Gauge + iceCandidatesUsedTcp prometheus.Gauge videoIds map[string]prometheus.Gauge videoIdsMu *sync.Mutex @@ -86,13 +90,45 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { iceCandidates: map[string]struct{}{}, iceCandidatesMu: &sync.Mutex{}, - iceCandidatesCount: promauto.NewCounter(prometheus.CounterOpts{ + iceCandidatesUdpCount: promauto.NewCounter(prometheus.CounterOpts{ Name: "ice_candidates_count", Namespace: "neko", Subsystem: "webrtc", Help: "Count of ICE candidates sent by a remote client.", ConstLabels: map[string]string{ "session_id": session.ID(), + "protocol": "udp", + }, + }), + iceCandidatesTcpCount: promauto.NewCounter(prometheus.CounterOpts{ + Name: "ice_candidates_count", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Count of ICE candidates sent by a remote client.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + "protocol": "tcp", + }, + }), + + iceCandidatesUsedUdp: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "ice_candidates_used", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Used ICE candidates that are currently in use.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + "protocol": "udp", + }, + }), + iceCandidatesUsedTcp: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "ice_candidates_used", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Used ICE candidates that are currently in use.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + "protocol": "tcp", }, }), @@ -191,6 +227,9 @@ func (m *metricsCtx) reset(met metrics) { } met.videoIdsMu.Unlock() + met.iceCandidatesUsedUdp.Set(float64(0)) + met.iceCandidatesUsedTcp.Set(float64(0)) + met.receiverEstimatedMaximumBitrate.Set(0) met.receiverReportDelay.Set(0) @@ -202,18 +241,38 @@ func (m *metricsCtx) NewConnection(session types.Session) { met.connectionCount.Add(1) } -func (m *metricsCtx) NewICECandidate(session types.Session, id string) { +func (m *metricsCtx) NewICECandidate(session types.Session, candidate webrtc.ICECandidateStats) { met := m.getBySession(session) met.iceCandidatesMu.Lock() defer met.iceCandidatesMu.Unlock() - if _, found := met.iceCandidates[id]; found { + if _, found := met.iceCandidates[candidate.ID]; found { return } - met.iceCandidates[id] = struct{}{} - met.iceCandidatesCount.Add(1) + met.iceCandidates[candidate.ID] = struct{}{} + if candidate.Protocol == "udp" { + met.iceCandidatesUdpCount.Add(1) + } else if candidate.Protocol == "tcp" { + met.iceCandidatesTcpCount.Add(1) + } +} + +func (m *metricsCtx) SetICECandidatesUsed(session types.Session, candidates []webrtc.ICECandidateStats) { + met := m.getBySession(session) + + udp, tcp := 0, 0 + for _, candidate := range candidates { + if candidate.Protocol == "udp" { + udp++ + } else if candidate.Protocol == "tcp" { + tcp++ + } + } + + met.iceCandidatesUsedUdp.Set(float64(udp)) + met.iceCandidatesUsedTcp.Set(float64(tcp)) } func (m *metricsCtx) SetState(session types.Session, state webrtc.PeerConnectionState) { From 3c3042d6914fa0278597b090b94248672416f313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 9 Jan 2023 23:18:47 +0100 Subject: [PATCH 766/876] Add batch endpoint (#19) * add batch endpoint. * keep error code. * use utils.HttpSuccess. * add batch to openapi. * body omitempty. --- internal/http/batch.go | 123 +++++++++++++++++++++++++++++++++++++++ internal/http/manager.go | 10 ++++ openapi.yaml | 52 +++++++++++++++++ 3 files changed, 185 insertions(+) create mode 100644 internal/http/batch.go diff --git a/internal/http/batch.go b/internal/http/batch.go new file mode 100644 index 00000000..8b199901 --- /dev/null +++ b/internal/http/batch.go @@ -0,0 +1,123 @@ +package http + +import ( + "bytes" + "encoding/json" + "io" + "net/http" + "strings" + + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" +) + +type BatchRequest struct { + Path string `json:"path"` + Method string `json:"method"` + Body json.RawMessage `json:"body,omitempty"` +} + +type BatchResponse struct { + Path string `json:"path"` + Method string `json:"method"` + Body json.RawMessage `json:"body,omitempty"` + Status int `json:"status"` +} + +func (b *BatchResponse) Error(httpErr *utils.HTTPError) (err error) { + b.Body, err = json.Marshal(httpErr) + b.Status = httpErr.Code + return +} + +type batchHandler struct { + Router types.Router + PathPrefix string + Excluded []string +} + +func (b *batchHandler) Handle(w http.ResponseWriter, r *http.Request) error { + var requests []BatchRequest + if err := json.NewDecoder(r.Body).Decode(&requests); err != nil { + return err + } + + responses := make([]BatchResponse, len(requests)) + for i, request := range requests { + res := BatchResponse{ + Path: request.Path, + Method: request.Method, + } + + if !strings.HasPrefix(request.Path, b.PathPrefix) { + res.Error(utils.HttpBadRequest("this path is not allowed in batch requests")) + responses[i] = res + continue + } + + if exists, _ := utils.ArrayIn(request.Path, b.Excluded); exists { + res.Error(utils.HttpBadRequest("this path is excluded from batch requests")) + responses[i] = res + continue + } + + // prepare request + req, err := http.NewRequest(request.Method, request.Path, bytes.NewBuffer(request.Body)) + if err != nil { + return err + } + + // copy headers + for k, vv := range r.Header { + for _, v := range vv { + req.Header.Add(k, v) + } + } + + // execute request + rr := newResponseRecorder() + b.Router.ServeHTTP(rr, req) + + // read response + body, err := io.ReadAll(rr.Body) + if err != nil { + return err + } + + // write response + responses[i] = BatchResponse{ + Path: request.Path, + Method: request.Method, + Body: body, + Status: rr.Code, + } + } + + return utils.HttpSuccess(w, responses) +} + +type responseRecorder struct { + Code int + HeaderMap http.Header + Body *bytes.Buffer +} + +func newResponseRecorder() *responseRecorder { + return &responseRecorder{ + Code: http.StatusOK, + HeaderMap: make(http.Header), + Body: new(bytes.Buffer), + } +} + +func (w *responseRecorder) Header() http.Header { + return w.HeaderMap +} + +func (w *responseRecorder) Write(b []byte) (int, error) { + return w.Body.Write(b) +} + +func (w *responseRecorder) WriteHeader(code int) { + w.Code = code +} diff --git a/internal/http/manager.go b/internal/http/manager.go index 07e10067..5450c697 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -42,6 +42,16 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c return config.AllowOrigin(r.Header.Get("Origin")) })) + batch := batchHandler{ + Router: router, + PathPrefix: "/api", + Excluded: []string{ + "/api/batch", // do not allow batchception + "/api/ws", + }, + } + router.Post("/api/batch", batch.Handle) + router.Get("/health", func(w http.ResponseWriter, r *http.Request) error { _, err := w.Write([]byte("true")) return err diff --git a/openapi.yaml b/openapi.yaml index 00f79fd6..0ea556ef 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -38,6 +38,28 @@ paths: '200': description: OK + /api/batch: + post: + summary: batch + operationId: batch + responses: + '200': + description: OK + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/BatchResponse' + requestBody: + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/BatchRequest' + required: true + # # session # @@ -930,6 +952,36 @@ components: message: type: string + BatchRequest: + type: object + properties: + path: + type: string + method: + type: string + enum: + - GET + - POST + - DELETE + body: + description: Request body + + BatchResponse: + type: object + properties: + path: + type: string + method: + type: string + enum: + - GET + - POST + - DELETE + body: + description: Response body + status: + type: integer + # # session # From b793e5b3774b4fccaa7aadbb45933b173a35cd03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 12 Jan 2023 20:34:09 +0100 Subject: [PATCH 767/876] add stereo to opus codec. --- pkg/types/codec/codecs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/types/codec/codecs.go b/pkg/types/codec/codecs.go index b1c9d4ae..0bb6adf0 100644 --- a/pkg/types/codec/codecs.go +++ b/pkg/types/codec/codecs.go @@ -131,7 +131,7 @@ func Opus() RTPCodec { MimeType: webrtc.MimeTypeOpus, ClockRate: 48000, Channels: 2, - SDPFmtpLine: "useinbandfec=1", + SDPFmtpLine: "useinbandfec=1;stereo=1", RTCPFeedback: []webrtc.RTCPFeedback{}, }, // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html From 6574470278af3027388b0f2ee06affa745e4e643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 12 Jan 2023 23:21:56 +0100 Subject: [PATCH 768/876] login logout proper http error handling. --- internal/api/session.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/internal/api/session.go b/internal/api/session.go index 3ea6cc41..e221d1d6 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -1,6 +1,7 @@ package api import ( + "errors" "net/http" "github.com/demodesk/neko/pkg/auth" @@ -28,7 +29,13 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) error { session, token, err := api.members.Login(data.Username, data.Password) if err != nil { - return utils.HttpUnauthorized().WithInternalErr(err) + if errors.Is(err, types.ErrSessionAlreadyConnected) { + return utils.HttpUnprocessableEntity("session already connected") + } else if errors.Is(err, types.ErrMemberDoesNotExist) || errors.Is(err, types.ErrMemberInvalidPassword) { + return utils.HttpUnauthorized().WithInternalErr(err) + } else { + return utils.HttpInternalServerError().WithInternalErr(err) + } } sessionData := SessionDataPayload{ @@ -51,7 +58,11 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) error { err := api.members.Logout(session.ID()) if err != nil { - return utils.HttpUnauthorized().WithInternalErr(err) + if errors.Is(err, types.ErrSessionNotFound) { + return utils.HttpBadRequest("session is not logged in") + } else { + return utils.HttpInternalServerError().WithInternalErr(err) + } } if api.sessions.CookieEnabled() { From e5c84469ce38aebb1288bf21eda7b909f6335e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 12 Jan 2023 23:32:42 +0100 Subject: [PATCH 769/876] MemberProvider: add variable names. --- pkg/types/member.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/types/member.go b/pkg/types/member.go index 6506f7dc..e59bd4a5 100644 --- a/pkg/types/member.go +++ b/pkg/types/member.go @@ -30,11 +30,11 @@ type MemberProvider interface { Connect() error Disconnect() error - Authenticate(username string, password string) (string, MemberProfile, error) + Authenticate(username string, password string) (id string, profile MemberProfile, err error) - Insert(username string, password string, profile MemberProfile) (string, error) - Select(id string) (MemberProfile, error) - SelectAll(limit int, offset int) (map[string]MemberProfile, error) + Insert(username string, password string, profile MemberProfile) (id string, err error) + Select(id string) (profile MemberProfile, err error) + SelectAll(limit int, offset int) (profiles map[string]MemberProfile, err error) UpdateProfile(id string, profile MemberProfile) error UpdatePassword(id string, password string) error Delete(id string) error From 319bd457f3aed545f43f4e170f61c00b5036990b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Jan 2023 00:00:09 +0100 Subject: [PATCH 770/876] add multiuser provider. --- internal/config/member.go | 21 +++++- internal/member/manager.go | 3 + internal/member/multiuser/provider.go | 96 +++++++++++++++++++++++++++ internal/member/multiuser/types.go | 6 ++ 4 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 internal/member/multiuser/provider.go create mode 100644 internal/member/multiuser/types.go diff --git a/internal/config/member.go b/internal/config/member.go index 8ef083d5..2afeb7ae 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -5,6 +5,7 @@ import ( "github.com/spf13/viper" "github.com/demodesk/neko/internal/member/file" + "github.com/demodesk/neko/internal/member/multiuser" "github.com/demodesk/neko/internal/member/object" ) @@ -12,8 +13,9 @@ type Member struct { Provider string // providers - File file.Config - Object object.Config + File file.Config + Object object.Config + Multiuser multiuser.Config } func (Member) Init(cmd *cobra.Command) error { @@ -39,6 +41,17 @@ func (Member) Init(cmd *cobra.Command) error { return err } + // multiuser provider + cmd.PersistentFlags().String("member.multiuser.user_password", "", "member multiuser provider: user password") + if err := viper.BindPFlag("member.multiuser.user_password", cmd.PersistentFlags().Lookup("member.multiuser.user_password")); err != nil { + return err + } + + cmd.PersistentFlags().String("member.multiuser.admin_password", "", "member multiuser provider: admin password") + if err := viper.BindPFlag("member.multiuser.admin_password", cmd.PersistentFlags().Lookup("member.multiuser.admin_password")); err != nil { + return err + } + return nil } @@ -51,4 +64,8 @@ func (s *Member) Set() { // object provider s.Object.UserPassword = viper.GetString("member.object.user_password") s.Object.AdminPassword = viper.GetString("member.object.admin_password") + + // multiuser provider + s.Multiuser.UserPassword = viper.GetString("member.multiuser.user_password") + s.Multiuser.AdminPassword = viper.GetString("member.multiuser.admin_password") } diff --git a/internal/member/manager.go b/internal/member/manager.go index 965ccf17..e717ecfe 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -10,6 +10,7 @@ import ( "github.com/demodesk/neko/internal/config" "github.com/demodesk/neko/internal/member/dummy" "github.com/demodesk/neko/internal/member/file" + "github.com/demodesk/neko/internal/member/multiuser" "github.com/demodesk/neko/internal/member/object" "github.com/demodesk/neko/pkg/types" ) @@ -26,6 +27,8 @@ func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx manager.provider = file.New(config.File) case "object": manager.provider = object.New(config.Object) + case "multiuser": + manager.provider = multiuser.New(config.Multiuser) case "dummy": fallthrough default: diff --git a/internal/member/multiuser/provider.go b/internal/member/multiuser/provider.go new file mode 100644 index 00000000..841e9c6d --- /dev/null +++ b/internal/member/multiuser/provider.go @@ -0,0 +1,96 @@ +package multiuser + +import ( + "errors" + "fmt" + + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" +) + +func New(config Config) types.MemberProvider { + return &MemberProviderCtx{ + config: config, + } +} + +type MemberProviderCtx struct { + config Config +} + +func (provider *MemberProviderCtx) Connect() error { + return nil +} + +func (provider *MemberProviderCtx) Disconnect() error { + return nil +} + +func (provider *MemberProviderCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { + // generate random token + token, err := utils.NewUID(5) + if err != nil { + return "", types.MemberProfile{}, err + } + + // id is username with token + id := fmt.Sprintf("%s-%s", username, token) + + // if logged in as administrator + if provider.config.AdminPassword == password { + return id, types.MemberProfile{ + Name: username, + IsAdmin: true, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanShareMedia: true, + CanAccessClipboard: true, + SendsInactiveCursor: true, + CanSeeInactiveCursors: true, + }, nil + } + + // if logged in as user + if provider.config.UserPassword == password { + return id, types.MemberProfile{ + Name: username, + IsAdmin: false, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanShareMedia: true, + CanAccessClipboard: true, + SendsInactiveCursor: true, + CanSeeInactiveCursors: false, + }, nil + } + + return "", types.MemberProfile{}, types.ErrMemberInvalidPassword +} + +func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { + return "", errors.New("new user is created on first login in multiuser mode") +} + +func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { + return errors.New("cannot update user profile in multiuser mode") +} + +func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { + return errors.New("password can only be modified in config while in multiuser mode") +} + +func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { + return types.MemberProfile{}, errors.New("cannot select user in multiuser mode") +} + +func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { + return map[string]types.MemberProfile{}, errors.New("cannot select users in multiuser mode") +} + +func (provider *MemberProviderCtx) Delete(id string) error { + return errors.New("cannot delete user in multiuser mode") +} diff --git a/internal/member/multiuser/types.go b/internal/member/multiuser/types.go new file mode 100644 index 00000000..4d6103d9 --- /dev/null +++ b/internal/member/multiuser/types.go @@ -0,0 +1,6 @@ +package multiuser + +type Config struct { + AdminPassword string + UserPassword string +} From af95cb4d72a8e1070cdd219a31f367e69e737f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Jan 2023 00:03:59 +0100 Subject: [PATCH 771/876] change dummy to noauth mode. --- internal/member/manager.go | 6 +-- internal/member/{dummy => noauth}/provider.go | 40 ++++++++++++------- 2 files changed, 28 insertions(+), 18 deletions(-) rename internal/member/{dummy => noauth}/provider.go (65%) diff --git a/internal/member/manager.go b/internal/member/manager.go index e717ecfe..2ba388ea 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog/log" "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/internal/member/dummy" "github.com/demodesk/neko/internal/member/file" "github.com/demodesk/neko/internal/member/multiuser" + "github.com/demodesk/neko/internal/member/noauth" "github.com/demodesk/neko/internal/member/object" "github.com/demodesk/neko/pkg/types" ) @@ -29,10 +29,10 @@ func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx manager.provider = object.New(config.Object) case "multiuser": manager.provider = multiuser.New(config.Multiuser) - case "dummy": + case "noauth": fallthrough default: - manager.provider = dummy.New() + manager.provider = noauth.New() } return manager diff --git a/internal/member/dummy/provider.go b/internal/member/noauth/provider.go similarity index 65% rename from internal/member/dummy/provider.go rename to internal/member/noauth/provider.go index 4ab0dd4a..517b0ef3 100644 --- a/internal/member/dummy/provider.go +++ b/internal/member/noauth/provider.go @@ -1,9 +1,11 @@ -package dummy +package noauth import ( "errors" + "fmt" "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) func New() types.MemberProvider { @@ -35,31 +37,39 @@ func (provider *MemberProviderCtx) Disconnect() error { } func (provider *MemberProviderCtx) Authenticate(username string, password string) (string, types.MemberProfile, error) { + // generate random token + token, err := utils.NewUID(5) + if err != nil { + return "", types.MemberProfile{}, err + } + + // id is username with token + id := fmt.Sprintf("%s-%s", username, token) + provider.profile.Name = username - return username, provider.profile, nil + return id, provider.profile, nil } func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { - return "", errors.New("not implemented") -} - -func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { - provider.profile.Name = id - return provider.profile, nil -} - -func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { - return map[string]types.MemberProfile{}, nil + return "", errors.New("new user is created on first login in noauth mode") } func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { - return nil + return errors.New("cannot update user profile in noauth mode") } func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { - return errors.New("not implemented") + return errors.New("password can only be modified in config while in noauth mode") +} + +func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { + return types.MemberProfile{}, errors.New("cannot select user in noauth mode") +} + +func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { + return map[string]types.MemberProfile{}, errors.New("cannot select users in noauth mode") } func (provider *MemberProviderCtx) Delete(id string) error { - return nil + return errors.New("cannot delete user in noauth mode") } From 2ff8d84ba2463f0daa2531de3d57cd247150bd9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Jan 2023 00:11:00 +0100 Subject: [PATCH 772/876] fix errors. --- internal/member/multiuser/provider.go | 4 ++-- internal/member/noauth/provider.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/member/multiuser/provider.go b/internal/member/multiuser/provider.go index 841e9c6d..915a19fe 100644 --- a/internal/member/multiuser/provider.go +++ b/internal/member/multiuser/provider.go @@ -76,7 +76,7 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof } func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { - return errors.New("cannot update user profile in multiuser mode") + return nil } func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { @@ -88,7 +88,7 @@ func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error } func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { - return map[string]types.MemberProfile{}, errors.New("cannot select users in multiuser mode") + return map[string]types.MemberProfile{}, nil } func (provider *MemberProviderCtx) Delete(id string) error { diff --git a/internal/member/noauth/provider.go b/internal/member/noauth/provider.go index 517b0ef3..4abc0a43 100644 --- a/internal/member/noauth/provider.go +++ b/internal/member/noauth/provider.go @@ -55,11 +55,11 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof } func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.MemberProfile) error { - return errors.New("cannot update user profile in noauth mode") + return nil } func (provider *MemberProviderCtx) UpdatePassword(id string, password string) error { - return errors.New("password can only be modified in config while in noauth mode") + return errors.New("noauth mode does not have password") } func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error) { @@ -67,7 +67,7 @@ func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error } func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { - return map[string]types.MemberProfile{}, errors.New("cannot select users in noauth mode") + return map[string]types.MemberProfile{}, nil } func (provider *MemberProviderCtx) Delete(id string) error { From 107eba22a54982b0b378f78709c1840465532990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Jan 2023 00:15:19 +0100 Subject: [PATCH 773/876] select profile primarily from corresponding session, if exists. --- internal/member/manager.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/member/manager.go b/internal/member/manager.go index 2ba388ea..35386570 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -79,6 +79,12 @@ func (manager *MemberManagerCtx) Select(id string) (types.MemberProfile, error) manager.providerMu.Lock() defer manager.providerMu.Unlock() + // get primarily from corresponding session, if exists + session, ok := manager.sessions.Get(id) + if ok { + return session.Profile(), nil + } + return manager.provider.Select(id) } From 1fb5ae43dd5d0585456a6d9d0069fb413593d207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Jan 2023 00:39:30 +0100 Subject: [PATCH 774/876] allow multiple users to be set in object provider. --- dev/runtime/config.yml | 34 +++++++++++++++++-- internal/config/member.go | 18 +++++----- internal/member/object/provider.go | 54 +++++++----------------------- internal/member/object/types.go | 19 ++++++++--- pkg/types/member.go | 18 +++++----- 5 files changed, 77 insertions(+), 66 deletions(-) diff --git a/dev/runtime/config.yml b/dev/runtime/config.yml index 21fc2968..ec2ca1c7 100644 --- a/dev/runtime/config.yml +++ b/dev/runtime/config.yml @@ -65,11 +65,41 @@ desktop: member: provider: "object" object: - admin_password: "admin" - user_password: "neko" + users: + - username: "admin" + password: "admin" + profile: + name: "Administrator" + is_admin: true + can_login: true + can_connect: true + can_watch: true + can_host: true + can_share_media: true + can_access_clipboard: true + sends_inactive_cursor: true + can_see_inactive_cursors: true + - username: "user" + password: "neko" + profile: + name: "User" + is_admin: false + can_login: true + can_connect: true + can_watch: true + can_host: true + can_share_media: true + can_access_clipboard: true + sends_inactive_cursor: true + can_see_inactive_cursors: false # provider: "file" # file: # path: "/home/neko/members.json" + # provider: "multiuser" + # multiuser: + # admin_password: "admin" + # user_password: "neko" + # provider: "noauth" session: # Allows reconnecting the websocket even if the previous diff --git a/internal/config/member.go b/internal/config/member.go index 2afeb7ae..b12db884 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -1,12 +1,14 @@ package config import ( + "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/demodesk/neko/internal/member/file" "github.com/demodesk/neko/internal/member/multiuser" "github.com/demodesk/neko/internal/member/object" + "github.com/demodesk/neko/pkg/utils" ) type Member struct { @@ -31,13 +33,8 @@ func (Member) Init(cmd *cobra.Command) error { } // object provider - cmd.PersistentFlags().String("member.object.user_password", "", "member object provider: user password") - if err := viper.BindPFlag("member.object.user_password", cmd.PersistentFlags().Lookup("member.object.user_password")); err != nil { - return err - } - - cmd.PersistentFlags().String("member.object.admin_password", "", "member object provider: admin password") - if err := viper.BindPFlag("member.object.admin_password", cmd.PersistentFlags().Lookup("member.object.admin_password")); err != nil { + cmd.PersistentFlags().String("member.object.users", "[]", "member object provider: users in JSON format") + if err := viper.BindPFlag("member.object.users", cmd.PersistentFlags().Lookup("member.object.users")); err != nil { return err } @@ -62,8 +59,11 @@ func (s *Member) Set() { s.File.Path = viper.GetString("member.file.path") // object provider - s.Object.UserPassword = viper.GetString("member.object.user_password") - s.Object.AdminPassword = viper.GetString("member.object.admin_password") + if err := viper.UnmarshalKey("member.object.users", &s.Object.Users, viper.DecodeHook( + utils.JsonStringAutoDecode(s.Object.Users), + )); err != nil { + log.Warn().Err(err).Msgf("unable to parse member object users") + } // multiuser provider s.Multiuser.UserPassword = viper.GetString("member.multiuser.user_password") diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index 7410ff39..5e93500e 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -7,48 +7,20 @@ import ( func New(config Config) types.MemberProvider { return &MemberProviderCtx{ config: config, - entries: make(map[string]*MemberEntry), + entries: make(map[string]*memberEntry), } } type MemberProviderCtx struct { config Config - entries map[string]*MemberEntry + entries map[string]*memberEntry } func (provider *MemberProviderCtx) Connect() error { var err error - if provider.config.AdminPassword != "" { - // create default admin account at startup - _, err = provider.Insert("admin", provider.config.AdminPassword, types.MemberProfile{ - Name: "Administrator", - IsAdmin: true, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanShareMedia: true, - CanAccessClipboard: true, - SendsInactiveCursor: true, - CanSeeInactiveCursors: true, - }) - } - - if provider.config.UserPassword != "" { - // create default user account at startup - _, err = provider.Insert("user", provider.config.UserPassword, types.MemberProfile{ - Name: "User", - IsAdmin: false, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanShareMedia: true, - CanAccessClipboard: true, - SendsInactiveCursor: true, - CanSeeInactiveCursors: false, - }) + for _, entry := range provider.config.Users { + _, err = provider.Insert(entry.Username, entry.Password, entry.Profile) } return err @@ -68,11 +40,11 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string } // TODO: Use hash function. - if entry.Password != password { + if !entry.CheckPassword(password) { return "", types.MemberProfile{}, types.ErrMemberInvalidPassword } - return id, entry.Profile, nil + return id, entry.profile, nil } func (provider *MemberProviderCtx) Insert(username string, password string, profile types.MemberProfile) (string, error) { @@ -84,10 +56,10 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof return "", types.ErrMemberAlreadyExists } - provider.entries[id] = &MemberEntry{ + provider.entries[id] = &memberEntry{ // TODO: Use hash function. - Password: password, - Profile: profile, + password: password, + profile: profile, } return id, nil @@ -99,7 +71,7 @@ func (provider *MemberProviderCtx) UpdateProfile(id string, profile types.Member return types.ErrMemberDoesNotExist } - entry.Profile = profile + entry.profile = profile return nil } @@ -111,7 +83,7 @@ func (provider *MemberProviderCtx) UpdatePassword(id string, password string) er } // TODO: Use hash function. - entry.Password = password + entry.password = password return nil } @@ -122,7 +94,7 @@ func (provider *MemberProviderCtx) Select(id string) (types.MemberProfile, error return types.MemberProfile{}, types.ErrMemberDoesNotExist } - return entry.Profile, nil + return entry.profile, nil } func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string]types.MemberProfile, error) { @@ -131,7 +103,7 @@ func (provider *MemberProviderCtx) SelectAll(limit int, offset int) (map[string] i := 0 for id, entry := range provider.entries { if i >= offset && (limit == 0 || i < offset+limit) { - profiles[id] = entry.Profile + profiles[id] = entry.profile } i = i + 1 diff --git a/internal/member/object/types.go b/internal/member/object/types.go index ca1e519a..a21c2209 100644 --- a/internal/member/object/types.go +++ b/internal/member/object/types.go @@ -4,12 +4,21 @@ import ( "github.com/demodesk/neko/pkg/types" ) -type MemberEntry struct { - Password string `json:"password"` - Profile types.MemberProfile `json:"profile"` +type memberEntry struct { + password string + profile types.MemberProfile +} + +func (m *memberEntry) CheckPassword(password string) bool { + return m.password == password +} + +type User struct { + Username string + Password string + Profile types.MemberProfile } type Config struct { - AdminPassword string - UserPassword string + Users []User } diff --git a/pkg/types/member.go b/pkg/types/member.go index e59bd4a5..4463f4dc 100644 --- a/pkg/types/member.go +++ b/pkg/types/member.go @@ -12,15 +12,15 @@ type MemberProfile struct { Name string `json:"name"` // permissions - IsAdmin bool `json:"is_admin"` - CanLogin bool `json:"can_login"` - CanConnect bool `json:"can_connect"` - CanWatch bool `json:"can_watch"` - CanHost bool `json:"can_host"` - CanShareMedia bool `json:"can_share_media"` - CanAccessClipboard bool `json:"can_access_clipboard"` - SendsInactiveCursor bool `json:"sends_inactive_cursor"` - CanSeeInactiveCursors bool `json:"can_see_inactive_cursors"` + IsAdmin bool `json:"is_admin" mapstructure:"is_admin"` + CanLogin bool `json:"can_login" mapstructure:"can_login"` + CanConnect bool `json:"can_connect" mapstructure:"can_connect"` + CanWatch bool `json:"can_watch" mapstructure:"can_watch"` + CanHost bool `json:"can_host" mapstructure:"can_host"` + CanShareMedia bool `json:"can_share_media" mapstructure:"can_share_media"` + CanAccessClipboard bool `json:"can_access_clipboard" mapstructure:"can_access_clipboard"` + SendsInactiveCursor bool `json:"sends_inactive_cursor" mapstructure:"sends_inactive_cursor"` + CanSeeInactiveCursors bool `json:"can_see_inactive_cursors" mapstructure:"can_see_inactive_cursors"` // plugin scope Plugins map[string]any `json:"plugins"` From 7601af9917b22f97919bb805e670cb76a40b7e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Jan 2023 00:58:34 +0100 Subject: [PATCH 775/876] fix default pipeline. --- internal/config/capture.go | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/internal/config/capture.go b/internal/config/capture.go index a02e0ea7..6b4b4fee 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -72,7 +72,7 @@ func (Capture) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().String("capture.video.pipelines", "", "pipelines config in JSON used for video streaming") + cmd.PersistentFlags().String("capture.video.pipelines", "[]", "pipelines config in JSON used for video streaming") if err := viper.BindPFlag("capture.video.pipelines", cmd.PersistentFlags().Lookup("capture.video.pipelines")); err != nil { return err } @@ -190,12 +190,22 @@ func (s *Capture) Set() { s.VideoCodec = codec.VP8() s.VideoPipelines = map[string]types.VideoConfig{ "main": { - GstPipeline: "ximagesrc display-name={display} show-pointer=false use-damage=false " + - "! video/x-raw " + - "! videoconvert " + - "! queue " + - "! vp8enc end-usage=cbr cpu-used=4 threads=4 deadline=1 keyframe-max-dist=25 " + - "! appsink name=appsink", + Fps: "25", + GstEncoder: "vp8enc", + GstParams: map[string]string{ + "target-bitrate": "round(3072 * 650)", + "cpu-used": "4", + "end-usage": "cbr", + "threads": "4", + "deadline": "1", + "undershoot": "95", + "buffer-size": "(3072 * 4)", + "buffer-initial-size": "(3072 * 2)", + "buffer-optimal-size": "(3072 * 3)", + "keyframe-max-dist": "25", + "min-quantizer": "4", + "max-quantizer": "20", + }, }, } s.VideoIDs = []string{"main"} From 8381020415d2048ff4ce88a127e1a6bfeaef264b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Jan 2023 00:59:00 +0100 Subject: [PATCH 776/876] default provider: multiuser. --- internal/config/member.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/config/member.go b/internal/config/member.go index b12db884..ee27efb4 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -21,7 +21,7 @@ type Member struct { } func (Member) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().String("member.provider", "object", "choose member provider") + cmd.PersistentFlags().String("member.provider", "multiuser", "choose member provider") if err := viper.BindPFlag("member.provider", cmd.PersistentFlags().Lookup("member.provider")); err != nil { return err } @@ -39,12 +39,12 @@ func (Member) Init(cmd *cobra.Command) error { } // multiuser provider - cmd.PersistentFlags().String("member.multiuser.user_password", "", "member multiuser provider: user password") + cmd.PersistentFlags().String("member.multiuser.user_password", "neko", "member multiuser provider: user password") if err := viper.BindPFlag("member.multiuser.user_password", cmd.PersistentFlags().Lookup("member.multiuser.user_password")); err != nil { return err } - cmd.PersistentFlags().String("member.multiuser.admin_password", "", "member multiuser provider: admin password") + cmd.PersistentFlags().String("member.multiuser.admin_password", "admin", "member multiuser provider: admin password") if err := viper.BindPFlag("member.multiuser.admin_password", cmd.PersistentFlags().Lookup("member.multiuser.admin_password")); err != nil { return err } From bd04ca88e838303c0eb5ec9eb10766568cd45f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 13 Jan 2023 00:59:19 +0100 Subject: [PATCH 777/876] fix missing error message on wrong config. --- cmd/root.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 3e681137..fb5b5d0e 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -68,8 +68,11 @@ func init() { // read config values err := viper.ReadInConfig() - if err != nil && config != "" { - panic("unable to read config file: " + err.Error()) + if err != nil { + _, notFound := err.(viper.ConfigFileNotFoundError) + if !notFound { + log.Fatal().Err(err).Msg("unable to read config file") + } } // get full config file path @@ -93,13 +96,13 @@ func init() { if _, err := os.Stat(latest); err == nil { err = os.Rename(latest, filepath.Join(rootConfig.LogDir, "neko."+time.Now().Format("2006-01-02T15-04-05Z07-00")+".log")) if err != nil { - panic("failed to rotate log file: " + err.Error()) + log.Fatal().Err(err).Msg("failed to rotate log file") } } logf, err := os.OpenFile(latest, os.O_RDWR|os.O_CREATE, 0666) if err != nil { - panic("failed to open log file: " + err.Error()) + log.Fatal().Err(err).Msg("failed to open log file") } logWriter = diode.NewWriter(logf, 1000, 10*time.Millisecond, func(missed int) { From 67cc23fd530e437e42ddea24bd8560634128a637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Jan 2023 20:22:45 +0100 Subject: [PATCH 778/876] circular list for free keycodes. --- pkg/xorg/xorg.c | 96 +++++++++++++++++++++++++++++++++++++++++++------ pkg/xorg/xorg.h | 5 +++ 2 files changed, 91 insertions(+), 10 deletions(-) diff --git a/pkg/xorg/xorg.c b/pkg/xorg/xorg.c index 613e95c9..831a8275 100644 --- a/pkg/xorg/xorg.c +++ b/pkg/xorg/xorg.c @@ -71,6 +71,7 @@ void XButton(unsigned int button, int down) { static xkeyentry_t *xKeysHead = NULL; +// add keycode->keysym mapping to list void XKeyEntryAdd(KeySym keysym, KeyCode keycode) { xkeyentry_t *entry = (xkeyentry_t *) malloc(sizeof(xkeyentry_t)); if (entry == NULL) @@ -82,6 +83,7 @@ void XKeyEntryAdd(KeySym keysym, KeyCode keycode) { xKeysHead = entry; } +// get keycode for keysym from list KeyCode XKeyEntryGet(KeySym keysym) { xkeyentry_t *prev = NULL; xkeyentry_t *curr = xKeysHead; @@ -147,6 +149,87 @@ KeyCode XkbKeysymToKeycode(Display* dpy, KeySym keysym) { return keycode; } +static xkeycode_t *xFreeKeycodesHead = NULL; +int xNumcodes = 0; + +void XFreeKeycodesInit(Display* dpy) { + if (xFreeKeycodesHead != NULL) + return; + + KeyCode keycode; + KeySym *keysyms; + int min, max, numcodes; + + // get full keyboard mapping + XDisplayKeycodes(dpy, &min, &max); + keysyms = XGetKeyboardMapping(dpy, min, max-min, &numcodes); + xNumcodes = numcodes; + + // loop through all keycodes + xkeycode_t *last = NULL; + for (int i = min; i <= max; ++i) { + // check if keycode is empty + int isEmpty = 1; + for (int j = 0; j < numcodes; ++j) { + int symindex = ((i - min) * numcodes) + j; + if (keysyms[symindex] != 0) { + isEmpty = 0; + break; + } + } + if (!isEmpty) continue; + + xkeycode_t *entry = (xkeycode_t *) malloc(sizeof(xkeycode_t)); + if (entry == NULL) return; + + entry->keycode = i; + if (last == NULL) { + xFreeKeycodesHead = entry; + } else { + last->next = entry; + } + last = entry; + } + + if (last != NULL) { + // make as circular list + last->next = xFreeKeycodesHead; + } + + XFree(keysyms); +} + +// get free keycode from list +KeyCode XFreeKeycodeGet() { + if (xFreeKeycodesHead == NULL) + return 0; + + // move head to next entry + xkeycode_t *entry = xFreeKeycodesHead; + xFreeKeycodesHead = entry->next; + + return entry->keycode; +} + +// map keysym to new keycode +KeyCode XKeysymMapNew(Display* dpy, KeySym keysym) { + // initialize free keycodes list + if (xFreeKeycodesHead == NULL) { + XFreeKeycodesInit(dpy); + } + + KeyCode keycode = XFreeKeycodeGet(); + + // no free keycodes, cannot map keysym + if (keycode != 0) { + KeySym keysym_list[xNumcodes]; + for(int i=0;i Date: Sat, 14 Jan 2023 20:38:37 +0100 Subject: [PATCH 779/876] no free keycodes, pick last two keycodes anyway. --- pkg/xorg/xorg.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkg/xorg/xorg.c b/pkg/xorg/xorg.c index 831a8275..358d8547 100644 --- a/pkg/xorg/xorg.c +++ b/pkg/xorg/xorg.c @@ -191,11 +191,24 @@ void XFreeKeycodesInit(Display* dpy) { last = entry; } - if (last != NULL) { - // make as circular list - last->next = xFreeKeycodesHead; + // no free keycodes, pick last two keycodes anyway + if (last == NULL) { + xkeycode_t *entry1 = (xkeycode_t *) malloc(sizeof(xkeycode_t)); + if (entry1 == NULL) return; + entry1->keycode = max-1; + + xkeycode_t *entry2 = (xkeycode_t *) malloc(sizeof(xkeycode_t)); + if (entry2 == NULL) return; + entry2->keycode = max-2; + + xFreeKeycodesHead = entry1; + entry1->next = entry2; + last = entry2; } + // make as circular list + last->next = xFreeKeycodesHead; + XFree(keysyms); } From ba0dea8022a34e56cc480790d74ba8937b024b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 15 Jan 2023 17:00:32 +0100 Subject: [PATCH 780/876] switch to xkb. --- pkg/xorg/xorg.c | 129 +++++++++++++++++------------------------------- pkg/xorg/xorg.h | 5 -- 2 files changed, 45 insertions(+), 89 deletions(-) diff --git a/pkg/xorg/xorg.c b/pkg/xorg/xorg.c index 358d8547..aa4e98f7 100644 --- a/pkg/xorg/xorg.c +++ b/pkg/xorg/xorg.c @@ -149,98 +149,59 @@ KeyCode XkbKeysymToKeycode(Display* dpy, KeySym keysym) { return keycode; } -static xkeycode_t *xFreeKeycodesHead = NULL; -int xNumcodes = 0; +// From https://github.com/TigerVNC/tigervnc/blob/a434ef3377943e89165ac13c537cd0f28be97f84/unix/x0vncserver/XDesktop.cxx#L401-L453 +KeyCode XkbAddKeyKeysym(Display* dpy, KeySym keysym) { + int types[1]; + unsigned int key; + XkbDescPtr xkb; + XkbMapChangesRec changes; + KeySym *syms; + KeySym upper, lower; -void XFreeKeycodesInit(Display* dpy) { - if (xFreeKeycodesHead != NULL) - return; + xkb = XkbGetMap(dpy, XkbAllComponentsMask, XkbUseCoreKbd); - KeyCode keycode; - KeySym *keysyms; - int min, max, numcodes; - - // get full keyboard mapping - XDisplayKeycodes(dpy, &min, &max); - keysyms = XGetKeyboardMapping(dpy, min, max-min, &numcodes); - xNumcodes = numcodes; - - // loop through all keycodes - xkeycode_t *last = NULL; - for (int i = min; i <= max; ++i) { - // check if keycode is empty - int isEmpty = 1; - for (int j = 0; j < numcodes; ++j) { - int symindex = ((i - min) * numcodes) + j; - if (keysyms[symindex] != 0) { - isEmpty = 0; - break; - } - } - if (!isEmpty) continue; - - xkeycode_t *entry = (xkeycode_t *) malloc(sizeof(xkeycode_t)); - if (entry == NULL) return; - - entry->keycode = i; - if (last == NULL) { - xFreeKeycodesHead = entry; - } else { - last->next = entry; - } - last = entry; - } - - // no free keycodes, pick last two keycodes anyway - if (last == NULL) { - xkeycode_t *entry1 = (xkeycode_t *) malloc(sizeof(xkeycode_t)); - if (entry1 == NULL) return; - entry1->keycode = max-1; - - xkeycode_t *entry2 = (xkeycode_t *) malloc(sizeof(xkeycode_t)); - if (entry2 == NULL) return; - entry2->keycode = max-2; - - xFreeKeycodesHead = entry1; - entry1->next = entry2; - last = entry2; - } - - // make as circular list - last->next = xFreeKeycodesHead; - - XFree(keysyms); -} - -// get free keycode from list -KeyCode XFreeKeycodeGet() { - if (xFreeKeycodesHead == NULL) + if (!xkb) return 0; - // move head to next entry - xkeycode_t *entry = xFreeKeycodesHead; - xFreeKeycodesHead = entry->next; - - return entry->keycode; -} - -// map keysym to new keycode -KeyCode XKeysymMapNew(Display* dpy, KeySym keysym) { - // initialize free keycodes list - if (xFreeKeycodesHead == NULL) { - XFreeKeycodesInit(dpy); + for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) { + if (XkbKeyNumGroups(xkb, key) == 0) + break; } - KeyCode keycode = XFreeKeycodeGet(); + // no free keycodes + if (key < xkb->min_key_code) + return 0; - // no free keycodes, cannot map keysym - if (keycode != 0) { - KeySym keysym_list[xNumcodes]; - for(int i=0;i Date: Fri, 20 Jan 2023 23:08:27 +0100 Subject: [PATCH 781/876] WebRTC ping over data channel (#23) * add datachannel ping to webrtc. * add ping pong decode func. --- internal/webrtc/handler.go | 33 +++++++++++++++++++++++++++++- internal/webrtc/manager.go | 2 +- internal/webrtc/payload/receive.go | 15 ++++++++++++++ internal/webrtc/payload/send.go | 15 ++++++++++++++ 4 files changed, 63 insertions(+), 2 deletions(-) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 34df576e..28a64a1e 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -3,12 +3,15 @@ package webrtc import ( "bytes" "encoding/binary" + "math" + "time" "github.com/demodesk/neko/internal/webrtc/payload" "github.com/demodesk/neko/pkg/types" + "github.com/pion/webrtc/v3" ) -func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) error { +func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataChannel, session types.Session) error { // add session id to logger context logger := manager.logger.With().Str("session_id", session.ID()).Logger() @@ -55,6 +58,34 @@ func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) erro } return nil + } else if header.Event == payload.OP_PING { + ping := &payload.Ping{} + if err := binary.Read(buffer, binary.BigEndian, ping); err != nil { + return err + } + + // change header event to pong + ping.Header = payload.Header{ + Event: payload.OP_PONG, + Length: 19, + } + + // generate server timestamp + serverTs := uint64(time.Now().UnixMilli()) + + // generate pong payload + pong := payload.Pong{ + Ping: *ping, + ServerTs1: uint32(serverTs / math.MaxUint32), + ServerTs2: uint32(serverTs % math.MaxUint32), + } + + buffer := &bytes.Buffer{} + if err := binary.Write(buffer, binary.BigEndian, pong); err != nil { + return err + } + + return dataChannel.Send(buffer.Bytes()) } // continue only if session is host diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 794fda3a..c4f771b6 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -475,7 +475,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int) }) dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { - if err := manager.handle(message.Data, session); err != nil { + if err := manager.handle(message.Data, dataChannel, session); err != nil { logger.Err(err).Msg("data handle failed") } }) diff --git a/internal/webrtc/payload/receive.go b/internal/webrtc/payload/receive.go index 8cbff5c8..856c067c 100644 --- a/internal/webrtc/payload/receive.go +++ b/internal/webrtc/payload/receive.go @@ -1,5 +1,7 @@ package payload +import "math" + const ( OP_MOVE = 0x01 OP_SCROLL = 0x02 @@ -7,6 +9,7 @@ const ( OP_KEY_UP = 0x04 OP_BTN_DOWN = 0x05 OP_BTN_UP = 0x06 + OP_PING = 0x07 ) type Move struct { @@ -28,3 +31,15 @@ type Key struct { Key uint32 } + +type Ping struct { + Header + + // client's timestamp split into two uint32 + ClientTs1 uint32 + ClientTs2 uint32 +} + +func (p Ping) ClientTs() uint64 { + return (uint64(p.ClientTs1) * uint64(math.MaxUint32)) + uint64(p.ClientTs2) +} diff --git a/internal/webrtc/payload/send.go b/internal/webrtc/payload/send.go index b3436f56..b539084e 100644 --- a/internal/webrtc/payload/send.go +++ b/internal/webrtc/payload/send.go @@ -1,8 +1,11 @@ package payload +import "math" + const ( OP_CURSOR_POSITION = 0x01 OP_CURSOR_IMAGE = 0x02 + OP_PONG = 0x03 ) type CursorPosition struct { @@ -20,3 +23,15 @@ type CursorImage struct { Xhot uint16 Yhot uint16 } + +type Pong struct { + Ping + + // server's timestamp split into two uint32 + ServerTs1 uint32 + ServerTs2 uint32 +} + +func (p Pong) ServerTs() uint64 { + return (uint64(p.ServerTs1) * uint64(math.MaxUint32)) + uint64(p.ServerTs2) +} From 94981e30aa7e273919862e2c8e294c1187b083ce Mon Sep 17 00:00:00 2001 From: Gheorghe Date: Mon, 23 Jan 2023 17:04:32 +0100 Subject: [PATCH 782/876] chore: add more resolutions - 25 fps 2k - 25 fps 1600x900 - 25 fps 1368x768 - 25 fps 800x1600 --- runtime/xorg.conf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/runtime/xorg.conf b/runtime/xorg.conf index 77d1d944..188d5a9e 100644 --- a/runtime/xorg.conf +++ b/runtime/xorg.conf @@ -78,8 +78,16 @@ Section "Monitor" # 3840x2160 @ 25.00 Hz (GTF) hsync: 54.77 kHz; pclk: 278.70 MHz Modeline "3840x2160_25.00" 278.70 3840 4056 4464 5088 2160 2161 2164 2191 -HSync +Vsync + # 2560x1440 @ 24.96 Hz (CVT) hsync: 36.53 kHz; pclk: 119.25 MHz + Modeline "2560x1440_25.00" 119.25 2560 2656 2912 3264 1440 1443 1448 1464 -Hsync +Vsync # 1920x1080 @ 25.00 Hz (GTF) hsync: 27.40 kHz; pclk: 64.88 MHz Modeline "1920x1080_25.00" 64.88 1920 1952 2144 2368 1080 1081 1084 1096 -HSync +Vsync + # 1600x900 @ 24.97 Hz (CVT) hsync: 22.88 kHz; pclk: 45.75 MHz + Modeline "1600x900_25.00" 45.75 1600 1648 1800 2000 900 903 908 916 -Hsync +Vsync + # 1368x768 @ 24.89 Hz (CVT) hsync: 19.51 kHz; pclk: 33.25 MHz + Modeline "1368x768_25.00" 33.25 1368 1408 1536 1704 768 771 781 784 -Hsync +Vsync + # 800x1600 @ 24.92 Hz (CVT) hsync: 40.53 kHz; pclk: 41.50 MHz + Modeline "800x1600_25.00" 41.50 800 832 912 1024 1600 1603 1613 1626 -Hsync +Vsync EndSection Section "Screen" @@ -90,7 +98,7 @@ Section "Screen" SubSection "Display" Viewport 0 0 Depth 24 - Modes "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "2560x1440_30.00" "1920x1080_30.00" "1368x768_30.00" "1280x720_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00" "3840x2160_25.00" "1920x1080_25.00" "800x1600_30.00" + Modes "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "2560x1440_30.00" "1920x1080_30.00" "1368x768_30.00" "1280x720_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00" "3840x2160_25.00" "2560x1440_25.00" "1920x1080_25.00" "1600x900_25.00" "1368x768_25.00" "800x1600_30.00" "800x1600_25.00" EndSubSection EndSection From a72648c409f14db204b15e9ed35f66b410d3eb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 27 Jan 2023 22:32:33 +0100 Subject: [PATCH 783/876] add dockerfile. (#22) --- Dockerfile.nvidia | 180 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 Dockerfile.nvidia diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia new file mode 100644 index 00000000..19b687e2 --- /dev/null +++ b/Dockerfile.nvidia @@ -0,0 +1,180 @@ +ARG UBUNTU_RELEASE=20.04 +ARG CUDA_VERSION=11.2.2 + +# +# Stage 1: Build. +# +FROM golang:1.18-bullseye as build +WORKDIR /src + +# +# install dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +ARG GIT_COMMIT +ARG GIT_BRANCH +ARG GIT_TAG + +# +# build server +COPY . . +RUN ./build + +# +# Stage 2: Runtime. +# +FROM nvcr.io/nvidia/cudagl:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_RELEASE} as runtime + +# Make all NVIDIA GPUs visible by default +ARG NVIDIA_VISIBLE_DEVICES=all +# All NVIDIA driver capabilities should preferably be used, check `NVIDIA_DRIVER_CAPABILITIES` inside the container if things do not work +ENV NVIDIA_DRIVER_CAPABILITIES all + +# +# set vgl-display to headless 3d gpu card/// correct values are egl[n] or /dev/dri/card0:if this is passed into container +ENV VGL_DISPLAY egl + +# +# set custom user +ARG USERNAME=neko +ARG USER_UID=1000 +ARG USER_GID=$USER_UID + +# +# install dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + wget ca-certificates supervisor \ + pulseaudio dbus-x11 xserver-xorg-video-dummy \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ + software-properties-common cabextract aptitude vim curl \ + # + # needed for profile upload preStop hook + zip curl \ + # + # file chooser handler, clipboard, drop + xdotool xclip libgtk-3-0 \ + # + # hardware acclerations utilities + libgtk-3-bin mesa-utils mesa-utils-extra mesa-va-drivers mesa-vulkan-drivers libvulkan-dev libvulkan-dev:i386 vdpauinfo \ + # + # gst + gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ + gstreamer1.0-pulseaudio; \ + # + # create a non-root user + groupadd --gid $USER_GID $USERNAME; \ + useradd --uid $USER_UID --gid $USERNAME --shell /bin/bash --create-home $USERNAME; \ + adduser $USERNAME audio; \ + adduser $USERNAME video; \ + adduser $USERNAME pulse; \ + # + # setup pulseaudio + mkdir -p /home/$USERNAME/.config/pulse/; \ + echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \ + # + # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 + mkdir /tmp/.X11-unix; \ + chmod 1777 /tmp/.X11-unix; \ + chown $USERNAME /tmp/.X11-unix/; \ + # + # make directories for neko + mkdir -p /etc/neko /var/www; \ + chown -R $USERNAME:$USERNAME /home/$USERNAME; \ + # + # install fonts + apt-get install -y --no-install-recommends \ + # Emojis + fonts-noto-color-emoji \ + # Chinese fonts + fonts-arphic-ukai fonts-arphic-uming \ + # Japanese fonts + fonts-ipafont-mincho fonts-ipafont-gothic \ + # Korean fonts + fonts-unfonts-core \ + # Indian fonts + fonts-indic; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# Install and configure Vulkan manually +RUN if [ "${UBUNTU_RELEASE}" = "18.04" ]; then apt-get update && apt-get install --no-install-recommends -y vulkan-utils; else apt-get update && apt-get install --no-install-recommends -y vulkan-tools; fi && \ + rm -rf /var/lib/apt/lists/* && \ + VULKAN_API_VERSION=$(dpkg -s libvulkan1 | grep -oP 'Version: [0-9|\.]+' | grep -oP '[0-9]+(\.[0-9]+)(\.[0-9]+)') && \ + mkdir -p /etc/vulkan/icd.d/ && \ + echo "{\n\ + \"file_format_version\" : \"1.0.0\",\n\ + \"ICD\": {\n\ + \"library_path\": \"libGLX_nvidia.so.0\",\n\ + \"api_version\" : \"${VULKAN_API_VERSION}\"\n\ + }\n\ +}" > /etc/vulkan/icd.d/nvidia_icd.json + +ARG VIRTUALGL_VERSION=3.0.2 +# +# Install VirtualGL and make libraries available for preload +RUN curl -fsSL -O "https://sourceforge.net/projects/virtualgl/files/virtualgl_${VIRTUALGL_VERSION}_amd64.deb" && \ + curl -fsSL -O "https://sourceforge.net/projects/virtualgl/files/virtualgl32_${VIRTUALGL_VERSION}_amd64.deb" && \ + apt-get update && apt-get install -y --no-install-recommends ./virtualgl_${VIRTUALGL_VERSION}_amd64.deb ./virtualgl32_${VIRTUALGL_VERSION}_amd64.deb && \ + rm -f "virtualgl_${VIRTUALGL_VERSION}_amd64.deb" "virtualgl32_${VIRTUALGL_VERSION}_amd64.deb" && \ + rm -rf /var/lib/apt/lists/* && \ + chmod u+s /usr/lib/libvglfaker.so && \ + chmod u+s /usr/lib/libdlfaker.so && \ + chmod u+s /usr/lib32/libvglfaker.so && \ + chmod u+s /usr/lib32/libdlfaker.so && \ + chmod u+s /usr/lib/i386-linux-gnu/libvglfaker.so && \ + chmod u+s /usr/lib/i386-linux-gnu/libdlfaker.so + +# +# copy runtime configs +COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources +COPY runtime/dbus /usr/bin/dbus +COPY runtime/default.pa /etc/pulse/default.pa +COPY runtime/supervisord.conf /etc/neko/supervisord.conf +COPY runtime/xorg.conf /etc/neko/xorg.conf + +# +# copy runtime folders +COPY --chown=neko:neko runtime/icon-theme /home/$USERNAME/.icons/default +COPY runtime/fontconfig/* /etc/fonts/conf.d/ +COPY runtime/fonts /usr/local/share/fonts + +# +# set default envs +ENV USER=$USERNAME +ENV DISPLAY=:99.0 +ENV NEKO_SERVER_BIND=:8080 +ENV NEKO_PLUGINS_ENABLED=true +ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/ + +# +# copy plugins from previous stage +COPY --from=build /src/bin/plugins/ $NEKO_PLUGINS_DIR + +# +# copy executable from previous stage +COPY --from=build /src/bin/neko /usr/bin/neko + +# +# add healthcheck +HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ + CMD wget -O - http://localhost:${NEKO_SERVER_BIND#*:}/health || exit 1 + +# +# run neko +CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"] From e80ae8019e96015390bfa70732049d8f4f9769bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Jan 2023 11:31:30 +0100 Subject: [PATCH 784/876] set answering dtls role as server. (#24) --- internal/webrtc/manager.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index c4f771b6..4b348110 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -170,6 +170,9 @@ func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logg settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) settings.SetLite(manager.config.ICELite) + // make sure server answer sdp setup as passive, to not force DTLS renegotiation + // otherwise iOS renegotiation fails with: Failed to set SSL role for the transport. + settings.SetAnsweringDTLSRole(webrtc.DTLSRoleServer) var networkType []webrtc.NetworkType From 2364facd60d054a6cd298ddcee0e539c9ee23cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 6 Feb 2023 19:45:51 +0100 Subject: [PATCH 785/876] WebRTC congestion control (#26) * Add congestion control * Improve stream matching, add manual stream selection, add metrics * Use a ticker for bitrate estimation and make bandwidth drops switch to lower streams more aggressively * Missing signal response, fix video auto bug * Remove redundant mutex * Bitrate history queue * Get bitrate fn support h264 & float64 --------- Co-authored-by: Aleksandar Sukovic --- internal/capture/buckets.go | 105 ------------- internal/capture/buckets/buckets.go | 145 ++++++++++++++++++ internal/capture/buckets/buckets_test.go | 83 ++++++++++ internal/capture/buckets/queue.go | 88 +++++++++++ internal/capture/buckets/queue_test.go | 99 ++++++++++++ internal/capture/manager.go | 16 +- internal/capture/streamsink.go | 23 ++- internal/webrtc/manager.go | 183 ++++++++++++++++++----- internal/webrtc/metrics.go | 4 +- internal/webrtc/peer.go | 47 ++++-- internal/webrtc/track.go | 70 +++++++-- internal/websocket/handler/signal.go | 36 ++--- pkg/types/capture.go | 44 ++++-- pkg/types/message/messages.go | 10 +- pkg/types/webrtc.go | 7 +- 15 files changed, 738 insertions(+), 222 deletions(-) delete mode 100644 internal/capture/buckets.go create mode 100644 internal/capture/buckets/buckets.go create mode 100644 internal/capture/buckets/buckets_test.go create mode 100644 internal/capture/buckets/queue.go create mode 100644 internal/capture/buckets/queue_test.go diff --git a/internal/capture/buckets.go b/internal/capture/buckets.go deleted file mode 100644 index 04a87f09..00000000 --- a/internal/capture/buckets.go +++ /dev/null @@ -1,105 +0,0 @@ -package capture - -import ( - "errors" - "fmt" - "math" - - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" - - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/codec" -) - -type BucketsManagerCtx struct { - logger zerolog.Logger - codec codec.RTPCodec - streams map[string]*StreamSinkManagerCtx - streamIDs []string -} - -func bucketsNew(codec codec.RTPCodec, streams map[string]*StreamSinkManagerCtx, streamIDs []string) *BucketsManagerCtx { - logger := log.With(). - Str("module", "capture"). - Str("submodule", "buckets"). - Logger() - - return &BucketsManagerCtx{ - logger: logger, - codec: codec, - streams: streams, - streamIDs: streamIDs, - } -} - -func (m *BucketsManagerCtx) shutdown() { - m.logger.Info().Msgf("shutdown") -} - -func (m *BucketsManagerCtx) destroyAll() { - for _, stream := range m.streams { - if stream.Started() { - stream.destroyPipeline() - } - } -} - -func (m *BucketsManagerCtx) recreateAll() error { - for _, stream := range m.streams { - if stream.Started() { - err := stream.createPipeline() - if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { - return err - } - } - } - - return nil -} - -func (m *BucketsManagerCtx) IDs() []string { - return m.streamIDs -} - -func (m *BucketsManagerCtx) Codec() codec.RTPCodec { - return m.codec -} - -func (m *BucketsManagerCtx) SetReceiver(receiver types.Receiver) error { - receiver.OnBitrateChange(func(bitrate int) error { - stream, ok := m.findNearestStream(bitrate) - if !ok { - return fmt.Errorf("no stream found for bitrate %d", bitrate) - } - - return receiver.SetStream(stream) - }) - - return nil -} - -func (m *BucketsManagerCtx) findNearestStream(bitrate int) (ss *StreamSinkManagerCtx, ok bool) { - minDiff := math.MaxInt - for _, s := range m.streams { - streamBitrate, err := s.Bitrate() - if err != nil { - m.logger.Error().Err(err).Msgf("failed to get bitrate for stream %s", s.ID()) - continue - } - - diffAbs := int(math.Abs(float64(bitrate - streamBitrate))) - - if diffAbs < minDiff { - minDiff, ss = diffAbs, s - } - } - ok = ss != nil - return -} - -func (m *BucketsManagerCtx) RemoveReceiver(receiver types.Receiver) error { - receiver.OnBitrateChange(nil) - receiver.RemoveStream() - return nil -} diff --git a/internal/capture/buckets/buckets.go b/internal/capture/buckets/buckets.go new file mode 100644 index 00000000..6d0c9870 --- /dev/null +++ b/internal/capture/buckets/buckets.go @@ -0,0 +1,145 @@ +package buckets + +import ( + "errors" + "sort" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" +) + +type BucketsManagerCtx struct { + logger zerolog.Logger + codec codec.RTPCodec + streams map[string]types.StreamSinkManager + streamIDs []string +} + +func BucketsNew(codec codec.RTPCodec, streams map[string]types.StreamSinkManager, streamIDs []string) *BucketsManagerCtx { + logger := log.With(). + Str("module", "capture"). + Str("submodule", "buckets"). + Logger() + + return &BucketsManagerCtx{ + logger: logger, + codec: codec, + streams: streams, + streamIDs: streamIDs, + } +} + +func (manager *BucketsManagerCtx) Shutdown() { + manager.logger.Info().Msgf("shutdown") + + manager.DestroyAll() +} + +func (manager *BucketsManagerCtx) DestroyAll() { + for _, stream := range manager.streams { + if stream.Started() { + stream.DestroyPipeline() + } + } +} + +func (manager *BucketsManagerCtx) RecreateAll() error { + for _, stream := range manager.streams { + if stream.Started() { + err := stream.CreatePipeline() + if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { + return err + } + } + } + return nil +} + +func (manager *BucketsManagerCtx) IDs() []string { + return manager.streamIDs +} + +func (manager *BucketsManagerCtx) Codec() codec.RTPCodec { + return manager.codec +} + +func (manager *BucketsManagerCtx) SetReceiver(receiver types.Receiver) { + // bitrate history is per receiver + bitrateHistory := &queue{} + + receiver.OnBitrateChange(func(peerBitrate int) (bool, error) { + bitrate := peerBitrate + if receiver.VideoAuto() { + bitrate = bitrateHistory.normaliseBitrate(bitrate) + } + + stream := manager.findNearestStream(bitrate) + streamID := stream.ID() + + // TODO: make this less noisy in logs + manager.logger.Debug(). + Str("video_id", streamID). + Int("len", bitrateHistory.len()). + Int("peer_bitrate", peerBitrate). + Int("bitrate", bitrate). + Msg("change video bitrate") + + return receiver.SetStream(stream) + }) + + receiver.OnVideoChange(func(videoID string) (bool, error) { + stream := manager.streams[videoID] + manager.logger.Info(). + Str("video_id", videoID). + Msg("video change") + + return receiver.SetStream(stream) + }) +} + +func (manager *BucketsManagerCtx) findNearestStream(peerBitrate int) types.StreamSinkManager { + type streamDiff struct { + id string + bitrateDiff int + } + + sortDiff := func(a, b int) bool { + switch { + case a < 0 && b < 0: + return a > b + case a >= 0: + if b >= 0 { + return a <= b + } + return true + } + return false + } + + var diffs []streamDiff + + for _, stream := range manager.streams { + diffs = append(diffs, streamDiff{ + id: stream.ID(), + bitrateDiff: peerBitrate - stream.Bitrate(), + }) + } + + sort.Slice(diffs, func(i, j int) bool { + return sortDiff(diffs[i].bitrateDiff, diffs[j].bitrateDiff) + }) + + bestDiff := diffs[0] + + return manager.streams[bestDiff.id] +} + +func (manager *BucketsManagerCtx) RemoveReceiver(receiver types.Receiver) error { + receiver.OnBitrateChange(nil) + receiver.OnVideoChange(nil) + receiver.RemoveStream() + return nil +} diff --git a/internal/capture/buckets/buckets_test.go b/internal/capture/buckets/buckets_test.go new file mode 100644 index 00000000..9fedcdd2 --- /dev/null +++ b/internal/capture/buckets/buckets_test.go @@ -0,0 +1,83 @@ +package buckets + +import ( + "reflect" + "testing" + + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" +) + +func TestBucketsManagerCtx_FindNearestStream(t *testing.T) { + type fields struct { + codec codec.RTPCodec + streams map[string]types.StreamSinkManager + } + type args struct { + peerBitrate int + } + tests := []struct { + name string + fields fields + args args + want types.StreamSinkManager + }{ + { + name: "findNearestStream", + fields: fields{ + streams: map[string]types.StreamSinkManager{ + "1": mockStreamSink{ + id: "1", + bitrate: 500, + }, + "2": mockStreamSink{ + id: "2", + bitrate: 750, + }, + "3": mockStreamSink{ + id: "3", + bitrate: 1000, + }, + "4": mockStreamSink{ + id: "4", + bitrate: 1250, + }, + "5": mockStreamSink{ + id: "5", + bitrate: 1700, + }, + }, + }, + args: args{ + peerBitrate: 950, + }, + want: mockStreamSink{ + id: "2", + bitrate: 750, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + m := BucketsNew(tt.fields.codec, tt.fields.streams, []string{}) + + if got := m.findNearestStream(tt.args.peerBitrate); !reflect.DeepEqual(got, tt.want) { + t.Errorf("findNearestStream() = %v, want %v", got, tt.want) + } + }) + } +} + +type mockStreamSink struct { + id string + bitrate int + types.StreamSinkManager +} + +func (m mockStreamSink) ID() string { + return m.id +} + +func (m mockStreamSink) Bitrate() int { + return m.bitrate +} diff --git a/internal/capture/buckets/queue.go b/internal/capture/buckets/queue.go new file mode 100644 index 00000000..e79eb635 --- /dev/null +++ b/internal/capture/buckets/queue.go @@ -0,0 +1,88 @@ +package buckets + +import ( + "math" + "sync" + "time" +) + +type queue struct { + sync.Mutex + q []elem +} + +type elem struct { + created time.Time + bitrate int +} + +func (q *queue) push(v elem) { + q.Lock() + defer q.Unlock() + + // if the first element is older than 10 seconds, remove it + if len(q.q) > 0 && time.Since(q.q[0].created) > 10*time.Second { + q.q = q.q[1:] + } + q.q = append(q.q, v) +} + +func (q *queue) len() int { + q.Lock() + defer q.Unlock() + return len(q.q) +} + +func (q *queue) avg() int { + q.Lock() + defer q.Unlock() + if len(q.q) == 0 { + return 0 + } + sum := 0 + for _, v := range q.q { + sum += v.bitrate + } + return sum / len(q.q) +} + +func (q *queue) avgLastN(n int) int { + if n <= 0 { + return q.avg() + } + q.Lock() + defer q.Unlock() + if len(q.q) == 0 { + return 0 + } + sum := 0 + for _, v := range q.q[len(q.q)-n:] { + sum += v.bitrate + } + return sum / n +} + +func (q *queue) normaliseBitrate(currentBitrate int) int { + avgBitrate := float64(q.avg()) + histLen := float64(q.len()) + + q.push(elem{ + bitrate: currentBitrate, + created: time.Now(), + }) + + if avgBitrate == 0 || histLen == 0 || currentBitrate == 0 { + return currentBitrate + } + + lastN := int(math.Floor(float64(currentBitrate) / avgBitrate * histLen)) + if lastN > q.len() { + lastN = q.len() + } + + if lastN == 0 { + return currentBitrate + } + + return q.avgLastN(lastN) +} diff --git a/internal/capture/buckets/queue_test.go b/internal/capture/buckets/queue_test.go new file mode 100644 index 00000000..4deda5f8 --- /dev/null +++ b/internal/capture/buckets/queue_test.go @@ -0,0 +1,99 @@ +package buckets + +import "testing" + +func Queue_normaliseBitrate(t *testing.T) { + type fields struct { + queue *queue + } + type args struct { + currentBitrate int + } + tests := []struct { + name string + fields fields + args args + want []int + }{ + { + name: "normaliseBitrate: big drop", + fields: fields{ + queue: &queue{ + q: []elem{ + {bitrate: 900}, + {bitrate: 750}, + {bitrate: 780}, + {bitrate: 1100}, + {bitrate: 950}, + {bitrate: 700}, + {bitrate: 800}, + {bitrate: 900}, + {bitrate: 1000}, + {bitrate: 1100}, + // avg = 898 + }, + }, + }, + args: args{ + currentBitrate: 350, + }, + want: []int{816, 700, 537, 350, 350}, + }, { + name: "normaliseBitrate: small drop", + fields: fields{ + queue: &queue{ + q: []elem{ + {bitrate: 900}, + {bitrate: 750}, + {bitrate: 780}, + {bitrate: 1100}, + {bitrate: 950}, + {bitrate: 700}, + {bitrate: 800}, + {bitrate: 900}, + {bitrate: 1000}, + {bitrate: 1100}, + // avg = 898 + }, + }, + }, + args: args{ + currentBitrate: 700, + }, + want: []int{878, 842, 825, 825, 812, 787, 750, 700}, + }, { + name: "normaliseBitrate", + fields: fields{ + queue: &queue{ + q: []elem{ + {bitrate: 900}, + {bitrate: 750}, + {bitrate: 780}, + {bitrate: 1100}, + {bitrate: 950}, + {bitrate: 700}, + {bitrate: 800}, + {bitrate: 900}, + {bitrate: 1000}, + {bitrate: 1100}, + // avg = 898 + }, + }, + }, + args: args{ + currentBitrate: 1350, + }, + want: []int{943, 1003, 1060, 1085}, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + m := tt.fields.queue + for i := 0; i < len(tt.want); i++ { + if got := m.normaliseBitrate(tt.args.currentBitrate); got != tt.want[i] { + t.Errorf("normaliseBitrate() [%d] = %v, want %v", i, got, tt.want[i]) + } + } + }) + } +} diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 2f96c8e1..c22a6162 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -8,6 +8,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "github.com/demodesk/neko/internal/capture/buckets" "github.com/demodesk/neko/internal/config" "github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/types/codec" @@ -22,7 +23,7 @@ type CaptureManagerCtx struct { broadcast *BroacastManagerCtx screencast *ScreencastManagerCtx audio *StreamSinkManagerCtx - video *BucketsManagerCtx + video types.BucketsManager // sources webcam *StreamSrcManagerCtx @@ -32,7 +33,7 @@ type CaptureManagerCtx struct { func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { logger := log.With().Str("module", "capture").Logger() - videos := map[string]*StreamSinkManagerCtx{} + videos := map[string]types.StreamSinkManager{} for video_id, cnf := range config.VideoPipelines { pipelineConf := cnf @@ -68,9 +69,10 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt Msg("syntax check for video stream pipeline passed") getVideoBitrate := pipelineConf.GetBitrateFn(desktop.GetScreenSize) - if err != nil { + if _, err = getVideoBitrate(); err != nil { logger.Panic().Err(err).Msg("unable to get video bitrate") } + // append to videos videos[video_id] = streamSinkNew(config.VideoCodec, createPipeline, video_id, getVideoBitrate) } @@ -139,7 +141,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! appsink name=appsink", config.AudioDevice, config.AudioCodec.Pipeline, ), nil }, "audio", nil), - video: bucketsNew(config.VideoCodec, videos, config.VideoIDs), + video: buckets.BucketsNew(config.VideoCodec, videos, config.VideoIDs), // sources webcam: streamSrcNew(config.WebcamEnabled, map[string]string{ @@ -200,7 +202,7 @@ func (manager *CaptureManagerCtx) Start() { } manager.desktop.OnBeforeScreenSizeChange(func() { - manager.video.destroyAll() + manager.video.DestroyAll() if manager.broadcast.Started() { manager.broadcast.destroyPipeline() @@ -212,7 +214,7 @@ func (manager *CaptureManagerCtx) Start() { }) manager.desktop.OnAfterScreenSizeChange(func() { - err := manager.video.recreateAll() + err := manager.video.RecreateAll() if err != nil { manager.logger.Panic().Err(err).Msg("unable to recreate video pipelines") } @@ -240,7 +242,7 @@ func (manager *CaptureManagerCtx) Shutdown() error { manager.screencast.shutdown() manager.audio.shutdown() - manager.video.shutdown() + manager.video.Shutdown() manager.webcam.shutdown() manager.microphone.shutdown() diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index cb6225af..3400840e 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -105,7 +105,7 @@ func (manager *StreamSinkManagerCtx) shutdown() { } manager.listenersMu.Unlock() - manager.destroyPipeline() + manager.DestroyPipeline() manager.wg.Wait() } @@ -113,12 +113,19 @@ func (manager *StreamSinkManagerCtx) ID() string { return manager.id } -func (manager *StreamSinkManagerCtx) Bitrate() (int, error) { +func (manager *StreamSinkManagerCtx) Bitrate() int { if manager.getBitrate == nil { - return 0, nil + return 0 } + // recalculate bitrate every time, take screen resolution (and fps) into account - return manager.getBitrate() + // we called this function during startup, so it shouldn't error here + bitrate, err := manager.getBitrate() + if err != nil { + manager.logger.Err(err).Msg("unexpected error while getting bitrate") + } + + return bitrate } func (manager *StreamSinkManagerCtx) Codec() codec.RTPCodec { @@ -127,7 +134,7 @@ func (manager *StreamSinkManagerCtx) Codec() codec.RTPCodec { func (manager *StreamSinkManagerCtx) start() error { if len(manager.listeners) == 0 { - err := manager.createPipeline() + err := manager.CreatePipeline() if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { return err } @@ -140,7 +147,7 @@ func (manager *StreamSinkManagerCtx) start() error { func (manager *StreamSinkManagerCtx) stop() { if len(manager.listeners) == 0 { - manager.destroyPipeline() + manager.DestroyPipeline() manager.logger.Info().Msgf("last listener, stopping") } } @@ -259,7 +266,7 @@ func (manager *StreamSinkManagerCtx) Started() bool { return manager.ListenersCount() > 0 } -func (manager *StreamSinkManagerCtx) createPipeline() error { +func (manager *StreamSinkManagerCtx) CreatePipeline() error { manager.pipelineMu.Lock() defer manager.pipelineMu.Unlock() @@ -313,7 +320,7 @@ func (manager *StreamSinkManagerCtx) createPipeline() error { return nil } -func (manager *StreamSinkManagerCtx) destroyPipeline() { +func (manager *StreamSinkManagerCtx) DestroyPipeline() { manager.pipelineMu.Lock() defer manager.pipelineMu.Unlock() diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 4b348110..e220316c 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -9,6 +9,8 @@ import ( "github.com/pion/ice/v2" "github.com/pion/interceptor" + "github.com/pion/interceptor/pkg/cc" + "github.com/pion/interceptor/pkg/gcc" "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/rs/zerolog" @@ -35,6 +37,9 @@ const keepAliveInterval = 2 * time.Second // send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval const rtcpPLIInterval = 3 * time.Second +// how often we check the bitrate of each client. Default is 250ms +const bitrateCheckInterval = 250 * time.Millisecond + func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { configuration := webrtc.Configuration{ SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, @@ -153,12 +158,12 @@ func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { return manager.config.ICEServers } -func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) { +func (manager *WebRTCManagerCtx) newPeerConnection(bitrate int, codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, cc.BandwidthEstimator, error) { // create media engine engine := &webrtc.MediaEngine{} for _, codec := range codecs { if err := codec.Register(engine); err != nil { - return nil, err + return nil, nil, err } } @@ -205,8 +210,29 @@ func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logg // create interceptor registry registry := &interceptor.Registry{} + + congestionController, err := cc.NewInterceptor(func() (cc.BandwidthEstimator, error) { + if bitrate == 0 { + bitrate = 1000000 + } + return gcc.NewSendSideBWE(gcc.SendSideBWEInitialBitrate(bitrate)) + }) + if err != nil { + return nil, nil, err + } + + estimatorChan := make(chan cc.BandwidthEstimator, 1) + congestionController.OnNewPeerConnection(func(id string, estimator cc.BandwidthEstimator) { + estimatorChan <- estimator + }) + + registry.Add(congestionController) + if err = webrtc.ConfigureTWCCHeaderExtensionSender(engine, registry); err != nil { + return nil, nil, err + } + if err := webrtc.RegisterDefaultInterceptors(engine, registry); err != nil { - return nil, err + return nil, nil, err } // create new API @@ -217,10 +243,12 @@ func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logg ) // create new peer connection - return api.NewPeerConnection(manager.webrtcConfiguration) + configuration := manager.webrtcConfiguration + connection, err := api.NewPeerConnection(configuration) + return connection, <-estimatorChan, err } -func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int) (*webrtc.SessionDescription, error) { +func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, videoAuto bool) (*webrtc.SessionDescription, error) { id := atomic.AddInt32(&manager.peerId, 1) manager.metrics.NewConnection(session) @@ -236,7 +264,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int) video := manager.capture.Video() videoCodec := video.Codec() - connection, err := manager.newPeerConnection([]codec.RTPCodec{ + connection, estimator, err := manager.newPeerConnection(bitrate, []codec.RTPCodec{ audioCodec, videoCodec, }, logger) @@ -244,6 +272,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int) return nil, err } + if bitrate == 0 { + bitrate = estimator.GetTargetBitrate() + } + // asynchronously send local ICE Candidates if manager.config.ICETrickle { connection.OnICECandidate(func(candidate *webrtc.ICECandidate) { @@ -268,31 +300,117 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int) } // set stream for audio track - err = audioTrack.SetStream(audio) + _, err = audioTrack.SetStream(audio) if err != nil { return nil, err } // video track - - videoTrack, err := NewTrack(logger, videoCodec, connection) + videoTrack, err := NewTrack(logger, videoCodec, connection, WithVideoAuto(videoAuto)) if err != nil { return nil, err } // let video stream bucket manager handle stream subscriptions - err = video.SetReceiver(videoTrack) - if err != nil { - return nil, err + video.SetReceiver(videoTrack) + + changeVideoFromBitrate := func(peerBitrate int) { + // when switching from manual to auto bitrate estimation, in case the estimator is + // idle (lastBitrate > maxBitrate), we want to go back to the previous estimated bitrate + if peerBitrate == 0 { + peerBitrate = estimator.GetTargetBitrate() + manager.logger.Debug(). + Int("peer_bitrate", peerBitrate). + Msg("evaluated bitrate") + } + + ok, err := videoTrack.SetBitrate(peerBitrate) + if err != nil { + logger.Error().Err(err). + Int("peer_bitrate", peerBitrate). + Msg("unable to set video bitrate") + return + } + + if !ok { + return + } + + videoID := videoTrack.stream.ID() + bitrate := videoTrack.stream.Bitrate() + + manager.metrics.SetVideoID(session, videoID) + manager.logger.Debug(). + Int("peer_bitrate", peerBitrate). + Int("video_bitrate", bitrate). + Str("video_id", videoID). + Msg("peer bitrate triggered video stream change") + + go session.Send( + event.SIGNAL_VIDEO, + message.SignalVideo{ + Video: videoID, + Bitrate: bitrate, + VideoAuto: videoTrack.VideoAuto(), + }) } + changeVideoFromID := func(videoID string) (bitrate int) { + changed, err := videoTrack.SetVideoID(videoID) + if err != nil { + logger.Error().Err(err). + Str("video_id", videoID). + Msg("unable to set video stream") + return + } + + if !changed { + return + } + + bitrate = videoTrack.stream.Bitrate() + + manager.logger.Debug(). + Str("video_id", videoID). + Int("video_bitrate", bitrate). + Msg("peer video id triggered video stream change") + + go session.Send( + event.SIGNAL_VIDEO, + message.SignalVideo{ + Video: videoID, + Bitrate: bitrate, + VideoAuto: videoTrack.VideoAuto(), + }) + + return + } + + manager.logger.Info(). + Int("target_bitrate", bitrate). + Msg("estimated initial peer bitrate") + // set initial video bitrate - if err = videoTrack.SetBitrate(bitrate); err != nil { - return nil, err - } + changeVideoFromBitrate(bitrate) - videoID := videoTrack.stream.ID() - manager.metrics.SetVideoID(session, videoID) + // use a ticker to get current client target bitrate + go func() { + ticker := time.NewTicker(bitrateCheckInterval) + defer ticker.Stop() + + for range ticker.C { + targetBitrate := estimator.GetTargetBitrate() + manager.metrics.SetReceiverEstimatedMaximumBitrate(session, float64(targetBitrate)) + + if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { + break + } + if !videoTrack.VideoAuto() { + continue + } + changeVideoFromBitrate(targetBitrate) + } + }() // data channel @@ -302,27 +420,20 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int) } peer := &WebRTCPeerCtx{ - logger: logger, - connection: connection, - dataChannel: dataChannel, - changeVideo: func(bitrate int) error { - if err := videoTrack.SetBitrate(bitrate); err != nil { - return err - } - - videoID := videoTrack.stream.ID() - manager.metrics.SetVideoID(session, videoID) - return nil - }, + logger: logger, + connection: connection, + dataChannel: dataChannel, + changeVideoFromBitrate: changeVideoFromBitrate, + changeVideoFromID: changeVideoFromID, // TODO: Refactor. - videoId: func() string { - return videoTrack.stream.ID() - }, + videoId: videoTrack.stream.ID, setPaused: func(isPaused bool) { videoTrack.SetPaused(isPaused) audioTrack.SetPaused(isPaused) }, - iceTrickle: manager.config.ICETrickle, + iceTrickle: manager.config.ICETrickle, + setVideoAuto: videoTrack.SetVideoAuto, + getVideoAuto: videoTrack.VideoAuto, } connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) { @@ -515,11 +626,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int) }) videoTrack.OnRTCP(func(p rtcp.Packet) { - switch rtcpPacket := p.(type) { - case *rtcp.ReceiverEstimatedMaximumBitrate: // TODO: Deprecated. - manager.metrics.SetReceiverEstimatedMaximumBitrate(session, rtcpPacket.Bitrate) - - case *rtcp.ReceiverReport: + if rtcpPacket, ok := p.(*rtcp.ReceiverReport); ok { l := len(rtcpPacket.Reports) if l > 0 { // use only last report diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index dce22809..2da28e32 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -327,10 +327,10 @@ func (m *metricsCtx) SetVideoID(session types.Session, videoId string) { } } -func (m *metricsCtx) SetReceiverEstimatedMaximumBitrate(session types.Session, bitrate float32) { +func (m *metricsCtx) SetReceiverEstimatedMaximumBitrate(session types.Session, bitrate float64) { met := m.getBySession(session) - met.receiverEstimatedMaximumBitrate.Set(float64(bitrate)) + met.receiverEstimatedMaximumBitrate.Set(bitrate) } func (m *metricsCtx) SetReceiverReport(session types.Session, report rtcp.ReceptionReport) { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index bee30a64..09e982fa 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -13,14 +13,17 @@ import ( ) type WebRTCPeerCtx struct { - mu sync.Mutex - logger zerolog.Logger - connection *webrtc.PeerConnection - dataChannel *webrtc.DataChannel - changeVideo func(bitrate int) error - videoId func() string - setPaused func(isPaused bool) - iceTrickle bool + mu sync.Mutex + logger zerolog.Logger + connection *webrtc.PeerConnection + dataChannel *webrtc.DataChannel + changeVideoFromBitrate func(bitrate int) + changeVideoFromID func(id string) int + videoId func() string + setPaused func(isPaused bool) + setVideoAuto func(auto bool) + getVideoAuto func() bool + iceTrickle bool } func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) { @@ -115,7 +118,7 @@ func (peer *WebRTCPeerCtx) SetCandidate(candidate webrtc.ICECandidateInit) error return peer.connection.AddICECandidate(candidate) } -func (peer *WebRTCPeerCtx) SetVideoBitrate(bitrate int) error { +func (peer *WebRTCPeerCtx) SetVideoBitrate(peerBitrate int) error { peer.mu.Lock() defer peer.mu.Unlock() @@ -123,12 +126,24 @@ func (peer *WebRTCPeerCtx) SetVideoBitrate(bitrate int) error { return types.ErrWebRTCConnectionNotFound } - peer.logger.Info().Int("bitrate", bitrate).Msg("change video bitrate") - return peer.changeVideo(bitrate) + peer.changeVideoFromBitrate(peerBitrate) + return nil +} + +func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { + peer.mu.Lock() + defer peer.mu.Unlock() + + if peer.connection == nil { + return types.ErrWebRTCConnectionNotFound + } + + peer.changeVideoFromID(videoID) + return nil } // TODO: Refactor. -func (peer *WebRTCPeerCtx) GetVideoId() string { +func (peer *WebRTCPeerCtx) GetVideoID() string { peer.mu.Lock() defer peer.mu.Unlock() @@ -215,3 +230,11 @@ func (peer *WebRTCPeerCtx) Destroy() { peer.connection = nil } } + +func (peer *WebRTCPeerCtx) SetVideoAuto(auto bool) { + peer.setVideoAuto(auto) +} + +func (peer *WebRTCPeerCtx) VideoAuto() bool { + return peer.getVideoAuto() +} diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index 16cb12c9..6528d459 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -16,10 +16,12 @@ import ( ) type Track struct { - logger zerolog.Logger - track *webrtc.TrackLocalStaticSample - paused bool - listener func(sample types.Sample) + logger zerolog.Logger + track *webrtc.TrackLocalStaticSample + paused bool + videoAuto bool + videoAutoMu sync.RWMutex + listener func(sample types.Sample) stream types.StreamSinkManager streamMu sync.Mutex @@ -27,10 +29,19 @@ type Track struct { onRtcp func(rtcp.Packet) onRtcpMu sync.RWMutex - bitrateChange func(int) error + bitrateChange func(int) (bool, error) + videoChange func(string) (bool, error) } -func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.PeerConnection) (*Track, error) { +type option func(*Track) + +func WithVideoAuto(auto bool) option { + return func(t *Track) { + t.videoAuto = auto + } +} + +func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.PeerConnection, opts ...option) (*Track, error) { id := codec.Type.String() track, err := webrtc.NewTrackLocalStaticSample(codec.Capability, id, "stream") if err != nil { @@ -44,6 +55,10 @@ func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.Pe track: track, } + for _, opt := range opts { + opt(t) + } + t.listener = func(sample types.Sample) { if t.paused { return @@ -96,13 +111,13 @@ func (t *Track) rtcpReader(sender *webrtc.RTPSender) { } } -func (t *Track) SetStream(stream types.StreamSinkManager) error { +func (t *Track) SetStream(stream types.StreamSinkManager) (bool, error) { t.streamMu.Lock() defer t.streamMu.Unlock() // if we already listen to the stream, do nothing if t.stream == stream { - return nil + return false, nil } var err error @@ -111,12 +126,13 @@ func (t *Track) SetStream(stream types.StreamSinkManager) error { } else { err = stream.AddListener(&t.listener) } - - if err == nil { - t.stream = stream + if err != nil { + return false, err } - return err + t.stream = stream + + return true, nil } func (t *Track) RemoveStream() { @@ -140,14 +156,38 @@ func (t *Track) OnRTCP(f func(rtcp.Packet)) { t.onRtcp = f } -func (t *Track) SetBitrate(bitrate int) error { +func (t *Track) SetBitrate(bitrate int) (bool, error) { if t.bitrateChange == nil { - return fmt.Errorf("bitrate change not supported") + return false, fmt.Errorf("bitrate change not supported") } return t.bitrateChange(bitrate) } -func (t *Track) OnBitrateChange(f func(int) error) { +func (t *Track) SetVideoID(videoID string) (bool, error) { + if t.videoChange == nil { + return false, fmt.Errorf("video change not supported") + } + + return t.videoChange(videoID) +} + +func (t *Track) OnBitrateChange(f func(bitrate int) (bool, error)) { t.bitrateChange = f } + +func (t *Track) OnVideoChange(f func(string) (bool, error)) { + t.videoChange = f +} + +func (t *Track) SetVideoAuto(auto bool) { + t.videoAutoMu.Lock() + defer t.videoAutoMu.Unlock() + t.videoAuto = auto +} + +func (t *Track) VideoAuto() bool { + t.videoAutoMu.RLock() + defer t.videoAutoMu.RUnlock() + return t.videoAuto +} diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 9da371e8..ec1955c0 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -28,7 +28,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag } } - offer, err := h.webrtc.CreatePeer(session, payload.Bitrate) + offer, err := h.webrtc.CreatePeer(session, payload.Bitrate, payload.VideoAuto) if err != nil { return err } @@ -39,7 +39,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag webrtcPeer.SetPaused(true) } - payload.Video = webrtcPeer.GetVideoId() + payload.Video = webrtcPeer.GetVideoID() } session.Send( @@ -47,7 +47,9 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag message.SignalProvide{ SDP: offer.SDP, ICEServers: h.webrtc.ICEServers(), - Video: payload.Video, // TODO: Refactor. + Video: payload.Video, // TODO: Refactor + Bitrate: payload.Bitrate, + VideoAuto: payload.VideoAuto, }) return nil @@ -64,7 +66,7 @@ func (h *MessageHandlerCtx) signalRestart(session types.Session) error { return err } - // TODO: Use offer event intead. + // TODO: Use offer event instead. session.Send( event.SIGNAL_RESTART, message.SignalDescription{ @@ -123,25 +125,17 @@ func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message. return errors.New("webRTC peer does not exist") } - var err error - if payload.Bitrate == 0 { - // get bitrate from video id - payload.Bitrate, err = h.capture.GetBitrateFromVideoID(payload.Video) - if err != nil { - return err + peer.SetVideoAuto(payload.VideoAuto) + + if payload.Video != "" { + if err := peer.SetVideoID(payload.Video); err != nil { + h.logger.Error().Err(err).Msg("failed to set video id") + } + } else { + if err := peer.SetVideoBitrate(payload.Bitrate); err != nil { + h.logger.Error().Err(err).Msg("failed to set video bitrate") } } - if err = peer.SetVideoBitrate(payload.Bitrate); err != nil { - return err - } - - session.Send( - event.SIGNAL_VIDEO, - message.SignalVideo{ - Video: peer.GetVideoId(), // TODO: Refactor. - Bitrate: payload.Bitrate, - }) - return nil } diff --git a/pkg/types/capture.go b/pkg/types/capture.go index a3a490ee..1f6b2cf6 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -8,9 +8,8 @@ import ( "strings" "github.com/PaesslerAG/gval" - "github.com/pion/webrtc/v3/pkg/media" - "github.com/demodesk/neko/pkg/types/codec" + "github.com/pion/webrtc/v3/pkg/media" ) var ( @@ -20,16 +19,23 @@ var ( type Sample media.Sample type Receiver interface { - SetStream(stream StreamSinkManager) error + SetStream(stream StreamSinkManager) (changed bool, err error) RemoveStream() - OnBitrateChange(f func(int) error) + OnBitrateChange(f func(bitrate int) (changed bool, err error)) + OnVideoChange(f func(videoID string) (changed bool, err error)) + VideoAuto() bool + SetVideoAuto(videoAuto bool) } type BucketsManager interface { IDs() []string Codec() codec.RTPCodec - SetReceiver(receiver Receiver) error + SetReceiver(receiver Receiver) RemoveReceiver(receiver Receiver) error + + DestroyAll() + RecreateAll() error + Shutdown() } type BroadcastManager interface { @@ -48,6 +54,7 @@ type ScreencastManager interface { type StreamSinkManager interface { ID() string Codec() codec.RTPCodec + Bitrate() int AddListener(listener *func(sample Sample)) error RemoveListener(listener *func(sample Sample)) error @@ -55,6 +62,9 @@ type StreamSinkManager interface { ListenersCount() int Started() bool + + CreatePipeline() error + DestroyPipeline() } type StreamSrcManager interface { @@ -201,17 +211,33 @@ func (config *VideoConfig) GetBitrateFn(getScreen func() *ScreenSize) func() (in }), } + // TOOD: do not read target-bitrate from pipeline, but only from config. + // TODO: This is only for vp8. expr, ok := config.GstParams["target-bitrate"] if !ok { - return 0, fmt.Errorf("target-bitrate not found") + // TODO: This is only for h264. + expr, ok = config.GstParams["bitrate"] + if !ok { + return 0, fmt.Errorf("bitrate not found") + } } - targetBitrate, err := gval.Evaluate(expr, values, language...) + bitrate, err := gval.Evaluate(expr, values, language...) if err != nil { - return 0, err + return 0, fmt.Errorf("failed to evaluate bitrate: %w", err) } - return targetBitrate.(int), nil + var bitrateInt int + switch val := bitrate.(type) { + case int: + bitrateInt = val + case float64: + bitrateInt = (int)(val) + default: + return 0, fmt.Errorf("bitrate is not int or float64") + } + + return bitrateInt, nil } } diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index c263a006..832b24f0 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -48,7 +48,10 @@ type SystemDisconnect struct { type SignalProvide struct { SDP string `json:"sdp"` ICEServers []types.ICEServer `json:"iceservers"` - Video string `json:"video"` // TODO: Refactor. + // TODO: Use SignalVideo struct. + Video string `json:"video"` + Bitrate int `json:"bitrate"` + VideoAuto bool `json:"video_auto"` } type SignalCandidate struct { @@ -60,8 +63,9 @@ type SignalDescription struct { } type SignalVideo struct { - Video string `json:"video"` // TODO: Refactor. - Bitrate int `json:"bitrate"` + Video string `json:"video"` + Bitrate int `json:"bitrate"` + VideoAuto bool `json:"video_auto"` } ///////////////////////////// diff --git a/pkg/types/webrtc.go b/pkg/types/webrtc.go index c67f4857..ad5c503d 100644 --- a/pkg/types/webrtc.go +++ b/pkg/types/webrtc.go @@ -25,8 +25,11 @@ type WebRTCPeer interface { SetCandidate(candidate webrtc.ICECandidateInit) error SetVideoBitrate(bitrate int) error - GetVideoId() string + SetVideoID(videoID string) error + GetVideoID() string SetPaused(isPaused bool) error + SetVideoAuto(auto bool) + VideoAuto() bool SendCursorPosition(x, y int) error SendCursorImage(cur *CursorImage, img []byte) error @@ -40,6 +43,6 @@ type WebRTCManager interface { ICEServers() []ICEServer - CreatePeer(session Session, bitrate int) (*webrtc.SessionDescription, error) + CreatePeer(session Session, bitrate int, videoAuto bool) (*webrtc.SessionDescription, error) SetCursorPosition(x, y int) } From bfabee12e202edc6c85c949b7075c6e922ca33b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 7 Feb 2023 21:43:14 +0100 Subject: [PATCH 786/876] gst emit video keyframe on demand. (#27) --- pkg/gst/gst.c | 12 ++++++++++++ pkg/gst/gst.go | 9 ++++++++- pkg/gst/gst.h | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pkg/gst/gst.c b/pkg/gst/gst.c index e538f5d1..86e97dce 100644 --- a/pkg/gst/gst.c +++ b/pkg/gst/gst.c @@ -200,3 +200,15 @@ gboolean gstreamer_pipeline_set_caps_resolution(GstPipelineCtx *ctx, const gchar gst_object_unref(el); return TRUE; } + +gboolean gstreamer_pipeline_emit_video_keyframe(GstPipelineCtx *ctx) { + GstClock *clock = gst_pipeline_get_clock(GST_PIPELINE(ctx->pipeline)); + gst_object_ref(clock); + + GstClockTime time = gst_clock_get_time(clock); + GstClockTime now = time - gst_element_get_base_time(ctx->pipeline); + gst_object_unref(clock); + + GstEvent *keyFrameEvent = gst_video_event_new_downstream_force_key_unit(now, time, now, TRUE, 0); + return gst_element_send_event(GST_ELEMENT(ctx->pipeline), keyFrameEvent); +} diff --git a/pkg/gst/gst.go b/pkg/gst/gst.go index 3a9e686a..14bdc6dd 100644 --- a/pkg/gst/gst.go +++ b/pkg/gst/gst.go @@ -1,7 +1,7 @@ package gst /* -#cgo pkg-config: gstreamer-1.0 gstreamer-app-1.0 +#cgo pkg-config: gstreamer-1.0 gstreamer-app-1.0 gstreamer-video-1.0 #include "gst.h" */ @@ -46,6 +46,8 @@ type Pipeline interface { SetPropInt(binName string, prop string, value int) bool SetCapsFramerate(binName string, numerator, denominator int) bool SetCapsResolution(binName string, width, height int) bool + // emit video keyframe + EmitVideoKeyframe() bool } type pipeline struct { @@ -177,6 +179,11 @@ func (p *pipeline) SetCapsResolution(binName string, width, height int) bool { return ok == C.TRUE } +func (p *pipeline) EmitVideoKeyframe() bool { + ok := C.gstreamer_pipeline_emit_video_keyframe(p.ctx) + return ok == C.TRUE +} + // gst-inspect-1.0 func CheckPlugins(plugins []string) error { var plugin *C.GstPlugin diff --git a/pkg/gst/gst.h b/pkg/gst/gst.h index a562ec34..619170e7 100644 --- a/pkg/gst/gst.h +++ b/pkg/gst/gst.h @@ -3,6 +3,7 @@ #include #include #include +#include typedef struct GstPipelineCtx { int pipelineId; @@ -25,3 +26,4 @@ void gstreamer_pipeline_push(GstPipelineCtx *ctx, void *buffer, int bufferLen); gboolean gstreamer_pipeline_set_prop_int(GstPipelineCtx *ctx, char *binName, char *prop, gint value); gboolean gstreamer_pipeline_set_caps_framerate(GstPipelineCtx *ctx, const gchar* binName, gint numerator, gint denominator); gboolean gstreamer_pipeline_set_caps_resolution(GstPipelineCtx *ctx, const gchar* binName, gint width, gint height); +gboolean gstreamer_pipeline_emit_video_keyframe(GstPipelineCtx *ctx); From f8b128e1e9aa8767bd2e259f5e0718a25a7614d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 14 Feb 2023 21:18:47 +0100 Subject: [PATCH 787/876] Custom sizes with XRandR (#25) * xserver dummy with RandR. * update. * remove screen configurations from xorg. * screen size cannot be nil anymore. * use predefined screen configurations. * use screen configurations. * fix error. * remove comment. --- Dockerfile | 41 ++++ Dockerfile.nvidia | 41 ++++ internal/api/room/screen.go | 46 ++-- internal/capture/manager.go | 2 +- internal/desktop/manager.go | 4 +- internal/desktop/xorg.go | 30 ++- internal/websocket/handler/screen.go | 15 +- internal/websocket/handler/system.go | 30 +-- pkg/types/capture.go | 5 +- pkg/types/desktop.go | 12 +- pkg/xorg/xorg.c | 148 ++++++++++++- pkg/xorg/xorg.go | 71 +++--- pkg/xorg/xorg.h | 12 +- runtime/xdummy-randr.patch | 316 +++++++++++++++++++++++++++ 14 files changed, 666 insertions(+), 107 deletions(-) create mode 100644 runtime/xdummy-randr.patch diff --git a/Dockerfile b/Dockerfile index 256020e5..7eee94c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,33 @@ +# +# Stage 0: Build xserver-xorg-video-dummy 0.3.8-2 with RandR support. +# +FROM debian:bullseye-slim as xserver-xorg-video-dummy + +WORKDIR /usr/local/src + +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + cp /etc/apt/sources.list /etc/apt/sources.list~; \ + sed -Ei 's/^deb /deb-src /' /etc/apt/sources.list; \ + cat /etc/apt/sources.list~ >> /etc/apt/sources.list; \ + apt-get update; \ + apt-get install -y dpkg-dev git; \ + apt-get build-dep -y xserver-xorg-video-dummy; \ + git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +COPY runtime/xdummy-randr.patch /tmp/xdummy-randr.patch + +RUN set -eux; \ + cd xserver-xorg-video-dummy; \ + patch -p1 < /tmp/xdummy-randr.patch; \ + bash ./autogen.sh; \ + make; \ + make install; + # # Stage 1: Build. # @@ -12,6 +42,10 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ + # install libxcvt-dev (not available in debian:bullseye) + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt-dev_0.1.2-1_amd64.deb; \ + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ + apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb ./libxcvt-dev_0.1.2-1_amd64.deb; \ # # clean up apt-get clean -y; \ @@ -57,6 +91,10 @@ RUN set -eux; \ gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ gstreamer1.0-pulseaudio; \ + # install libxcvt0 (not available in debian:bullseye) + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ + apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb; \ + rm ./libxcvt0_0.1.2-1_amd64.deb; \ # # create a non-root user groupadd --gid $USER_GID $USERNAME; \ @@ -95,6 +133,9 @@ RUN set -eux; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* +# replace version +COPY --from=xserver-xorg-video-dummy /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so + # # copy runtime configs COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index 19b687e2..5a8c8b13 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -1,6 +1,36 @@ ARG UBUNTU_RELEASE=20.04 ARG CUDA_VERSION=11.2.2 +# +# Stage 0: Build xserver-xorg-video-dummy 0.3.8-2 with RandR support. +# +FROM debian:bullseye-slim as xserver-xorg-video-dummy + +WORKDIR /usr/local/src + +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + cp /etc/apt/sources.list /etc/apt/sources.list~; \ + sed -Ei 's/^deb /deb-src /' /etc/apt/sources.list; \ + cat /etc/apt/sources.list~ >> /etc/apt/sources.list; \ + apt-get update; \ + apt-get install -y dpkg-dev git; \ + apt-get build-dep -y xserver-xorg-video-dummy; \ + git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +COPY runtime/xdummy-randr.patch /tmp/xdummy-randr.patch + +RUN set -eux; \ + cd xserver-xorg-video-dummy; \ + patch -p1 < /tmp/xdummy-randr.patch; \ + bash ./autogen.sh; \ + make; \ + make install; + # # Stage 1: Build. # @@ -15,6 +45,10 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ + # install libxcvt-dev (not available in debian:bullseye) + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt-dev_0.1.2-1_amd64.deb; \ + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ + apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb ./libxcvt-dev_0.1.2-1_amd64.deb; \ # # clean up apt-get clean -y; \ @@ -73,6 +107,10 @@ RUN set -eux; \ gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ gstreamer1.0-pulseaudio; \ + # install libxcvt0 (not available in debian:bullseye) + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ + apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb; \ + rm ./libxcvt0_0.1.2-1_amd64.deb; \ # # create a non-root user groupadd --gid $USER_GID $USERNAME; \ @@ -111,6 +149,9 @@ RUN set -eux; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* +# replace version +COPY --from=xserver-xorg-video-dummy /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so + # # Install and configure Vulkan manually RUN if [ "${UBUNTU_RELEASE}" = "18.04" ]; then apt-get update && apt-get install --no-install-recommends -y vulkan-utils; else apt-get update && apt-get install --no-install-recommends -y vulkan-tools; fi && \ diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index b7001532..174f3477 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -20,12 +20,11 @@ type ScreenConfigurationPayload struct { func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request) error { size := h.desktop.GetScreenSize() - if size == nil { - return utils.HttpInternalServerError().WithInternalMsg("unable to get screen configuration") - } - - payload := ScreenConfigurationPayload(*size) - return utils.HttpSuccess(w, payload) + return utils.HttpSuccess(w, ScreenConfigurationPayload{ + Width: size.Width, + Height: size.Height, + Rate: size.Rate, + }) } func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.Request) error { @@ -34,29 +33,36 @@ func (h *RoomHandler) screenConfigurationChange(w http.ResponseWriter, r *http.R return err } - size := types.ScreenSize(*data) - if err := h.desktop.SetScreenSize(size); err != nil { + size, err := h.desktop.SetScreenSize(types.ScreenSize{ + Width: data.Width, + Height: data.Height, + Rate: data.Rate, + }) + + if err != nil { return utils.HttpUnprocessableEntity("cannot set screen size").WithInternalErr(err) } - payload := message.ScreenSize(*data) - h.sessions.Broadcast(event.SCREEN_UPDATED, payload) + h.sessions.Broadcast(event.SCREEN_UPDATED, message.ScreenSize{ + Width: size.Width, + Height: size.Height, + Rate: size.Rate, + }) return utils.HttpSuccess(w, data) } +// TODO: remove. func (h *RoomHandler) screenConfigurationsList(w http.ResponseWriter, r *http.Request) error { - list := []ScreenConfigurationPayload{} + configurations := h.desktop.ScreenConfigurations() - ScreenConfigurations := h.desktop.ScreenConfigurations() - for _, size := range ScreenConfigurations { - for _, fps := range size.Rates { - list = append(list, ScreenConfigurationPayload{ - Width: size.Width, - Height: size.Height, - Rate: fps, - }) - } + list := make([]ScreenConfigurationPayload, 0, len(configurations)) + for _, conf := range configurations { + list = append(list, ScreenConfigurationPayload{ + Width: conf.Width, + Height: conf.Height, + Rate: conf.Rate, + }) } return utils.HttpSuccess(w, list) diff --git a/internal/capture/manager.go b/internal/capture/manager.go index c22a6162..3b8288f3 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -44,7 +44,7 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt } screen := desktop.GetScreenSize() - pipeline, err := pipelineConf.GetPipeline(*screen) + pipeline, err := pipelineConf.GetPipeline(screen) if err != nil { return "", err } diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index d2aa542f..906326be 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -40,9 +40,9 @@ func (manager *DesktopManagerCtx) Start() { xorg.GetScreenConfigurations() - err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) + width, height, rate, err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) manager.logger.Err(err). - Str("screen_size", fmt.Sprintf("%dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)). + Str("screen_size", fmt.Sprintf("%dx%d@%d", width, height, rate)). Msgf("setting initial screen size") go xevent.EventLoop(manager.config.Display) diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index a990b144..917f467d 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -66,11 +66,26 @@ func (manager *DesktopManagerCtx) ResetKeys() { xorg.ResetKeys() } -func (manager *DesktopManagerCtx) ScreenConfigurations() map[int]types.ScreenConfiguration { - return xorg.ScreenConfigurations +func (manager *DesktopManagerCtx) ScreenConfigurations() []types.ScreenSize { + var configs []types.ScreenSize + for _, size := range xorg.ScreenConfigurations { + for _, fps := range size.Rates { + // filter out all irrelevant rates + if fps > 60 || (fps > 30 && fps%10 != 0) { + continue + } + + configs = append(configs, types.ScreenSize{ + Width: size.Width, + Height: size.Height, + Rate: fps, + }) + } + } + return configs } -func (manager *DesktopManagerCtx) SetScreenSize(size types.ScreenSize) error { +func (manager *DesktopManagerCtx) SetScreenSize(size types.ScreenSize) (types.ScreenSize, error) { mu.Lock() manager.emmiter.Emit("before_screen_size_change") @@ -79,10 +94,15 @@ func (manager *DesktopManagerCtx) SetScreenSize(size types.ScreenSize) error { mu.Unlock() }() - return xorg.ChangeScreenSize(size.Width, size.Height, size.Rate) + w, h, r, err := xorg.ChangeScreenSize(size.Width, size.Height, size.Rate) + return types.ScreenSize{ + Width: w, + Height: h, + Rate: r, + }, err } -func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize { +func (manager *DesktopManagerCtx) GetScreenSize() types.ScreenSize { return xorg.GetScreenSize() } diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index a01abd35..8d88ac9d 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -13,11 +13,20 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc return errors.New("is not the admin") } - data := types.ScreenSize(*payload) - if err := h.desktop.SetScreenSize(data); err != nil { + size, err := h.desktop.SetScreenSize(types.ScreenSize{ + Width: payload.Width, + Height: payload.Height, + Rate: payload.Rate, + }) + + if err != nil { return err } - h.sessions.Broadcast(event.SCREEN_UPDATED, payload) + h.sessions.Broadcast(event.SCREEN_UPDATED, message.ScreenSize{ + Width: size.Width, + Height: size.Height, + Rate: size.Rate, + }) return nil } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index d914d3cf..09318909 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -1,8 +1,6 @@ package handler import ( - "errors" - "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -25,8 +23,10 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { } size := h.desktop.GetScreenSize() - if size == nil { - return errors.New("could not get screen size") + screenSize := message.ScreenSize{ + Width: size.Width, + Height: size.Height, + Rate: size.Rate, } sessions := map[string]message.SessionData{} @@ -44,7 +44,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { message.SystemInit{ SessionId: session.ID(), ControlHost: controlHost, - ScreenSize: message.ScreenSize(*size), + ScreenSize: screenSize, Sessions: sessions, Settings: h.sessions.Settings(), ScreencastEnabled: h.capture.Screencast().Enabled(), @@ -57,22 +57,22 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { } func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { - screenSizesList := []message.ScreenSize{} - for _, size := range h.desktop.ScreenConfigurations() { - for _, rate := range size.Rates { - screenSizesList = append(screenSizesList, message.ScreenSize{ - Width: size.Width, - Height: size.Height, - Rate: rate, - }) - } + configurations := h.desktop.ScreenConfigurations() + + list := make([]message.ScreenSize, 0, len(configurations)) + for _, conf := range configurations { + list = append(list, message.ScreenSize{ + Width: conf.Width, + Height: conf.Height, + Rate: conf.Rate, + }) } broadcast := h.capture.Broadcast() session.Send( event.SYSTEM_ADMIN, message.SystemAdmin{ - ScreenSizesList: screenSizesList, + ScreenSizesList: list, // TODO: remove BroadcastStatus: message.BroadcastStatus{ IsActive: broadcast.Started(), URL: broadcast.Url(), diff --git a/pkg/types/capture.go b/pkg/types/capture.go index 1f6b2cf6..6ab9a8e7 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -188,16 +188,13 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { }[:], " "), nil } -func (config *VideoConfig) GetBitrateFn(getScreen func() *ScreenSize) func() (int, error) { +func (config *VideoConfig) GetBitrateFn(getScreen func() ScreenSize) func() (int, error) { return func() (int, error) { if config.Bitrate > 0 { return config.Bitrate, nil } screen := getScreen() - if screen == nil { - return 0, fmt.Errorf("screen is nil") - } values := map[string]any{ "width": screen.Width, diff --git a/pkg/types/desktop.go b/pkg/types/desktop.go index ed06c0bf..24e694b0 100644 --- a/pkg/types/desktop.go +++ b/pkg/types/desktop.go @@ -19,12 +19,6 @@ type ScreenSize struct { Rate int16 } -type ScreenConfiguration struct { - Width int - Height int - Rates map[int]int16 -} - type KeyboardModifiers struct { NumLock *bool CapsLock *bool @@ -57,9 +51,9 @@ type DesktopManager interface { ButtonPress(code uint32) error KeyPress(codes ...uint32) error ResetKeys() - ScreenConfigurations() map[int]ScreenConfiguration - SetScreenSize(ScreenSize) error - GetScreenSize() *ScreenSize + ScreenConfigurations() []ScreenSize + SetScreenSize(ScreenSize) (ScreenSize, error) + GetScreenSize() ScreenSize SetKeyboardMap(KeyboardMap) error GetKeyboardMap() (*KeyboardMap, error) SetKeyboardModifiers(mod KeyboardModifiers) diff --git a/pkg/xorg/xorg.c b/pkg/xorg/xorg.c index aa4e98f7..6ef6f8e9 100644 --- a/pkg/xorg/xorg.c +++ b/pkg/xorg/xorg.c @@ -229,6 +229,82 @@ void XKey(KeySym keysym, int down) { XSync(display, 0); } +Status XSetScreenConfiguration(int width, int height, short *rate) { + Display *display = getXDisplay(); + Window root = RootWindow(display, 0); + XRRScreenConfiguration *conf = XRRGetScreenInfo(display, root); + + XRRScreenSize *xrrs; + int num_sizes; + xrrs = XRRConfigSizes(conf, &num_sizes); + + int size_index = -1; + for (int i = 0; i < num_sizes; i++) { + if (xrrs[i].width == width && xrrs[i].height == height) { + size_index = i; + break; + } + } + + // if we cannot find the size + if (size_index == -1) { + return RRSetConfigFailed; + } + + short current_rate = 0; + if (rate != NULL) { + short *rates; + int num_rates; + rates = XRRConfigRates(conf, size_index, &num_rates); + + // try to find the nearest rate + short nearest_rate = 0; + float diff = 0; + for (int i = 0; i < num_rates; i++) { + if (nearest_rate == 0 || abs(rates[i] - *rate) < diff) { + nearest_rate = rates[i]; + diff = abs(rates[i] - *rate); + } + } + + if (nearest_rate != 0 && diff < 10) { + current_rate = nearest_rate; + } + + *rate = current_rate; + } + + Status status; + status = XRRSetScreenConfigAndRate(display, conf, root, size_index, RR_Rotate_0, current_rate, CurrentTime); + + XRRFreeScreenConfigInfo(conf); + return status; +} + +void XGetScreenConfiguration(int *width, int *height, short *rate) { + Display *display = getXDisplay(); + Window root = RootWindow(display, 0); + XRRScreenConfiguration *conf = XRRGetScreenInfo(display, root); + + Rotation current_rotation; + SizeID current_size_id = XRRConfigCurrentConfiguration(conf, ¤t_rotation); + + XRRScreenSize *xrrs; + int num_sizes; + xrrs = XRRConfigSizes(conf, &num_sizes); + + // if we cannot find the size + if (current_size_id >= num_sizes) { + return; + } + + *width = xrrs[current_size_id].width; + *height = xrrs[current_size_id].height; + *rate = XRRConfigCurrentRate(conf); + + XRRFreeScreenConfigInfo(conf); +} + void XGetScreenConfigurations() { Display *display = getXDisplay(); Window root = RootWindow(display, 0); @@ -248,23 +324,71 @@ void XGetScreenConfigurations() { } } -void XSetScreenConfiguration(int index, short rate) { +// Inspired by https://github.com/raboof/xrandr/blob/master/xrandr.c +void XCreateScreenMode(int width, int height, short rate) { Display *display = getXDisplay(); Window root = RootWindow(display, 0); - XRRSetScreenConfigAndRate(display, XRRGetScreenInfo(display, root), root, index, RR_Rotate_0, rate, CurrentTime); + + char name[128]; + XRRModeInfo mode; + mode = XCreateScreenModeInfo(width, height, rate); + + snprintf(name, sizeof name, "%dx%d_%d", width, height, rate); + mode.nameLength = strlen(name); + mode.name = name; + + // create new mode + XRRCreateMode(display, root, &mode); + XSync(display, 0); + + // find newly created mode in resources + RRMode mode_id; + XRRScreenResources *resources = XRRGetScreenResources(display, root); + for (int i = 0; i < resources->nmode; ++i) { + if (strcmp(resources->modes[i].name, mode.name) == 0) { + mode_id = resources->modes[i].id; + break; + } + } + + // add new mode to all outputs + for (int i = 0; i < resources->noutput; ++i) { + XRRAddOutputMode(display, resources->outputs[i], mode_id); + } + + XRRFreeScreenResources(resources); } -int XGetScreenSize() { - Display *display = getXDisplay(); - XRRScreenConfiguration *conf = XRRGetScreenInfo(display, RootWindow(display, 0)); - Rotation original_rotation; - return XRRConfigCurrentConfiguration(conf, &original_rotation); -} +// Inspired by https://fossies.org/linux/xwayland/hw/xwayland/xwayland-cvt.c +XRRModeInfo XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh) { + XRRModeInfo modeinfo; + memset(&modeinfo, 0, sizeof modeinfo); -short XGetScreenRate() { - Display *display = getXDisplay(); - XRRScreenConfiguration *conf = XRRGetScreenInfo(display, RootWindow(display, 0)); - return XRRConfigCurrentRate(conf); +#ifdef _LIBCVT_H_ + struct libxcvt_mode_info *mode_info; + + // get screen mode from libxcvt, if available + mode_info = libxcvt_gen_mode_info(hdisplay, vdisplay, vrefresh, false, false); + + modeinfo.width = mode_info->hdisplay; + modeinfo.height = mode_info->vdisplay; + modeinfo.dotClock = mode_info->dot_clock * 1000; + modeinfo.hSyncStart = mode_info->hsync_start; + modeinfo.hSyncEnd = mode_info->hsync_end; + modeinfo.hTotal = mode_info->htotal; + modeinfo.vSyncStart = mode_info->vsync_start; + modeinfo.vSyncEnd = mode_info->vsync_end; + modeinfo.vTotal = mode_info->vtotal; + modeinfo.modeFlags = mode_info->mode_flags; + + free(mode_info); +#else + // fallback to a simple mode without refresh rate + modeinfo.width = hdisplay; + modeinfo.height = vdisplay; +#endif + + return modeinfo; } void XSetKeyboardModifier(int mod, int on) { diff --git a/pkg/xorg/xorg.go b/pkg/xorg/xorg.go index 05e60ca7..11629134 100644 --- a/pkg/xorg/xorg.go +++ b/pkg/xorg/xorg.go @@ -1,7 +1,7 @@ package xorg /* -#cgo LDFLAGS: -lX11 -lXrandr -lXtst -lXfixes +#cgo LDFLAGS: -lX11 -lXrandr -lXtst -lXfixes -lxcvt #include "xorg.h" */ @@ -27,7 +27,13 @@ const ( KbdModNumLock KbdMod = 16 ) -var ScreenConfigurations = make(map[int]types.ScreenConfiguration) +type ScreenConfiguration struct { + Width int + Height int + Rates map[int]int16 +} + +var ScreenConfigurations = make(map[int]ScreenConfiguration) var debounce_button = make(map[uint32]time.Time) var debounce_key = make(map[uint32]time.Time) @@ -178,40 +184,46 @@ func CheckKeys(duration time.Duration) { } } -func ChangeScreenSize(width int, height int, rate int16) error { +// set screen configuration, create new one if not exists +func ChangeScreenSize(width int, height int, rate int16) (int, int, int16, error) { mu.Lock() defer mu.Unlock() - for index, size := range ScreenConfigurations { - if size.Width == width && size.Height == height { - for _, fps := range size.Rates { - if rate == fps { - C.XSetScreenConfiguration(C.int(index), C.short(fps)) - return nil - } - } - } + // round width and height to 8 + width = width - (width % 8) + height = height - (height % 8) + + // convert variables to C types + c_width, c_height, c_rate := C.int(width), C.int(height), C.short(rate) + + // if screen configuration already exists, just set it + if status := C.XSetScreenConfiguration(c_width, c_height, &c_rate); status == C.RRSetConfigSuccess { + return width, height, int16(c_rate), nil } - return fmt.Errorf("unknown screen configuration %dx%d@%d", width, height, rate) + // create new screen configuration + C.XCreateScreenMode(c_width, c_height, c_rate) + + // screen configuration should exist now, set it + if status := C.XSetScreenConfiguration(c_width, c_height, &c_rate); status == C.RRSetConfigSuccess { + return width, height, int16(c_rate), nil + } + + return 0, 0, 0, fmt.Errorf("unknown screen configuration %dx%d@%d", width, height, rate) } -func GetScreenSize() *types.ScreenSize { +func GetScreenSize() types.ScreenSize { mu.Lock() defer mu.Unlock() - index := int(C.XGetScreenSize()) - rate := int16(C.XGetScreenRate()) + c_width, c_height, c_rate := C.int(0), C.int(0), C.short(0) + C.XGetScreenConfiguration(&c_width, &c_height, &c_rate) - if conf, ok := ScreenConfigurations[index]; ok { - return &types.ScreenSize{ - Width: conf.Width, - Height: conf.Height, - Rate: rate, - } + return types.ScreenSize{ + Width: int(c_width), + Height: int(c_height), + Rate: int16(c_rate), } - - return nil } func SetKeyboardModifier(mod KbdMod, active bool) { @@ -300,7 +312,7 @@ func GetScreenshotImage() *image.RGBA { //export goCreateScreenSize func goCreateScreenSize(index C.int, width C.int, height C.int, mwidth C.int, mheight C.int) { - ScreenConfigurations[int(index)] = types.ScreenConfiguration{ + ScreenConfigurations[int(index)] = ScreenConfiguration{ Width: int(width), Height: int(height), Rates: make(map[int]int16), @@ -309,12 +321,5 @@ func goCreateScreenSize(index C.int, width C.int, height C.int, mwidth C.int, mh //export goSetScreenRates func goSetScreenRates(index C.int, rate_index C.int, rateC C.short) { - rate := int16(rateC) - - // filter out all irrelevant rates - if rate > 60 || (rate > 30 && rate%10 != 0) { - return - } - - ScreenConfigurations[int(index)].Rates[int(rate_index)] = rate + ScreenConfigurations[int(index)].Rates[int(rate_index)] = int16(rateC) } diff --git a/pkg/xorg/xorg.h b/pkg/xorg/xorg.h index f5ebd399..a6e750d7 100644 --- a/pkg/xorg/xorg.h +++ b/pkg/xorg/xorg.h @@ -7,6 +7,11 @@ #include #include #include +#include +#include + +// for computing xrandr modelines at runtime +#include extern void goCreateScreenSize(int index, int width, int height, int mwidth, int mheight); extern void goSetScreenRates(int index, int rate_index, short rate); @@ -31,10 +36,11 @@ static KeyCode XKeyEntryGet(KeySym keysym); static KeyCode XkbKeysymToKeycode(Display *dpy, KeySym keysym); void XKey(KeySym keysym, int down); +Status XSetScreenConfiguration(int width, int height, short *rate); +void XGetScreenConfiguration(int *width, int *height, short *rate); void XGetScreenConfigurations(); -void XSetScreenConfiguration(int index, short rate); -int XGetScreenSize(); -short XGetScreenRate(); +void XCreateScreenMode(int width, int height, short rate); +XRRModeInfo XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh); void XSetKeyboardModifier(int mod, int on); char XGetKeyboardModifiers(); diff --git a/runtime/xdummy-randr.patch b/runtime/xdummy-randr.patch new file mode 100644 index 00000000..b7e33026 --- /dev/null +++ b/runtime/xdummy-randr.patch @@ -0,0 +1,316 @@ +diff --git a/src/dummy.h b/src/dummy.h +index c3fdd6e..9c74f56 100644 +--- a/src/dummy.h ++++ b/src/dummy.h +@@ -13,6 +13,8 @@ + + #include "compat-api.h" + ++#define DUMMY_MAX_SCREENS 4 ++ + /* Supported chipsets */ + typedef enum { + DUMMY_CHIP +@@ -72,6 +74,12 @@ typedef struct dummyRec + pointer* FBBase; + Bool (*CreateWindow)() ; /* wrapped CreateWindow */ + Bool prop; ++ /* XRANDR support begin */ ++ int num_screens; ++ struct _xf86Crtc *paCrtcs[DUMMY_MAX_SCREENS]; ++ struct _xf86Output *paOutputs[DUMMY_MAX_SCREENS]; ++ int connected_outputs; ++ /* XRANDR support end */ + } DUMMYRec, *DUMMYPtr; + + /* The privates of the DUMMY driver */ +diff --git a/src/dummy_driver.c b/src/dummy_driver.c +index 2656602..069e330 100644 +--- a/src/dummy_driver.c ++++ b/src/dummy_driver.c +@@ -34,6 +34,8 @@ + #include + #endif + ++#include "xf86Crtc.h" ++ + /* + * Driver data structures. + */ +@@ -141,6 +143,219 @@ static XF86ModuleVersionInfo dummyVersRec = + {0,0,0,0} + }; + ++ ++/************************ ++ * XRANDR support begin * ++ ************************/ ++ ++static Bool dummy_config_resize(ScrnInfoPtr pScrn, int cw, int ch); ++static Bool DUMMYAdjustScreenPixmap(ScrnInfoPtr pScrn, int width, int height); ++ ++static const xf86CrtcConfigFuncsRec DUMMYCrtcConfigFuncs = { ++ .resize = dummy_config_resize ++}; ++ ++ ++static void ++dummy_crtc_dpms(xf86CrtcPtr crtc, int mode) ++{ ++} ++ ++static Bool ++dummy_crtc_lock (xf86CrtcPtr crtc) ++{ ++ return FALSE; ++} ++ ++static Bool ++dummy_crtc_mode_fixup (xf86CrtcPtr crtc, DisplayModePtr mode, ++ DisplayModePtr adjusted_mode) ++{ ++ return TRUE; ++} ++ ++static void ++dummy_crtc_stub (xf86CrtcPtr crtc) ++{ ++} ++ ++static void ++dummy_crtc_gamma_set (xf86CrtcPtr crtc, CARD16 *red, ++ CARD16 *green, CARD16 *blue, int size) ++{ ++} ++ ++static void * ++dummy_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height) ++{ ++ return NULL; ++} ++ ++static void ++dummy_crtc_mode_set (xf86CrtcPtr crtc, DisplayModePtr mode, ++ DisplayModePtr adjusted_mode, int x, int y) ++{ ++} ++ ++static const xf86CrtcFuncsRec DUMMYCrtcFuncs = { ++ .dpms = dummy_crtc_dpms, ++ .save = NULL, /* These two are never called by the server. */ ++ .restore = NULL, ++ .lock = dummy_crtc_lock, ++ .unlock = NULL, /* This will not be invoked if lock returns FALSE. */ ++ .mode_fixup = dummy_crtc_mode_fixup, ++ .prepare = dummy_crtc_stub, ++ .mode_set = dummy_crtc_mode_set, ++ .commit = dummy_crtc_stub, ++ .gamma_set = dummy_crtc_gamma_set, ++ .shadow_allocate = dummy_crtc_shadow_allocate, ++ .shadow_create = NULL, /* These two should not be invoked if allocate ++ returns NULL. */ ++ .shadow_destroy = NULL, ++ .set_cursor_colors = NULL, ++ .set_cursor_position = NULL, ++ .show_cursor = NULL, ++ .hide_cursor = NULL, ++ .load_cursor_argb = NULL, ++ .destroy = dummy_crtc_stub ++}; ++ ++static void ++dummy_output_stub (xf86OutputPtr output) ++{ ++} ++ ++static void ++dummy_output_dpms (xf86OutputPtr output, int mode) ++{ ++} ++ ++static int ++dummy_output_mode_valid (xf86OutputPtr output, DisplayModePtr mode) ++{ ++ return MODE_OK; ++} ++ ++static Bool ++dummy_output_mode_fixup (xf86OutputPtr output, DisplayModePtr mode, ++ DisplayModePtr adjusted_mode) ++{ ++ return TRUE; ++} ++ ++static void ++dummy_output_mode_set (xf86OutputPtr output, DisplayModePtr mode, ++ DisplayModePtr adjusted_mode) ++{ ++ DUMMYPtr dPtr = DUMMYPTR(output->scrn); ++ int index = (int64_t)output->driver_private; ++ ++ /* set to connected at first mode set */ ++ dPtr->connected_outputs |= 1 << index; ++} ++ ++/* The first virtual monitor is always connected. Others only after setting its ++ * mode */ ++static xf86OutputStatus ++dummy_output_detect (xf86OutputPtr output) ++{ ++ DUMMYPtr dPtr = DUMMYPTR(output->scrn); ++ int index = (int64_t)output->driver_private; ++ ++ if (dPtr->connected_outputs & (1 << index)) ++ return XF86OutputStatusConnected; ++ else ++ return XF86OutputStatusDisconnected; ++} ++ ++static DisplayModePtr ++dummy_output_get_modes (xf86OutputPtr output) ++{ ++ DisplayModePtr pModes = NULL, pMode, pModeSrc; ++ ++ /* copy modes from config */ ++ for (pModeSrc = output->scrn->modes; pModeSrc; pModeSrc = pModeSrc->next) ++ { ++ pMode = xnfcalloc(1, sizeof(DisplayModeRec)); ++ memcpy(pMode, pModeSrc, sizeof(DisplayModeRec)); ++ pMode->next = NULL; ++ pMode->prev = NULL; ++ pMode->name = strdup(pModeSrc->name); ++ pModes = xf86ModesAdd(pModes, pMode); ++ if (pModeSrc->next == output->scrn->modes) ++ break; ++ } ++ return pModes; ++} ++ ++ ++static const xf86OutputFuncsRec DUMMYOutputFuncs = { ++ .create_resources = dummy_output_stub, ++ .dpms = dummy_output_dpms, ++ .save = NULL, /* These two are never called by the server. */ ++ .restore = NULL, ++ .mode_valid = dummy_output_mode_valid, ++ .mode_fixup = dummy_output_mode_fixup, ++ .prepare = dummy_output_stub, ++ .commit = dummy_output_stub, ++ .mode_set = dummy_output_mode_set, ++ .detect = dummy_output_detect, ++ .get_modes = dummy_output_get_modes, ++#ifdef RANDR_12_INTERFACE ++ .set_property = NULL, ++#endif ++ .destroy = dummy_output_stub ++}; ++ ++static Bool ++dummy_config_resize(ScrnInfoPtr pScrn, int cw, int ch) ++{ ++ if (!pScrn->vtSema) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "We do not own the active VT, exiting.\n"); ++ return TRUE; ++ } ++ return DUMMYAdjustScreenPixmap(pScrn, cw, ch); ++} ++ ++Bool DUMMYAdjustScreenPixmap(ScrnInfoPtr pScrn, int width, int height) ++{ ++ ScreenPtr pScreen = pScrn->pScreen; ++ PixmapPtr pPixmap = pScreen->GetScreenPixmap(pScreen); ++ DUMMYPtr dPtr = DUMMYPTR(pScrn); ++ uint64_t cbLine = (width * xf86GetBppFromDepth(pScrn, pScrn->depth) / 8 + 3) & ~3; ++ int displayWidth = cbLine * 8 / xf86GetBppFromDepth(pScrn, pScrn->depth); ++ ++ if ( width == pScrn->virtualX ++ && height == pScrn->virtualY ++ && displayWidth == pScrn->displayWidth) ++ return TRUE; ++ if (!pPixmap) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Failed to get the screen pixmap.\n"); ++ return FALSE; ++ } ++ if (cbLine > UINT32_MAX || cbLine * height >= pScrn->videoRam * 1024) ++ { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Unable to set up a virtual screen size of %dx%d with %d Kb of video memory available. Please increase the video memory size.\n", ++ width, height, pScrn->videoRam); ++ return FALSE; ++ } ++ pScreen->ModifyPixmapHeader(pPixmap, width, height, ++ pScrn->depth, xf86GetBppFromDepth(pScrn, pScrn->depth), cbLine, ++ pPixmap->devPrivate.ptr); ++ pScrn->virtualX = width; ++ pScrn->virtualY = height; ++ pScrn->displayWidth = displayWidth; ++ ++ return TRUE; ++} ++ ++/********************** ++ * XRANDR support end * ++ **********************/ ++ + /* + * This is the module init data. + * Its name has to be the driver name followed by ModuleData +@@ -568,6 +783,56 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL) + + xf86SetBlackWhitePixels(pScreen); + ++ /* initialize XRANDR */ ++ xf86CrtcConfigInit(pScrn, &DUMMYCrtcConfigFuncs); ++ /* FIXME */ ++ dPtr->num_screens = DUMMY_MAX_SCREENS; ++ ++ for (int i=0; i < dPtr->num_screens; i++) { ++ char szOutput[256]; ++ ++ dPtr->paCrtcs[i] = xf86CrtcCreate(pScrn, &DUMMYCrtcFuncs); ++ dPtr->paCrtcs[i]->driver_private = (void *)(uintptr_t)i; ++ ++ /* Set up our virtual outputs. */ ++ snprintf(szOutput, sizeof(szOutput), "DUMMY%u", i); ++ dPtr->paOutputs[i] = xf86OutputCreate(pScrn, &DUMMYOutputFuncs, ++ szOutput); ++ ++ ++ xf86OutputUseScreenMonitor(dPtr->paOutputs[i], FALSE); ++ dPtr->paOutputs[i]->possible_crtcs = 1 << i; ++ dPtr->paOutputs[i]->possible_clones = 0; ++ dPtr->paOutputs[i]->driver_private = (void *)(uintptr_t)i; ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Created crtc (%p) and output %s (%p)\n", ++ (void *)dPtr->paCrtcs[i], szOutput, ++ (void *)dPtr->paOutputs[i]); ++ ++ } ++ ++ /* bitmask */ ++ dPtr->connected_outputs = 1; ++ ++ xf86CrtcSetSizeRange(pScrn, 64, 64, DUMMY_MAX_WIDTH, DUMMY_MAX_HEIGHT); ++ ++ ++ /* Now create our initial CRTC/output configuration. */ ++ if (!xf86InitialConfiguration(pScrn, TRUE)) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Initial CRTC configuration failed!\n"); ++ return (FALSE); ++ } ++ ++ /* Initialise randr 1.2 mode-setting functions and set first mode. ++ * Note that the mode won't be usable until the server has resized the ++ * framebuffer to something reasonable. */ ++ if (!xf86CrtcScreenInit(pScreen)) { ++ return FALSE; ++ } ++ if (!xf86SetDesiredModes(pScrn)) { ++ return FALSE; ++ } ++ /* XRANDR initialization end */ ++ + #ifdef USE_DGA + DUMMYDGAInit(pScreen); + #endif From 124c5ae1172f2c64b724502e2147f58ecc43af42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 14 Feb 2023 21:19:02 +0100 Subject: [PATCH 788/876] Wait for keyframe on switching streams (#28) * stream sink add keyframe lobby. * change streamsink keyframe identifier. * add h264. * use gstreamers is delta unit for sample. * use delta unit. --- internal/capture/streamsink.go | 56 ++++++++++++++++++++++++++-------- internal/config/capture.go | 5 ++- internal/webrtc/track.go | 5 ++- pkg/gst/gst.c | 7 +++-- pkg/gst/gst.go | 11 ++++--- pkg/gst/gst.h | 4 +-- pkg/types/capture.go | 8 +++-- pkg/types/codec/codecs.go | 12 ++++++++ 8 files changed, 80 insertions(+), 28 deletions(-) diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index 3400840e..c084e869 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -21,6 +21,7 @@ var moveSinkListenerMu = sync.Mutex{} type StreamSinkManagerCtx struct { id string getBitrate func() (int, error) + waitForKf bool // wait for a keyframe before sending samples logger zerolog.Logger mu sync.Mutex @@ -32,6 +33,7 @@ type StreamSinkManagerCtx struct { pipelineFn func() (string, error) listeners map[uintptr]*func(sample types.Sample) + listenersKf map[uintptr]*func(sample types.Sample) // keyframe lobby listenersMu sync.Mutex // metrics @@ -40,7 +42,7 @@ type StreamSinkManagerCtx struct { pipelinesActive prometheus.Gauge } -func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), id string, getBitrate func() (int, error)) *StreamSinkManagerCtx { +func streamSinkNew(c codec.RTPCodec, pipelineFn func() (string, error), id string, getBitrate func() (int, error)) *StreamSinkManagerCtx { logger := log.With(). Str("module", "capture"). Str("submodule", "stream-sink"). @@ -49,11 +51,15 @@ func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), id s manager := &StreamSinkManagerCtx{ id: id, getBitrate: getBitrate, + // only wait for keyframes if the codec is video + waitForKf: c.IsVideo(), logger: logger, - codec: codec, + codec: c, pipelineFn: pipelineFn, - listeners: map[uintptr]*func(sample types.Sample){}, + + listeners: map[uintptr]*func(sample types.Sample){}, + listenersKf: map[uintptr]*func(sample types.Sample){}, // metrics currentListeners: promauto.NewGauge(prometheus.GaugeOpts{ @@ -63,8 +69,8 @@ func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), id s Help: "Current number of listeners for a pipeline.", ConstLabels: map[string]string{ "video_id": id, - "codec_name": codec.Name, - "codec_type": codec.Type.String(), + "codec_name": c.Name, + "codec_type": c.Type.String(), }, }), pipelinesCounter: promauto.NewCounter(prometheus.CounterOpts{ @@ -75,8 +81,8 @@ func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), id s ConstLabels: map[string]string{ "submodule": "streamsink", "video_id": id, - "codec_name": codec.Name, - "codec_type": codec.Type.String(), + "codec_name": c.Name, + "codec_type": c.Type.String(), }, }), pipelinesActive: promauto.NewGauge(prometheus.GaugeOpts{ @@ -87,8 +93,8 @@ func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), id s ConstLabels: map[string]string{ "submodule": "streamsink", "video_id": id, - "codec_name": codec.Name, - "codec_type": codec.Type.String(), + "codec_name": c.Name, + "codec_type": c.Type.String(), }, }), } @@ -103,6 +109,9 @@ func (manager *StreamSinkManagerCtx) shutdown() { for key := range manager.listeners { delete(manager.listeners, key) } + for key := range manager.listenersKf { + delete(manager.listenersKf, key) + } manager.listenersMu.Unlock() manager.DestroyPipeline() @@ -133,7 +142,7 @@ func (manager *StreamSinkManagerCtx) Codec() codec.RTPCodec { } func (manager *StreamSinkManagerCtx) start() error { - if len(manager.listeners) == 0 { + if len(manager.listeners)+len(manager.listenersKf) == 0 { err := manager.CreatePipeline() if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { return err @@ -146,7 +155,7 @@ func (manager *StreamSinkManagerCtx) start() error { } func (manager *StreamSinkManagerCtx) stop() { - if len(manager.listeners) == 0 { + if len(manager.listeners)+len(manager.listenersKf) == 0 { manager.DestroyPipeline() manager.logger.Info().Msgf("last listener, stopping") } @@ -156,11 +165,22 @@ func (manager *StreamSinkManagerCtx) addListener(listener *func(sample types.Sam ptr := reflect.ValueOf(listener).Pointer() manager.listenersMu.Lock() - manager.listeners[ptr] = listener + if manager.waitForKf { + // if we're waiting for a keyframe, add it to the keyframe lobby + manager.listenersKf[ptr] = listener + } else { + // otherwise, add it as a regular listener + manager.listeners[ptr] = listener + } manager.listenersMu.Unlock() manager.logger.Debug().Interface("ptr", ptr).Msgf("adding listener") manager.currentListeners.Set(float64(manager.ListenersCount())) + + // if we will be waiting for a keyframe, emit one now + if manager.pipeline != nil && manager.waitForKf { + manager.pipeline.EmitVideoKeyframe() + } } func (manager *StreamSinkManagerCtx) removeListener(listener *func(sample types.Sample)) { @@ -168,6 +188,7 @@ func (manager *StreamSinkManagerCtx) removeListener(listener *func(sample types. manager.listenersMu.Lock() delete(manager.listeners, ptr) + delete(manager.listenersKf, ptr) // if it's a keyframe listener, remove it too manager.listenersMu.Unlock() manager.logger.Debug().Interface("ptr", ptr).Msgf("removing listener") @@ -259,7 +280,7 @@ func (manager *StreamSinkManagerCtx) ListenersCount() int { manager.listenersMu.Lock() defer manager.listenersMu.Unlock() - return len(manager.listeners) + return len(manager.listeners) + len(manager.listenersKf) } func (manager *StreamSinkManagerCtx) Started() bool { @@ -307,6 +328,15 @@ func (manager *StreamSinkManagerCtx) CreatePipeline() error { } manager.listenersMu.Lock() + // if is not delta unit -> it can be decoded independently -> it is a keyframe + if manager.waitForKf && !sample.DeltaUnit && len(manager.listenersKf) > 0 { + // if current sample is a keyframe, move listeners from + // keyframe lobby to actual listeners map and clear lobby + for k, v := range manager.listenersKf { + manager.listeners[k] = v + } + manager.listenersKf = make(map[uintptr]*func(sample types.Sample)) + } for _, emit := range manager.listeners { (*emit)(sample) } diff --git a/internal/config/capture.go b/internal/config/capture.go index 6b4b4fee..6e23b4a8 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -3,7 +3,6 @@ package config import ( "os" - "github.com/pion/webrtc/v3" "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -171,7 +170,7 @@ func (s *Capture) Set() { // video videoCodec := viper.GetString("capture.video.codec") s.VideoCodec, ok = codec.ParseStr(videoCodec) - if !ok || s.VideoCodec.Type != webrtc.RTPCodecTypeVideo { + if !ok || !s.VideoCodec.IsVideo() { log.Warn().Str("codec", videoCodec).Msgf("unknown video codec, using Vp8") s.VideoCodec = codec.VP8() } @@ -217,7 +216,7 @@ func (s *Capture) Set() { audioCodec := viper.GetString("capture.audio.codec") s.AudioCodec, ok = codec.ParseStr(audioCodec) - if !ok || s.AudioCodec.Type != webrtc.RTPCodecTypeAudio { + if !ok || !s.AudioCodec.IsAudio() { log.Warn().Str("codec", audioCodec).Msgf("unknown audio codec, using Opus") s.AudioCodec = codec.Opus() } diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index 6528d459..d3fb4082 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -64,7 +64,10 @@ func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.Pe return } - err := track.WriteSample(media.Sample(sample)) + err := track.WriteSample(media.Sample{ + Data: sample.Data, + Duration: sample.Duration, + }) if err != nil && !errors.Is(err, io.ErrClosedPipe) { logger.Warn().Err(err).Msg("failed to write sample to track") } diff --git a/pkg/gst/gst.c b/pkg/gst/gst.c index 86e97dce..020eb92f 100644 --- a/pkg/gst/gst.c +++ b/pkg/gst/gst.c @@ -6,7 +6,7 @@ static void gstreamer_pipeline_log(GstPipelineCtx *ctx, char* level, const char* char buffer[100]; vsprintf(buffer, format, argptr); va_end(argptr); - goPipelineLog(level, buffer, ctx->pipelineId); + goPipelineLog(ctx->pipelineId, level, buffer); } static gboolean gstreamer_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data) { @@ -95,7 +95,10 @@ static GstFlowReturn gstreamer_send_new_sample_handler(GstElement *object, gpoin buffer = gst_sample_get_buffer(sample); if (buffer) { gst_buffer_extract_dup(buffer, 0, gst_buffer_get_size(buffer), ©, ©_size); - goHandlePipelineBuffer(copy, copy_size, GST_BUFFER_DURATION(buffer), ctx->pipelineId); + goHandlePipelineBuffer(ctx->pipelineId, copy, copy_size, + GST_BUFFER_DURATION(buffer), + GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT) + ); } gst_sample_unref(sample); } diff --git a/pkg/gst/gst.go b/pkg/gst/gst.go index 14bdc6dd..9d4fb874 100644 --- a/pkg/gst/gst.go +++ b/pkg/gst/gst.go @@ -200,8 +200,8 @@ func CheckPlugins(plugins []string) error { } //export goHandlePipelineBuffer -func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.int, pipelineID C.int) { - defer C.free(buffer) +func goHandlePipelineBuffer(pipelineID C.int, buf unsafe.Pointer, bufLen C.int, duration C.guint64, deltaUnit C.gboolean) { + defer C.free(buf) pipelinesLock.Lock() pipeline, ok := pipelines[int(pipelineID)] @@ -209,8 +209,9 @@ func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.i if ok { pipeline.sample <- types.Sample{ - Data: C.GoBytes(buffer, bufferLen), - Duration: time.Duration(duration), + Data: C.GoBytes(buf, bufLen), + Duration: time.Duration(duration), + DeltaUnit: deltaUnit == C.TRUE, } } else { log.Warn(). @@ -222,7 +223,7 @@ func goHandlePipelineBuffer(buffer unsafe.Pointer, bufferLen C.int, duration C.i } //export goPipelineLog -func goPipelineLog(levelUnsafe *C.char, msgUnsafe *C.char, pipelineID C.int) { +func goPipelineLog(pipelineID C.int, levelUnsafe *C.char, msgUnsafe *C.char) { levelStr := C.GoString(levelUnsafe) msg := C.GoString(msgUnsafe) diff --git a/pkg/gst/gst.h b/pkg/gst/gst.h index 619170e7..1d6a1527 100644 --- a/pkg/gst/gst.h +++ b/pkg/gst/gst.h @@ -12,8 +12,8 @@ typedef struct GstPipelineCtx { GstElement *appsrc; } GstPipelineCtx; -extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int pipelineId); -extern void goPipelineLog(char *level, char *msg, int pipelineId); +extern void goHandlePipelineBuffer(int pipelineId, void *buffer, int bufferLen, guint64 duration, gboolean deltaUnit); +extern void goPipelineLog(int pipelineId, char *level, char *msg); GstPipelineCtx *gstreamer_pipeline_create(char *pipelineStr, int pipelineId, GError **error); void gstreamer_pipeline_attach_appsink(GstPipelineCtx *ctx, char *sinkName); diff --git a/pkg/types/capture.go b/pkg/types/capture.go index 6ab9a8e7..9ef238ed 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -6,17 +6,21 @@ import ( "fmt" "math" "strings" + "time" "github.com/PaesslerAG/gval" "github.com/demodesk/neko/pkg/types/codec" - "github.com/pion/webrtc/v3/pkg/media" ) var ( ErrCapturePipelineAlreadyExists = errors.New("capture pipeline already exists") ) -type Sample media.Sample +type Sample struct { + Data []byte + Duration time.Duration + DeltaUnit bool // this unit cannot be decoded independently. +} type Receiver interface { SetStream(stream StreamSinkManager) (changed bool, err error) diff --git a/pkg/types/codec/codecs.go b/pkg/types/codec/codecs.go index 0bb6adf0..c71057ba 100644 --- a/pkg/types/codec/codecs.go +++ b/pkg/types/codec/codecs.go @@ -63,6 +63,18 @@ func (codec *RTPCodec) Register(engine *webrtc.MediaEngine) error { }, codec.Type) } +func (codec *RTPCodec) IsVideo() bool { + return codec.Type == webrtc.RTPCodecTypeVideo +} + +func (codec *RTPCodec) IsAudio() bool { + return codec.Type == webrtc.RTPCodecTypeAudio +} + +func (codec *RTPCodec) String() string { + return codec.Type.String() + "/" + codec.Name +} + func VP8() RTPCodec { return RTPCodec{ Name: "vp8", From 008690005313d3ab17f593bd3255bfd827596f3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 14 Feb 2023 21:19:14 +0100 Subject: [PATCH 789/876] GCC No-Op Pacer (#29) * on rtcp send multiple packets. * use no op pacer. --- internal/webrtc/manager.go | 22 ++++++++++++++-------- internal/webrtc/track.go | 23 ++++++----------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index e220316c..e25f1c93 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -213,9 +213,13 @@ func (manager *WebRTCManagerCtx) newPeerConnection(bitrate int, codecs []codec.R congestionController, err := cc.NewInterceptor(func() (cc.BandwidthEstimator, error) { if bitrate == 0 { - bitrate = 1000000 + bitrate = 1_000_000 } - return gcc.NewSendSideBWE(gcc.SendSideBWEInitialBitrate(bitrate)) + + return gcc.NewSendSideBWE( + gcc.SendSideBWEInitialBitrate(bitrate), + gcc.SendSideBWEPacer(gcc.NewNoOpPacer()), + ) }) if err != nil { return nil, nil, err @@ -625,12 +629,14 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, }) }) - videoTrack.OnRTCP(func(p rtcp.Packet) { - if rtcpPacket, ok := p.(*rtcp.ReceiverReport); ok { - l := len(rtcpPacket.Reports) - if l > 0 { - // use only last report - manager.metrics.SetReceiverReport(session, rtcpPacket.Reports[l-1]) + videoTrack.OnRTCP(func(packets []rtcp.Packet) { + for _, p := range packets { + if rtcpPacket, ok := p.(*rtcp.ReceiverReport); ok { + l := len(rtcpPacket.Reports) + if l > 0 { + // use only last report + manager.metrics.SetReceiverReport(session, rtcpPacket.Reports[l-1]) + } } } }) diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index d3fb4082..6e53b44c 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -26,7 +26,7 @@ type Track struct { stream types.StreamSinkManager streamMu sync.Mutex - onRtcp func(rtcp.Packet) + onRtcp func([]rtcp.Packet) onRtcpMu sync.RWMutex bitrateChange func(int) (bool, error) @@ -84,9 +84,8 @@ func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.Pe } func (t *Track) rtcpReader(sender *webrtc.RTPSender) { - rtcpBuf := make([]byte, 1500) for { - n, _, err := sender.Read(rtcpBuf) + packets, _, err := sender.ReadRTCP() if err != nil { if err == io.EOF || err == io.ErrClosedPipe { return @@ -96,21 +95,11 @@ func (t *Track) rtcpReader(sender *webrtc.RTPSender) { continue } - packets, err := rtcp.Unmarshal(rtcpBuf[:n]) - if err != nil { - t.logger.Err(err).Msg("RTCP unmarshal error") - continue - } - t.onRtcpMu.RLock() - handler := t.onRtcp - t.onRtcpMu.RUnlock() - - for _, packet := range packets { - if handler != nil { - go handler(packet) - } + if t.onRtcp != nil { + go t.onRtcp(packets) } + t.onRtcpMu.RUnlock() } } @@ -152,7 +141,7 @@ func (t *Track) SetPaused(paused bool) { t.paused = paused } -func (t *Track) OnRTCP(f func(rtcp.Packet)) { +func (t *Track) OnRTCP(f func([]rtcp.Packet)) { t.onRtcpMu.Lock() defer t.onRtcpMu.Unlock() From 30200d4057fe1237f5f7bb1c9c9cc22ad9c4e1f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 20 Feb 2023 19:48:04 +0100 Subject: [PATCH 790/876] Switch to listeners for webrtc pause (#31) * switch to listeners for webrtc pause. * group track vars. * do not set or remove stream when paused. --- internal/capture/streamsink.go | 5 +++- internal/webrtc/track.go | 52 ++++++++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index c084e869..c94c48d9 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -163,9 +163,12 @@ func (manager *StreamSinkManagerCtx) stop() { func (manager *StreamSinkManagerCtx) addListener(listener *func(sample types.Sample)) { ptr := reflect.ValueOf(listener).Pointer() + emitKeyframe := false manager.listenersMu.Lock() if manager.waitForKf { + // if this is the first listener, we need to emit a keyframe + emitKeyframe = len(manager.listenersKf) == 0 // if we're waiting for a keyframe, add it to the keyframe lobby manager.listenersKf[ptr] = listener } else { @@ -178,7 +181,7 @@ func (manager *StreamSinkManagerCtx) addListener(listener *func(sample types.Sam manager.currentListeners.Set(float64(manager.ListenersCount())) // if we will be waiting for a keyframe, emit one now - if manager.pipeline != nil && manager.waitForKf { + if manager.pipeline != nil && emitKeyframe { manager.pipeline.EmitVideoKeyframe() } } diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index 6e53b44c..e00d1e5e 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -16,13 +16,14 @@ import ( ) type Track struct { - logger zerolog.Logger - track *webrtc.TrackLocalStaticSample - paused bool + logger zerolog.Logger + track *webrtc.TrackLocalStaticSample + listener func(sample types.Sample) + videoAuto bool videoAutoMu sync.RWMutex - listener func(sample types.Sample) + paused bool stream types.StreamSinkManager streamMu sync.Mutex @@ -60,10 +61,6 @@ func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.Pe } t.listener = func(sample types.Sample) { - if t.paused { - return - } - err := track.WriteSample(media.Sample{ Data: sample.Data, Duration: sample.Duration, @@ -112,6 +109,12 @@ func (t *Track) SetStream(stream types.StreamSinkManager) (bool, error) { return false, nil } + // if paused, we switch the stream but don't add the listener + if t.paused { + t.stream = stream + return true, nil + } + var err error if t.stream != nil { err = t.stream.MoveListenerTo(&t.listener, stream) @@ -123,7 +126,6 @@ func (t *Track) SetStream(stream types.StreamSinkManager) (bool, error) { } t.stream = stream - return true, nil } @@ -131,13 +133,39 @@ func (t *Track) RemoveStream() { t.streamMu.Lock() defer t.streamMu.Unlock() - if t.stream != nil { - _ = t.stream.RemoveListener(&t.listener) - t.stream = nil + // if there is no stream, or paused, do nothing + if t.stream == nil || t.paused { + return } + + err := t.stream.RemoveListener(&t.listener) + if err != nil { + t.logger.Warn().Err(err).Msg("failed to remove listener from stream") + } + + t.stream = nil } func (t *Track) SetPaused(paused bool) { + t.streamMu.Lock() + defer t.streamMu.Unlock() + + // if there is no state change or no stream, do nothing + if t.paused == paused || t.stream == nil { + return + } + + var err error + if paused { + err = t.stream.RemoveListener(&t.listener) + } else { + err = t.stream.AddListener(&t.listener) + } + if err != nil { + t.logger.Warn().Err(err).Msg("failed to change listener state") + return + } + t.paused = paused } From ccaaacac7ccb4a005fd30bed87b71e13ca2a2d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 20 Feb 2023 19:49:39 +0100 Subject: [PATCH 791/876] do not round height to 8. --- pkg/xorg/xorg.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/xorg/xorg.go b/pkg/xorg/xorg.go index 11629134..703aa49d 100644 --- a/pkg/xorg/xorg.go +++ b/pkg/xorg/xorg.go @@ -189,9 +189,8 @@ func ChangeScreenSize(width int, height int, rate int16) (int, int, int16, error mu.Lock() defer mu.Unlock() - // round width and height to 8 + // round width to 8, because of Xorg width = width - (width % 8) - height = height - (height % 8) // convert variables to C types c_width, c_height, c_rate := C.int(width), C.int(height), C.short(rate) From 64abfd0b1a615cdff310439fe03fcf7fd7a5461f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 21 Feb 2023 00:14:50 +0100 Subject: [PATCH 792/876] cursors increase max serial to 300. --- internal/webrtc/cursor/image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index ddfdcc18..36e04b5c 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -17,7 +17,7 @@ func NewImage(desktop types.DesktopManager) *ImageCtx { desktop: desktop, listeners: map[uintptr]*func(entry *ImageEntry){}, cache: map[uint64]*ImageEntry{}, - maxSerial: 200, // TODO: Cleanup? + maxSerial: 300, // TODO: Cleanup? } } From a4a3ff79ad8a3007bb580ddd79f1759700ce6b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 26 Feb 2023 21:54:10 +0100 Subject: [PATCH 793/876] Toggle estimator config (#32) * add estimator to conifg. * ensure video auto is false when estimator is disabled. --- internal/config/webrtc.go | 20 ++++++ internal/webrtc/manager.go | 98 +++++++++++++++++----------- internal/websocket/handler/signal.go | 1 + 3 files changed, 81 insertions(+), 38 deletions(-) diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 126f1d5e..8fe40f40 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -26,6 +26,9 @@ type WebRTC struct { NAT1To1IPs []string IpRetrievalUrl string + + EstimatorEnabled bool + EstimatorInitialBitrate int } func (WebRTC) Init(cmd *cobra.Command) error { @@ -69,6 +72,18 @@ func (WebRTC) Init(cmd *cobra.Command) error { return err } + // bandwidth estimator + + cmd.PersistentFlags().Bool("webrtc.estimator.enabled", false, "enables the bandwidth estimator") + if err := viper.BindPFlag("webrtc.estimator.enabled", cmd.PersistentFlags().Lookup("webrtc.estimator.enabled")); err != nil { + return err + } + + cmd.PersistentFlags().Int("webrtc.estimator.initial_bitrate", 1_000_000, "initial bitrate for the bandwidth estimator") + if err := viper.BindPFlag("webrtc.estimator.initial_bitrate", cmd.PersistentFlags().Lookup("webrtc.estimator.initial_bitrate")); err != nil { + return err + } + return nil } @@ -135,4 +150,9 @@ func (s *WebRTC) Set() { log.Warn().Err(err).Msgf("IP retrieval failed") } } + + // bandwidth estimator + + s.EstimatorEnabled = viper.GetBool("webrtc.estimator.enabled") + s.EstimatorInitialBitrate = viper.GetInt("webrtc.estimator.initial_bitrate") } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index e25f1c93..1dc0ef96 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -211,28 +211,34 @@ func (manager *WebRTCManagerCtx) newPeerConnection(bitrate int, codecs []codec.R // create interceptor registry registry := &interceptor.Registry{} - congestionController, err := cc.NewInterceptor(func() (cc.BandwidthEstimator, error) { - if bitrate == 0 { - bitrate = 1_000_000 + // create bandwidth estimator + estimatorChan := make(chan cc.BandwidthEstimator, 1) + if manager.config.EstimatorEnabled { + congestionController, err := cc.NewInterceptor(func() (cc.BandwidthEstimator, error) { + if bitrate == 0 { + bitrate = manager.config.EstimatorInitialBitrate + } + + return gcc.NewSendSideBWE( + gcc.SendSideBWEInitialBitrate(bitrate), + gcc.SendSideBWEPacer(gcc.NewNoOpPacer()), + ) + }) + if err != nil { + return nil, nil, err } - return gcc.NewSendSideBWE( - gcc.SendSideBWEInitialBitrate(bitrate), - gcc.SendSideBWEPacer(gcc.NewNoOpPacer()), - ) - }) - if err != nil { - return nil, nil, err - } + congestionController.OnNewPeerConnection(func(id string, estimator cc.BandwidthEstimator) { + estimatorChan <- estimator + }) - estimatorChan := make(chan cc.BandwidthEstimator, 1) - congestionController.OnNewPeerConnection(func(id string, estimator cc.BandwidthEstimator) { - estimatorChan <- estimator - }) - - registry.Add(congestionController) - if err = webrtc.ConfigureTWCCHeaderExtensionSender(engine, registry); err != nil { - return nil, nil, err + registry.Add(congestionController) + if err = webrtc.ConfigureTWCCHeaderExtensionSender(engine, registry); err != nil { + return nil, nil, err + } + } else { + // no estimator, send nil + estimatorChan <- nil } if err := webrtc.RegisterDefaultInterceptors(engine, registry); err != nil { @@ -276,7 +282,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, return nil, err } - if bitrate == 0 { + // if bitrate is 0, and estimator is enabled, use estimator bitrate + if bitrate == 0 && estimator != nil { bitrate = estimator.GetTargetBitrate() } @@ -309,6 +316,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, return nil, err } + // if estimator is disabled, disable video auto + if !manager.config.EstimatorEnabled { + videoAuto = false + } + // video track videoTrack, err := NewTrack(logger, videoCodec, connection, WithVideoAuto(videoAuto)) if err != nil { @@ -321,7 +333,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, changeVideoFromBitrate := func(peerBitrate int) { // when switching from manual to auto bitrate estimation, in case the estimator is // idle (lastBitrate > maxBitrate), we want to go back to the previous estimated bitrate - if peerBitrate == 0 { + if peerBitrate == 0 && estimator != nil { peerBitrate = estimator.GetTargetBitrate() manager.logger.Debug(). Int("peer_bitrate", peerBitrate). @@ -397,24 +409,27 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, // set initial video bitrate changeVideoFromBitrate(bitrate) - // use a ticker to get current client target bitrate - go func() { - ticker := time.NewTicker(bitrateCheckInterval) - defer ticker.Stop() + // if estimator is enabled, use it to change video stream + if estimator != nil { + go func() { + // use a ticker to get current client target bitrate + ticker := time.NewTicker(bitrateCheckInterval) + defer ticker.Stop() - for range ticker.C { - targetBitrate := estimator.GetTargetBitrate() - manager.metrics.SetReceiverEstimatedMaximumBitrate(session, float64(targetBitrate)) + for range ticker.C { + targetBitrate := estimator.GetTargetBitrate() + manager.metrics.SetReceiverEstimatedMaximumBitrate(session, float64(targetBitrate)) - if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { - break + if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { + break + } + if !videoTrack.VideoAuto() { + continue + } + changeVideoFromBitrate(targetBitrate) } - if !videoTrack.VideoAuto() { - continue - } - changeVideoFromBitrate(targetBitrate) - } - }() + }() + } // data channel @@ -435,8 +450,15 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, videoTrack.SetPaused(isPaused) audioTrack.SetPaused(isPaused) }, - iceTrickle: manager.config.ICETrickle, - setVideoAuto: videoTrack.SetVideoAuto, + iceTrickle: manager.config.ICETrickle, + setVideoAuto: func(videoAuto bool) { + if manager.config.EstimatorEnabled { + videoTrack.SetVideoAuto(videoAuto) + } else { + logger.Warn().Msg("estimator is disabled, cannot change video auto") + videoTrack.SetVideoAuto(false) // ensure video auto is disabled + } + }, getVideoAuto: videoTrack.VideoAuto, } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index ec1955c0..f596f61d 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -40,6 +40,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag } payload.Video = webrtcPeer.GetVideoID() + payload.VideoAuto = webrtcPeer.VideoAuto() } session.Send( From 977662affe57e5679b3465d53112b7e28d96f7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 26 Feb 2023 21:57:02 +0100 Subject: [PATCH 794/876] Upgrade to go 1.20 (#30) * upgrade dependencies. * videoscale element to nearest neighbor. --- .devcontainer/devcontainer.json | 2 +- Dockerfile | 2 +- Dockerfile.nvidia | 2 +- go.mod | 62 +++++---- go.sum | 229 +++++++++++--------------------- pkg/types/capture.go | 3 +- 6 files changed, 111 insertions(+), 189 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e7252a46..d22d8ea6 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,7 +7,7 @@ "context": "../", "args": { // Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.15 - "VARIANT": "1.18", + "VARIANT": "1.20", // Options "INSTALL_NODE": "false", "NODE_VERSION": "lts/*" diff --git a/Dockerfile b/Dockerfile index 7eee94c4..3a723f00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN set -eux; \ # # Stage 1: Build. # -FROM golang:1.18-bullseye as build +FROM golang:1.20-bullseye as build WORKDIR /src # diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index 5a8c8b13..21feed08 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -34,7 +34,7 @@ RUN set -eux; \ # # Stage 1: Build. # -FROM golang:1.18-bullseye as build +FROM golang:1.20-bullseye as build WORKDIR /src # diff --git a/go.mod b/go.mod index 64a7806f..99f7308c 100644 --- a/go.mod +++ b/go.mod @@ -1,69 +1,67 @@ module github.com/demodesk/neko -go 1.18 +go 1.20 require ( - github.com/PaesslerAG/gval v1.2.1 + github.com/PaesslerAG/gval v1.2.2 github.com/go-chi/chi v1.5.4 github.com/go-chi/cors v1.2.1 github.com/gorilla/websocket v1.5.0 github.com/kataras/go-events v0.0.3 - github.com/pion/ice/v2 v2.2.12 + github.com/pion/ice/v2 v2.3.0 github.com/pion/interceptor v0.1.12 github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.10 - github.com/pion/webrtc/v3 v3.1.49 + github.com/pion/webrtc/v3 v3.1.55 github.com/prometheus/client_golang v1.14.0 - github.com/rs/zerolog v1.28.0 + github.com/rs/zerolog v1.29.0 github.com/spf13/cobra v1.6.1 - github.com/spf13/viper v1.14.0 + github.com/spf13/viper v1.15.0 github.com/stretchr/testify v1.8.1 ) require ( github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect - github.com/magiconair/properties v1.8.6 // indirect - github.com/mattn/go-colorable v0.1.12 // indirect - github.com/mattn/go-isatty v0.0.14 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect - github.com/pion/datachannel v1.5.2 // indirect - github.com/pion/dtls/v2 v2.1.5 // indirect - github.com/pion/mdns v0.0.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.6 // indirect + github.com/pion/datachannel v1.5.5 // indirect + github.com/pion/dtls/v2 v2.2.6 // indirect + github.com/pion/mdns v0.0.7 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtp v1.7.13 // indirect - github.com/pion/sctp v1.8.3 // indirect + github.com/pion/sctp v1.8.6 // indirect github.com/pion/sdp/v3 v3.0.6 // indirect - github.com/pion/srtp/v2 v2.0.10 // indirect - github.com/pion/stun v0.3.5 // indirect - github.com/pion/transport v0.13.1 // indirect - github.com/pion/turn/v2 v2.0.8 // indirect - github.com/pion/udp v0.1.1 // indirect + github.com/pion/srtp/v2 v2.0.12 // indirect + github.com/pion/stun v0.4.0 // indirect + github.com/pion/transport/v2 v2.0.2 // indirect + github.com/pion/turn/v2 v2.1.0 // indirect + github.com/pion/udp/v2 v2.0.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/common v0.39.0 // indirect + github.com/prometheus/procfs v0.9.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.4.1 // indirect - golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2 // indirect - golang.org/x/net v0.1.0 // indirect - golang.org/x/sys v0.1.0 // indirect - golang.org/x/text v0.4.0 // indirect + github.com/subosito/gotenv v1.4.2 // indirect + golang.org/x/crypto v0.6.0 // indirect + golang.org/x/net v0.7.0 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index c8bdb9be..91af6b15 100644 --- a/go.sum +++ b/go.sum @@ -38,23 +38,15 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/PaesslerAG/gval v1.2.1 h1:Ggwtej1xCyt1994VuDCSjycybIDo3duDCDghK/xc/A0= -github.com/PaesslerAG/gval v1.2.1/go.mod h1:XRFLwvmkTEdYziLdaCeCa5ImcGVrfQbeNUbVR+C6xac= +github.com/PaesslerAG/gval v1.2.2 h1:Y7iBzhgE09IGTt5QgGQ2IdaYYYOU134YGHBThD+wm9E= +github.com/PaesslerAG/gval v1.2.2/go.mod h1:XRFLwvmkTEdYziLdaCeCa5ImcGVrfQbeNUbVR+C6xac= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -85,18 +77,8 @@ github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vz github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -138,7 +120,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -168,46 +149,33 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4= github.com/kataras/go-events v0.0.3/go.mod h1:bFBgtzwwzrag7kQmGuU1ZaVxhK2qseYPQomXoVEMsj4= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= -github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -217,96 +185,73 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= -github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= -github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= -github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= -github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= -github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c= -github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY= -github.com/pion/ice/v2 v2.2.12 h1:n3M3lUMKQM5IoofhJo73D3qVla+mJN2nVvbSPq32Nig= -github.com/pion/ice/v2 v2.2.12/go.mod h1:z2KXVFyRkmjetRlaVRgjO9U3ShKwzhlUylvxKfHfd5A= -github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8= +github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= +github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= +github.com/pion/dtls/v2 v2.2.4/go.mod h1:WGKfxqhrddne4Kg3p11FUMJrynkOY4lb25zHNO49wuw= +github.com/pion/dtls/v2 v2.2.6 h1:yXMxKr0Skd+Ub6A8UqXTRLSywskx93ooMRHsQUtd+Z4= +github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY= +github.com/pion/ice/v2 v2.3.0 h1:G+ysriabk1p9wbySDpdsnlD+6ZspLlDLagRduRfzJPk= +github.com/pion/ice/v2 v2.3.0/go.mod h1:+xO/cXVnnVUr6D2ZJcCT5g9LngucUkkTvfnTMqUxKRM= github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8= github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= -github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= -github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g= +github.com/pion/mdns v0.0.7 h1:P0UB4Sr6xDWEox0kTVxF0LmQihtCbSAdW0H2nEgkA3U= +github.com/pion/mdns v0.0.7/go.mod h1:4iP2UbeFhLI/vWju/bw6ZfwjJzk0z8DNValjGxR/dD8= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo= github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc= github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I= github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= -github.com/pion/sctp v1.8.3 h1:LWcciN2ptLkw9Ugp/Ks2E76fiWy7yk3Wm79D6oFbFNo= -github.com/pion/sctp v1.8.3/go.mod h1:OHbDjdk7kg+L+7TJim9q/qGVefdEJohuA2SZyihccgI= +github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= +github.com/pion/sctp v1.8.6 h1:CUex11Vkt9YS++VhLf8b55O3VqKrWL6W3SDwX4jAqsI= +github.com/pion/sctp v1.8.6/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw= github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= -github.com/pion/srtp/v2 v2.0.10 h1:b8ZvEuI+mrL8hbr/f1YiJFB34UMrOac3R3N1yq2UN0w= -github.com/pion/srtp/v2 v2.0.10/go.mod h1:XEeSWaK9PfuMs7zxXyiN252AHPbH12NX5q/CFDWtUuA= -github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= -github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= -github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= -github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= -github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g= -github.com/pion/transport v0.13.1 h1:/UH5yLeQtwm2VZIPjxwnNFxjS4DFhyLfS4GlfuKUzfA= -github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg= -github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw= -github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= -github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= -github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/webrtc/v3 v3.1.49 h1:rbsNGxK9jMYts+xE6zYAJMUQHnGwmk/JYze8yttW+to= -github.com/pion/webrtc/v3 v3.1.49/go.mod h1:kHf/o47QW4No1rgpsFux/h7lUhtUnwFnSFDZOXeLapw= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pion/srtp/v2 v2.0.12 h1:WrmiVCubGMOAObBU1vwWjG0H3VSyQHawKeer2PVA5rY= +github.com/pion/srtp/v2 v2.0.12/go.mod h1:C3Ep44hlOo2qEYaq4ddsmK5dL63eLehXFbHaZ9F5V9Y= +github.com/pion/stun v0.4.0 h1:vgRrbBE2htWHy7l3Zsxckk7rkjnjOsSM7PHZnBwo8rk= +github.com/pion/stun v0.4.0/go.mod h1:QPsh1/SbXASntw3zkkrIk3ZJVKz4saBY2G7S10P3wCw= +github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40= +github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI= +github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc= +github.com/pion/transport/v2 v2.0.1/go.mod h1:93OYg91+mrGxKW+Jrgzmqr80kgXqD7J0yybOrdr7w0Y= +github.com/pion/transport/v2 v2.0.2 h1:St+8o+1PEzPT51O9bv+tH/KYYLMNR5Vwm5Z3Qkjsywg= +github.com/pion/transport/v2 v2.0.2/go.mod h1:vrz6bUbFr/cjdwbnxq8OdDDzHf7JJfGsIRkxfpZoTA0= +github.com/pion/turn/v2 v2.1.0 h1:5wGHSgGhJhP/RpabkUb/T9PdsAjkGLS6toYz5HNzoSI= +github.com/pion/turn/v2 v2.1.0/go.mod h1:yrT5XbXSGX1VFSF31A3c1kCNB5bBZgk/uu5LET162qs= +github.com/pion/udp v0.1.4/go.mod h1:G8LDo56HsFwC24LIcnT4YIDU5qcB6NepqqjP0keL2us= +github.com/pion/udp/v2 v2.0.1 h1:xP0z6WNux1zWEjhC7onRA3EwwSliXqu1ElUZAQhUP54= +github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8= +github.com/pion/webrtc/v3 v3.1.55 h1:jQt98hZ8DUi/l/s/rtogthBdsKKvKekFgZCX9hMEqRo= +github.com/pion/webrtc/v3 v3.1.55/go.mod h1:M1gU5mnvvo4e1nnLvF23esYz0nZAFOtbU/wq44MSfbc= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI= +github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY= -github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= +github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= +github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= -github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= +github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= @@ -315,24 +260,21 @@ github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmq github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= -github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= +github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= +github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= -github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -344,7 +286,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -353,9 +294,9 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2 h1:x8vtB3zMecnlqZIwJNUUpwYKYSqCz5jXbiyv0ZJJZeI= -golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -393,7 +334,6 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -401,7 +341,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -422,22 +361,16 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -447,8 +380,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -461,13 +392,10 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -479,7 +407,6 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -492,8 +419,6 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -502,26 +427,26 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -530,8 +455,10 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -680,22 +607,18 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/pkg/types/capture.go b/pkg/types/capture.go index 9ef238ed..72a83cfd 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -160,7 +160,8 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { return "", err } - scalePipeline = fmt.Sprintf("! videoscale ! capsfilter caps=video/x-raw,width=%d,height=%d name=resolution ! queue", w, h) + // element videoscale parameter method to 0 meaning nearest neighbor + scalePipeline = fmt.Sprintf("! videoscale method=0 ! capsfilter caps=video/x-raw,width=%d,height=%d name=resolution ! queue", w, h) } // get encoder pipeline From a9e6736ca4634cdd9e401ad68d0ea0d668e2b398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 28 Feb 2023 10:02:20 +0100 Subject: [PATCH 795/876] upgrade deps. --- go.mod | 11 ++++++----- go.sum | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 99f7308c..f8c6d6bb 100644 --- a/go.mod +++ b/go.mod @@ -8,16 +8,16 @@ require ( github.com/go-chi/cors v1.2.1 github.com/gorilla/websocket v1.5.0 github.com/kataras/go-events v0.0.3 - github.com/pion/ice/v2 v2.3.0 + github.com/pion/ice/v2 v2.3.1 github.com/pion/interceptor v0.1.12 github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.10 - github.com/pion/webrtc/v3 v3.1.55 + github.com/pion/webrtc/v3 v3.1.56 github.com/prometheus/client_golang v1.14.0 github.com/rs/zerolog v1.29.0 github.com/spf13/cobra v1.6.1 github.com/spf13/viper v1.15.0 - github.com/stretchr/testify v1.8.1 + github.com/stretchr/testify v1.8.2 ) require ( @@ -49,13 +49,14 @@ require ( github.com/pion/udp/v2 v2.0.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.39.0 // indirect + github.com/prometheus/common v0.40.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/spf13/afero v1.9.3 // indirect + github.com/spf13/afero v1.9.4 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/objx v0.5.0 // indirect github.com/subosito/gotenv v1.4.2 // indirect golang.org/x/crypto v0.6.0 // indirect golang.org/x/net v0.7.0 // indirect diff --git a/go.sum b/go.sum index 91af6b15..a547799b 100644 --- a/go.sum +++ b/go.sum @@ -120,6 +120,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -152,6 +153,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4= @@ -176,6 +179,11 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zk github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -194,6 +202,8 @@ github.com/pion/dtls/v2 v2.2.6 h1:yXMxKr0Skd+Ub6A8UqXTRLSywskx93ooMRHsQUtd+Z4= github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY= github.com/pion/ice/v2 v2.3.0 h1:G+ysriabk1p9wbySDpdsnlD+6ZspLlDLagRduRfzJPk= github.com/pion/ice/v2 v2.3.0/go.mod h1:+xO/cXVnnVUr6D2ZJcCT5g9LngucUkkTvfnTMqUxKRM= +github.com/pion/ice/v2 v2.3.1 h1:FQCmUfZe2Jpe7LYStVBOP6z1DiSzbIateih3TztgTjc= +github.com/pion/ice/v2 v2.3.1/go.mod h1:aq2kc6MtYNcn4XmMhobAv6hTNJiHzvD0yXRz80+bnP8= github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8= github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= @@ -228,6 +238,8 @@ github.com/pion/udp/v2 v2.0.1 h1:xP0z6WNux1zWEjhC7onRA3EwwSliXqu1ElUZAQhUP54= github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8= github.com/pion/webrtc/v3 v3.1.55 h1:jQt98hZ8DUi/l/s/rtogthBdsKKvKekFgZCX9hMEqRo= github.com/pion/webrtc/v3 v3.1.55/go.mod h1:M1gU5mnvvo4e1nnLvF23esYz0nZAFOtbU/wq44MSfbc= +github.com/pion/webrtc/v3 v3.1.56 h1:ScaiqKQN3liQwT+kJwOBaYP6TwSfixzdUnZmzHAo0a0= +github.com/pion/webrtc/v3 v3.1.56/go.mod h1:7VhbA6ihqJlz6R/INHjyh1b8HpiV9Ct4UQvE1OB/xoM= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -239,6 +251,8 @@ github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvq github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI= github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= +github.com/prometheus/common v0.40.0 h1:Afz7EVRqGg2Mqqf4JuF9vdvp1pi220m55Pi9T2JnO4Q= +github.com/prometheus/common v0.40.0/go.mod h1:L65ZJPSmfn/UBWLQIHV7dBrKFidB/wPlF1y5TlSt9OE= github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -252,6 +266,8 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.4 h1:Sd43wM1IWz/s1aVXdOBkjJvuP8UdyqioeE4AmM0QsBs= +github.com/spf13/afero v1.9.4/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= @@ -266,6 +282,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -273,6 +290,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From 38fc21aabc65914f82dcb3f746adafffb33a7e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 28 Feb 2023 10:09:18 +0100 Subject: [PATCH 796/876] upgrade deps. --- go.mod | 4 +++- go.sum | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index f8c6d6bb..bc26cd70 100644 --- a/go.mod +++ b/go.mod @@ -29,11 +29,14 @@ require ( github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/pion/datachannel v1.5.5 // indirect github.com/pion/dtls/v2 v2.2.6 // indirect @@ -56,7 +59,6 @@ require ( github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/objx v0.5.0 // indirect github.com/subosito/gotenv v1.4.2 // indirect golang.org/x/crypto v0.6.0 // indirect golang.org/x/net v0.7.0 // indirect diff --git a/go.sum b/go.sum index a547799b..7d48c465 100644 --- a/go.sum +++ b/go.sum @@ -197,11 +197,8 @@ github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvI github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= -github.com/pion/dtls/v2 v2.2.4/go.mod h1:WGKfxqhrddne4Kg3p11FUMJrynkOY4lb25zHNO49wuw= github.com/pion/dtls/v2 v2.2.6 h1:yXMxKr0Skd+Ub6A8UqXTRLSywskx93ooMRHsQUtd+Z4= github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY= -github.com/pion/ice/v2 v2.3.0 h1:G+ysriabk1p9wbySDpdsnlD+6ZspLlDLagRduRfzJPk= -github.com/pion/ice/v2 v2.3.0/go.mod h1:+xO/cXVnnVUr6D2ZJcCT5g9LngucUkkTvfnTMqUxKRM= github.com/pion/ice/v2 v2.3.1 h1:FQCmUfZe2Jpe7LYStVBOP6z1DiSzbIateih3TztgTjc= github.com/pion/ice/v2 v2.3.1/go.mod h1:aq2kc6MtYNcn4XmMhobAv6hTNJiHzvD0yXRz80+bnP8= github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8= @@ -228,16 +225,12 @@ github.com/pion/stun v0.4.0/go.mod h1:QPsh1/SbXASntw3zkkrIk3ZJVKz4saBY2G7S10P3wC github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40= github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI= github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc= -github.com/pion/transport/v2 v2.0.1/go.mod h1:93OYg91+mrGxKW+Jrgzmqr80kgXqD7J0yybOrdr7w0Y= github.com/pion/transport/v2 v2.0.2 h1:St+8o+1PEzPT51O9bv+tH/KYYLMNR5Vwm5Z3Qkjsywg= github.com/pion/transport/v2 v2.0.2/go.mod h1:vrz6bUbFr/cjdwbnxq8OdDDzHf7JJfGsIRkxfpZoTA0= github.com/pion/turn/v2 v2.1.0 h1:5wGHSgGhJhP/RpabkUb/T9PdsAjkGLS6toYz5HNzoSI= github.com/pion/turn/v2 v2.1.0/go.mod h1:yrT5XbXSGX1VFSF31A3c1kCNB5bBZgk/uu5LET162qs= -github.com/pion/udp v0.1.4/go.mod h1:G8LDo56HsFwC24LIcnT4YIDU5qcB6NepqqjP0keL2us= github.com/pion/udp/v2 v2.0.1 h1:xP0z6WNux1zWEjhC7onRA3EwwSliXqu1ElUZAQhUP54= github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8= -github.com/pion/webrtc/v3 v3.1.55 h1:jQt98hZ8DUi/l/s/rtogthBdsKKvKekFgZCX9hMEqRo= -github.com/pion/webrtc/v3 v3.1.55/go.mod h1:M1gU5mnvvo4e1nnLvF23esYz0nZAFOtbU/wq44MSfbc= github.com/pion/webrtc/v3 v3.1.56 h1:ScaiqKQN3liQwT+kJwOBaYP6TwSfixzdUnZmzHAo0a0= github.com/pion/webrtc/v3 v3.1.56/go.mod h1:7VhbA6ihqJlz6R/INHjyh1b8HpiV9Ct4UQvE1OB/xoM= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -249,8 +242,6 @@ github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQg github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI= -github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= github.com/prometheus/common v0.40.0 h1:Afz7EVRqGg2Mqqf4JuF9vdvp1pi220m55Pi9T2JnO4Q= github.com/prometheus/common v0.40.0/go.mod h1:L65ZJPSmfn/UBWLQIHV7dBrKFidB/wPlF1y5TlSt9OE= github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= @@ -264,8 +255,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/afero v1.9.4 h1:Sd43wM1IWz/s1aVXdOBkjJvuP8UdyqioeE4AmM0QsBs= github.com/spf13/afero v1.9.4/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= @@ -288,7 +277,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= From 17bfd2d58f8e8d7b15738e6817113a446a42ebd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 7 Mar 2023 00:08:53 +0100 Subject: [PATCH 797/876] Sample listeners chan (#33) * switch to sample listeners. * add streamsink total bytes to metrics. * on rtcp to chan. * change logs. * streamsink add real bitrate. * add timing information to sample. * bitrate buckets. * switch to WriteSample. --- internal/capture/streamsink.go | 108 ++++++++++++++++++++++++++------- internal/webrtc/manager.go | 34 ++++++++--- internal/webrtc/track.go | 83 +++++++++++++++---------- pkg/gst/gst.go | 8 ++- pkg/types/capture.go | 17 ++++-- 5 files changed, 178 insertions(+), 72 deletions(-) diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index c94c48d9..adda86c2 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -4,6 +4,8 @@ import ( "errors" "reflect" "sync" + "sync/atomic" + "time" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" @@ -23,6 +25,9 @@ type StreamSinkManagerCtx struct { getBitrate func() (int, error) waitForKf bool // wait for a keyframe before sending samples + bitrate uint64 // atomic + brBuckets map[int]float64 + logger zerolog.Logger mu sync.Mutex wg sync.WaitGroup @@ -32,12 +37,13 @@ type StreamSinkManagerCtx struct { pipelineMu sync.Mutex pipelineFn func() (string, error) - listeners map[uintptr]*func(sample types.Sample) - listenersKf map[uintptr]*func(sample types.Sample) // keyframe lobby + listeners map[uintptr]types.SampleListener + listenersKf map[uintptr]types.SampleListener // keyframe lobby listenersMu sync.Mutex // metrics currentListeners prometheus.Gauge + totalBytes prometheus.Counter pipelinesCounter prometheus.Counter pipelinesActive prometheus.Gauge } @@ -54,12 +60,14 @@ func streamSinkNew(c codec.RTPCodec, pipelineFn func() (string, error), id strin // only wait for keyframes if the codec is video waitForKf: c.IsVideo(), + brBuckets: map[int]float64{}, + logger: logger, codec: c, pipelineFn: pipelineFn, - listeners: map[uintptr]*func(sample types.Sample){}, - listenersKf: map[uintptr]*func(sample types.Sample){}, + listeners: map[uintptr]types.SampleListener{}, + listenersKf: map[uintptr]types.SampleListener{}, // metrics currentListeners: promauto.NewGauge(prometheus.GaugeOpts{ @@ -73,6 +81,17 @@ func streamSinkNew(c codec.RTPCodec, pipelineFn func() (string, error), id strin "codec_type": c.Type.String(), }, }), + totalBytes: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "streamsink_bytes", + Namespace: "neko", + Subsystem: "capture", + Help: "Total number of bytes created by the pipeline.", + ConstLabels: map[string]string{ + "video_id": id, + "codec_name": c.Name, + "codec_type": c.Type.String(), + }, + }), pipelinesCounter: promauto.NewCounter(prometheus.CounterOpts{ Name: "pipelines_total", Namespace: "neko", @@ -123,6 +142,14 @@ func (manager *StreamSinkManagerCtx) ID() string { } func (manager *StreamSinkManagerCtx) Bitrate() int { + // TODO: fix bitrate switching calculation + // return real bitrate if available + //realBitrate := atomic.LoadUint64(&manager.bitrate) + //if realBitrate != 0 { + // return int(realBitrate) + //} + + // if we do not have function to estimate bitrate, return 0 if manager.getBitrate == nil { return 0 } @@ -161,7 +188,7 @@ func (manager *StreamSinkManagerCtx) stop() { } } -func (manager *StreamSinkManagerCtx) addListener(listener *func(sample types.Sample)) { +func (manager *StreamSinkManagerCtx) addListener(listener types.SampleListener) { ptr := reflect.ValueOf(listener).Pointer() emitKeyframe := false @@ -186,7 +213,7 @@ func (manager *StreamSinkManagerCtx) addListener(listener *func(sample types.Sam } } -func (manager *StreamSinkManagerCtx) removeListener(listener *func(sample types.Sample)) { +func (manager *StreamSinkManagerCtx) removeListener(listener types.SampleListener) { ptr := reflect.ValueOf(listener).Pointer() manager.listenersMu.Lock() @@ -198,7 +225,7 @@ func (manager *StreamSinkManagerCtx) removeListener(listener *func(sample types. manager.currentListeners.Set(float64(manager.ListenersCount())) } -func (manager *StreamSinkManagerCtx) AddListener(listener *func(sample types.Sample)) error { +func (manager *StreamSinkManagerCtx) AddListener(listener types.SampleListener) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -217,7 +244,7 @@ func (manager *StreamSinkManagerCtx) AddListener(listener *func(sample types.Sam return nil } -func (manager *StreamSinkManagerCtx) RemoveListener(listener *func(sample types.Sample)) error { +func (manager *StreamSinkManagerCtx) RemoveListener(listener types.SampleListener) error { manager.mu.Lock() defer manager.mu.Unlock() @@ -236,7 +263,7 @@ func (manager *StreamSinkManagerCtx) RemoveListener(listener *func(sample types. // moving listeners between streams ensures, that target pipeline is running // before listener is added, and stops source pipeline if there are 0 listeners -func (manager *StreamSinkManagerCtx) MoveListenerTo(listener *func(sample types.Sample), stream types.StreamSinkManager) error { +func (manager *StreamSinkManagerCtx) MoveListenerTo(listener types.SampleListener, stream types.StreamSinkManager) error { if listener == nil { return errors.New("listener cannot be nil") } @@ -330,20 +357,7 @@ func (manager *StreamSinkManagerCtx) CreatePipeline() error { return } - manager.listenersMu.Lock() - // if is not delta unit -> it can be decoded independently -> it is a keyframe - if manager.waitForKf && !sample.DeltaUnit && len(manager.listenersKf) > 0 { - // if current sample is a keyframe, move listeners from - // keyframe lobby to actual listeners map and clear lobby - for k, v := range manager.listenersKf { - manager.listeners[k] = v - } - manager.listenersKf = make(map[uintptr]*func(sample types.Sample)) - } - for _, emit := range manager.listeners { - (*emit)(sample) - } - manager.listenersMu.Unlock() + manager.onSample(sample) } }() @@ -353,6 +367,51 @@ func (manager *StreamSinkManagerCtx) CreatePipeline() error { return nil } +func (manager *StreamSinkManagerCtx) saveSampleBitrate(timestamp time.Time, delta float64) { + // get unix timestamp in seconds + sec := timestamp.Unix() + // last bucket is timestamp rounded to 3 seconds - 1 second + last := int((sec - 1) % 3) + // current bucket is timestamp rounded to 3 seconds + curr := int(sec % 3) + // next bucket is timestamp rounded to 3 seconds + 1 second + next := int((sec + 1) % 3) + + if manager.brBuckets[next] != 0 { + // atomic update bitrate + atomic.StoreUint64(&manager.bitrate, uint64(manager.brBuckets[last])) + // empty next bucket + manager.brBuckets[next] = 0 + } + + // add rate to current bucket + manager.brBuckets[curr] += delta +} + +func (manager *StreamSinkManagerCtx) onSample(sample types.Sample) { + manager.listenersMu.Lock() + defer manager.listenersMu.Unlock() + + // save to metrics + length := float64(sample.Length) + manager.totalBytes.Add(length) + manager.saveSampleBitrate(sample.Timestamp, length) + + // if is not delta unit -> it can be decoded independently -> it is a keyframe + if manager.waitForKf && !sample.DeltaUnit && len(manager.listenersKf) > 0 { + // if current sample is a keyframe, move listeners from + // keyframe lobby to actual listeners map and clear lobby + for k, v := range manager.listenersKf { + manager.listeners[k] = v + } + manager.listenersKf = make(map[uintptr]types.SampleListener) + } + + for _, l := range manager.listeners { + l.WriteSample(sample) + } +} + func (manager *StreamSinkManagerCtx) DestroyPipeline() { manager.pipelineMu.Lock() defer manager.pipelineMu.Unlock() @@ -366,4 +425,7 @@ func (manager *StreamSinkManagerCtx) DestroyPipeline() { manager.pipeline = nil manager.pipelinesActive.Set(0) + + manager.brBuckets = make(map[int]float64) + atomic.StoreUint64(&manager.bitrate, 0) } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 1dc0ef96..5b2005f1 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -321,8 +321,13 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, videoAuto = false } + videoRtcp := make(chan []rtcp.Packet, 1) + // video track - videoTrack, err := NewTrack(logger, videoCodec, connection, WithVideoAuto(videoAuto)) + videoTrack, err := NewTrack(logger, videoCodec, connection, + WithVideoAuto(videoAuto), + WithRtcpChan(videoRtcp), + ) if err != nil { return nil, err } @@ -570,7 +575,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, if err = video.RemoveReceiver(videoTrack); err != nil { logger.Err(err).Msg("failed to remove video receiver") } - audioTrack.RemoveStream() + audioTrack.Shutdown() + videoTrack.Shutdown() + close(videoRtcp) } manager.metrics.SetState(session, state) @@ -651,17 +658,24 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, }) }) - videoTrack.OnRTCP(func(packets []rtcp.Packet) { - for _, p := range packets { - if rtcpPacket, ok := p.(*rtcp.ReceiverReport); ok { - l := len(rtcpPacket.Reports) - if l > 0 { - // use only last report - manager.metrics.SetReceiverReport(session, rtcpPacket.Reports[l-1]) + go func() { + for { + packets, ok := <-videoRtcp + if !ok { + break + } + + for _, p := range packets { + if rtcpPacket, ok := p.(*rtcp.ReceiverReport); ok { + l := len(rtcpPacket.Reports) + if l > 0 { + // use only last report + manager.metrics.SetReceiverReport(session, rtcpPacket.Reports[l-1]) + } } } } - }) + }() go func() { ticker := time.NewTicker(5 * time.Second) diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index e00d1e5e..886de03f 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -16,9 +16,11 @@ import ( ) type Track struct { - logger zerolog.Logger - track *webrtc.TrackLocalStaticSample - listener func(sample types.Sample) + logger zerolog.Logger + track *webrtc.TrackLocalStaticSample + + rtcpCh chan []rtcp.Packet + sample chan types.Sample videoAuto bool videoAutoMu sync.RWMutex @@ -27,9 +29,6 @@ type Track struct { stream types.StreamSinkManager streamMu sync.Mutex - onRtcp func([]rtcp.Packet) - onRtcpMu sync.RWMutex - bitrateChange func(int) (bool, error) videoChange func(string) (bool, error) } @@ -42,6 +41,12 @@ func WithVideoAuto(auto bool) option { } } +func WithRtcpChan(rtcp chan []rtcp.Packet) option { + return func(t *Track) { + t.rtcpCh = rtcp + } +} + func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.PeerConnection, opts ...option) (*Track, error) { id := codec.Type.String() track, err := webrtc.NewTrackLocalStaticSample(codec.Capability, id, "stream") @@ -54,49 +59,66 @@ func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.Pe t := &Track{ logger: logger, track: track, + rtcpCh: make(chan []rtcp.Packet), + sample: make(chan types.Sample), } for _, opt := range opts { opt(t) } - t.listener = func(sample types.Sample) { - err := track.WriteSample(media.Sample{ - Data: sample.Data, - Duration: sample.Duration, - }) - if err != nil && !errors.Is(err, io.ErrClosedPipe) { - logger.Warn().Err(err).Msg("failed to write sample to track") - } - } - sender, err := connection.AddTrack(t.track) if err != nil { return nil, err } go t.rtcpReader(sender) + go t.sampleReader() return t, nil } +func (t *Track) Shutdown() { + t.RemoveStream() + close(t.sample) +} + func (t *Track) rtcpReader(sender *webrtc.RTPSender) { for { packets, _, err := sender.ReadRTCP() if err != nil { - if err == io.EOF || err == io.ErrClosedPipe { + if errors.Is(err, io.EOF) || errors.Is(err, io.ErrClosedPipe) { + t.logger.Debug().Msg("track rtcp reader closed") return } - t.logger.Err(err).Msg("RTCP read error") + t.logger.Warn().Err(err).Msg("failed to read track rtcp") continue } - t.onRtcpMu.RLock() - if t.onRtcp != nil { - go t.onRtcp(packets) + if t.rtcpCh != nil { + t.rtcpCh <- packets + } + } +} + +func (t *Track) sampleReader() { + for { + sample, ok := <-t.sample + if !ok { + t.logger.Debug().Msg("track sample reader closed") + return + } + + err := t.track.WriteSample(media.Sample{ + Data: sample.Data, + Duration: sample.Duration, + Timestamp: sample.Timestamp, + }) + + if err != nil && !errors.Is(err, io.ErrClosedPipe) { + t.logger.Warn().Err(err).Msg("failed to write sample to track") } - t.onRtcpMu.RUnlock() } } @@ -117,9 +139,9 @@ func (t *Track) SetStream(stream types.StreamSinkManager) (bool, error) { var err error if t.stream != nil { - err = t.stream.MoveListenerTo(&t.listener, stream) + err = t.stream.MoveListenerTo(t, stream) } else { - err = stream.AddListener(&t.listener) + err = stream.AddListener(t) } if err != nil { return false, err @@ -138,7 +160,7 @@ func (t *Track) RemoveStream() { return } - err := t.stream.RemoveListener(&t.listener) + err := t.stream.RemoveListener(t) if err != nil { t.logger.Warn().Err(err).Msg("failed to remove listener from stream") } @@ -157,9 +179,9 @@ func (t *Track) SetPaused(paused bool) { var err error if paused { - err = t.stream.RemoveListener(&t.listener) + err = t.stream.RemoveListener(t) } else { - err = t.stream.AddListener(&t.listener) + err = t.stream.AddListener(t) } if err != nil { t.logger.Warn().Err(err).Msg("failed to change listener state") @@ -169,11 +191,8 @@ func (t *Track) SetPaused(paused bool) { t.paused = paused } -func (t *Track) OnRTCP(f func([]rtcp.Packet)) { - t.onRtcpMu.Lock() - defer t.onRtcpMu.Unlock() - - t.onRtcp = f +func (t *Track) WriteSample(sample types.Sample) { + t.sample <- sample } func (t *Track) SetBitrate(bitrate int) (bool, error) { diff --git a/pkg/gst/gst.go b/pkg/gst/gst.go index 9d4fb874..45432b4f 100644 --- a/pkg/gst/gst.go +++ b/pkg/gst/gst.go @@ -200,8 +200,8 @@ func CheckPlugins(plugins []string) error { } //export goHandlePipelineBuffer -func goHandlePipelineBuffer(pipelineID C.int, buf unsafe.Pointer, bufLen C.int, duration C.guint64, deltaUnit C.gboolean) { - defer C.free(buf) +func goHandlePipelineBuffer(pipelineID C.int, buf C.gpointer, bufLen C.int, duration C.guint64, deltaUnit C.gboolean) { + defer C.g_free(buf) pipelinesLock.Lock() pipeline, ok := pipelines[int(pipelineID)] @@ -209,7 +209,9 @@ func goHandlePipelineBuffer(pipelineID C.int, buf unsafe.Pointer, bufLen C.int, if ok { pipeline.sample <- types.Sample{ - Data: C.GoBytes(buf, bufLen), + Data: C.GoBytes(unsafe.Pointer(buf), bufLen), + Length: int(bufLen), + Timestamp: time.Now(), Duration: time.Duration(duration), DeltaUnit: deltaUnit == C.TRUE, } diff --git a/pkg/types/capture.go b/pkg/types/capture.go index 72a83cfd..485161a4 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -17,11 +17,20 @@ var ( ) type Sample struct { - Data []byte + // buffer with encoded media + Data []byte + Length int + // timing information + Timestamp time.Time Duration time.Duration + // metadata DeltaUnit bool // this unit cannot be decoded independently. } +type SampleListener interface { + WriteSample(Sample) +} + type Receiver interface { SetStream(stream StreamSinkManager) (changed bool, err error) RemoveStream() @@ -60,9 +69,9 @@ type StreamSinkManager interface { Codec() codec.RTPCodec Bitrate() int - AddListener(listener *func(sample Sample)) error - RemoveListener(listener *func(sample Sample)) error - MoveListenerTo(listener *func(sample Sample), targetStream StreamSinkManager) error + AddListener(listener SampleListener) error + RemoveListener(listener SampleListener) error + MoveListenerTo(listener SampleListener, targetStream StreamSinkManager) error ListenersCount() int Started() bool From 0de8ffc773c709bf41055f6139524aef7246f944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 13 Mar 2023 17:55:41 +0100 Subject: [PATCH 798/876] update screen rate set. (#34) --- pkg/xorg/xorg.c | 27 ++------------------------- pkg/xorg/xorg.go | 30 ++++++++++++++++++++++-------- pkg/xorg/xorg.h | 2 +- 3 files changed, 25 insertions(+), 34 deletions(-) diff --git a/pkg/xorg/xorg.c b/pkg/xorg/xorg.c index 6ef6f8e9..d70e5aaa 100644 --- a/pkg/xorg/xorg.c +++ b/pkg/xorg/xorg.c @@ -229,7 +229,7 @@ void XKey(KeySym keysym, int down) { XSync(display, 0); } -Status XSetScreenConfiguration(int width, int height, short *rate) { +Status XSetScreenConfiguration(int width, int height, short rate) { Display *display = getXDisplay(); Window root = RootWindow(display, 0); XRRScreenConfiguration *conf = XRRGetScreenInfo(display, root); @@ -251,31 +251,8 @@ Status XSetScreenConfiguration(int width, int height, short *rate) { return RRSetConfigFailed; } - short current_rate = 0; - if (rate != NULL) { - short *rates; - int num_rates; - rates = XRRConfigRates(conf, size_index, &num_rates); - - // try to find the nearest rate - short nearest_rate = 0; - float diff = 0; - for (int i = 0; i < num_rates; i++) { - if (nearest_rate == 0 || abs(rates[i] - *rate) < diff) { - nearest_rate = rates[i]; - diff = abs(rates[i] - *rate); - } - } - - if (nearest_rate != 0 && diff < 10) { - current_rate = nearest_rate; - } - - *rate = current_rate; - } - Status status; - status = XRRSetScreenConfigAndRate(display, conf, root, size_index, RR_Rotate_0, current_rate, CurrentTime); + status = XRRSetScreenConfigAndRate(display, conf, root, size_index, RR_Rotate_0, rate, CurrentTime); XRRFreeScreenConfigInfo(conf); return status; diff --git a/pkg/xorg/xorg.go b/pkg/xorg/xorg.go index 703aa49d..2be47a66 100644 --- a/pkg/xorg/xorg.go +++ b/pkg/xorg/xorg.go @@ -192,23 +192,37 @@ func ChangeScreenSize(width int, height int, rate int16) (int, int, int16, error // round width to 8, because of Xorg width = width - (width % 8) + // if rate is 0, set it to 60 + if rate == 0 { + rate = 60 + } + // convert variables to C types c_width, c_height, c_rate := C.int(width), C.int(height), C.short(rate) // if screen configuration already exists, just set it - if status := C.XSetScreenConfiguration(c_width, c_height, &c_rate); status == C.RRSetConfigSuccess { - return width, height, int16(c_rate), nil + status := C.XSetScreenConfiguration(c_width, c_height, c_rate) + if status != C.RRSetConfigSuccess { + // create new screen configuration + C.XCreateScreenMode(c_width, c_height, c_rate) + + // screen configuration should exist now, set it + status = C.XSetScreenConfiguration(c_width, c_height, c_rate) } - // create new screen configuration - C.XCreateScreenMode(c_width, c_height, c_rate) + var err error - // screen configuration should exist now, set it - if status := C.XSetScreenConfiguration(c_width, c_height, &c_rate); status == C.RRSetConfigSuccess { - return width, height, int16(c_rate), nil + // if screen configuration was not set successfully, return error + if status != C.RRSetConfigSuccess { + err = fmt.Errorf("unknown screen configuration %dx%d@%d", width, height, rate) } - return 0, 0, 0, fmt.Errorf("unknown screen configuration %dx%d@%d", width, height, rate) + // if specified rate is not supported a BadValue error is returned + if status == C.BadValue { + err = fmt.Errorf("unsupported screen rate %d", rate) + } + + return width, height, rate, err } func GetScreenSize() types.ScreenSize { diff --git a/pkg/xorg/xorg.h b/pkg/xorg/xorg.h index a6e750d7..4bca692c 100644 --- a/pkg/xorg/xorg.h +++ b/pkg/xorg/xorg.h @@ -36,7 +36,7 @@ static KeyCode XKeyEntryGet(KeySym keysym); static KeyCode XkbKeysymToKeycode(Display *dpy, KeySym keysym); void XKey(KeySym keysym, int down); -Status XSetScreenConfiguration(int width, int height, short *rate); +Status XSetScreenConfiguration(int width, int height, short rate); void XGetScreenConfiguration(int *width, int *height, short *rate); void XGetScreenConfigurations(); void XCreateScreenMode(int width, int height, short rate); From 9936a04feadc2074dbf0627ac2572be133054bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 13 Mar 2023 17:55:52 +0100 Subject: [PATCH 799/876] add passive estimator & REMB back. (#35) --- internal/config/webrtc.go | 7 +++++++ internal/webrtc/manager.go | 23 +++++++++++++++-------- internal/webrtc/metrics.go | 20 ++++++++++++++++++-- pkg/types/codec/codecs.go | 2 +- 4 files changed, 41 insertions(+), 11 deletions(-) diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 8fe40f40..2af7fa35 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -28,6 +28,7 @@ type WebRTC struct { IpRetrievalUrl string EstimatorEnabled bool + EstimatorPassive bool EstimatorInitialBitrate int } @@ -79,6 +80,11 @@ func (WebRTC) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("webrtc.estimator.passive", false, "passive estimator mode, when it does not switch pipelines, only estimates") + if err := viper.BindPFlag("webrtc.estimator.passive", cmd.PersistentFlags().Lookup("webrtc.estimator.passive")); err != nil { + return err + } + cmd.PersistentFlags().Int("webrtc.estimator.initial_bitrate", 1_000_000, "initial bitrate for the bandwidth estimator") if err := viper.BindPFlag("webrtc.estimator.initial_bitrate", cmd.PersistentFlags().Lookup("webrtc.estimator.initial_bitrate")); err != nil { return err @@ -154,5 +160,6 @@ func (s *WebRTC) Set() { // bandwidth estimator s.EstimatorEnabled = viper.GetBool("webrtc.estimator.enabled") + s.EstimatorPassive = viper.GetBool("webrtc.estimator.passive") s.EstimatorInitialBitrate = viper.GetInt("webrtc.estimator.initial_bitrate") } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 5b2005f1..1b483e31 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -316,8 +316,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, return nil, err } - // if estimator is disabled, disable video auto - if !manager.config.EstimatorEnabled { + // if estimator is disabled, or in passive mode, disable video auto bitrate + if !manager.config.EstimatorEnabled || manager.config.EstimatorPassive { videoAuto = false } @@ -338,7 +338,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, changeVideoFromBitrate := func(peerBitrate int) { // when switching from manual to auto bitrate estimation, in case the estimator is // idle (lastBitrate > maxBitrate), we want to go back to the previous estimated bitrate - if peerBitrate == 0 && estimator != nil { + if peerBitrate == 0 && estimator != nil && !manager.config.EstimatorPassive { peerBitrate = estimator.GetTargetBitrate() manager.logger.Debug(). Int("peer_bitrate", peerBitrate). @@ -423,7 +423,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, for range ticker.C { targetBitrate := estimator.GetTargetBitrate() - manager.metrics.SetReceiverEstimatedMaximumBitrate(session, float64(targetBitrate)) + manager.metrics.SetReceiverEstimatedTargetBitrate(session, float64(targetBitrate)) if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { break @@ -431,7 +431,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, if !videoTrack.VideoAuto() { continue } - changeVideoFromBitrate(targetBitrate) + if !manager.config.EstimatorPassive { + changeVideoFromBitrate(targetBitrate) + } } }() } @@ -457,10 +459,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, }, iceTrickle: manager.config.ICETrickle, setVideoAuto: func(videoAuto bool) { - if manager.config.EstimatorEnabled { + // if estimator is enabled and not in passive mode, enable video auto bitrate + if manager.config.EstimatorEnabled && !manager.config.EstimatorPassive { videoTrack.SetVideoAuto(videoAuto) } else { - logger.Warn().Msg("estimator is disabled, cannot change video auto") + logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") videoTrack.SetVideoAuto(false) // ensure video auto is disabled } }, @@ -666,7 +669,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, } for _, p := range packets { - if rtcpPacket, ok := p.(*rtcp.ReceiverReport); ok { + switch rtcpPacket := p.(type) { + case *rtcp.ReceiverEstimatedMaximumBitrate: // TODO: Deprecated. + manager.metrics.SetReceiverEstimatedMaximumBitrate(session, rtcpPacket.Bitrate) + + case *rtcp.ReceiverReport: l := len(rtcpPacket.Reports) if l > 0 { // use only last report diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 2da28e32..923b791e 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -27,6 +27,7 @@ type metrics struct { videoIdsMu *sync.Mutex receiverEstimatedMaximumBitrate prometheus.Gauge + receiverEstimatedTargetBitrate prometheus.Gauge receiverReportDelay prometheus.Gauge receiverReportJitter prometheus.Gauge @@ -144,6 +145,15 @@ func (m *metricsCtx) getBySession(session types.Session) metrics { "session_id": session.ID(), }, }), + receiverEstimatedTargetBitrate: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "receiver_estimated_target_bitrate", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Receiver Estimated Target Bitrate using Google's congestion control.", + ConstLabels: map[string]string{ + "session_id": session.ID(), + }, + }), receiverReportDelay: promauto.NewGauge(prometheus.GaugeOpts{ Name: "receiver_report_delay", @@ -327,10 +337,16 @@ func (m *metricsCtx) SetVideoID(session types.Session, videoId string) { } } -func (m *metricsCtx) SetReceiverEstimatedMaximumBitrate(session types.Session, bitrate float64) { +func (m *metricsCtx) SetReceiverEstimatedMaximumBitrate(session types.Session, bitrate float32) { met := m.getBySession(session) - met.receiverEstimatedMaximumBitrate.Set(bitrate) + met.receiverEstimatedMaximumBitrate.Set(float64(bitrate)) +} + +func (m *metricsCtx) SetReceiverEstimatedTargetBitrate(session types.Session, bitrate float64) { + met := m.getBySession(session) + + met.receiverEstimatedTargetBitrate.Set(bitrate) } func (m *metricsCtx) SetReceiverReport(session types.Session, report rtcp.ReceptionReport) { diff --git a/pkg/types/codec/codecs.go b/pkg/types/codec/codecs.go index c71057ba..07f51818 100644 --- a/pkg/types/codec/codecs.go +++ b/pkg/types/codec/codecs.go @@ -8,7 +8,7 @@ import ( var RTCPFeedback = []webrtc.RTCPFeedback{ {Type: webrtc.TypeRTCPFBTransportCC, Parameter: ""}, - {Type: webrtc.TypeRTCPFBGoogREMB, Parameter: ""}, + {Type: webrtc.TypeRTCPFBGoogREMB, Parameter: ""}, // TODO: Deprecated. // https://www.iana.org/assignments/sdp-parameters/sdp-parameters.xhtml#sdp-parameters-19 {Type: webrtc.TypeRTCPFBCCM, Parameter: "fir"}, From 362bcd3852710680250be7c2d211e781f29c95f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Mar 2023 12:12:38 +0100 Subject: [PATCH 800/876] nvidia switch to virtualgl 3.1. --- Dockerfile.nvidia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index 21feed08..22daae35 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -166,7 +166,7 @@ RUN if [ "${UBUNTU_RELEASE}" = "18.04" ]; then apt-get update && apt-get install }\n\ }" > /etc/vulkan/icd.d/nvidia_icd.json -ARG VIRTUALGL_VERSION=3.0.2 +ARG VIRTUALGL_VERSION=3.1 # # Install VirtualGL and make libraries available for preload RUN curl -fsSL -O "https://sourceforge.net/projects/virtualgl/files/virtualgl_${VIRTUALGL_VERSION}_amd64.deb" && \ From fa69ddd9847a7bb2ec2c41fbe71199f4d82d1e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 17 Mar 2023 20:20:23 +0100 Subject: [PATCH 801/876] streamsink total bytes metric counter. --- internal/capture/streamsink.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index adda86c2..8df41a54 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -81,7 +81,7 @@ func streamSinkNew(c codec.RTPCodec, pipelineFn func() (string, error), id strin "codec_type": c.Type.String(), }, }), - totalBytes: promauto.NewGauge(prometheus.GaugeOpts{ + totalBytes: promauto.NewCounter(prometheus.CounterOpts{ Name: "streamsink_bytes", Namespace: "neko", Subsystem: "capture", From 09508638ce1bb8941eaff64b14fbd35bb8e700e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 27 Mar 2023 18:33:51 +0200 Subject: [PATCH 802/876] session save & load from a file. (#38) --- dev/start | 1 + internal/config/session.go | 9 ++++ internal/session/manager.go | 9 ++++ internal/session/serialize.go | 97 +++++++++++++++++++++++++++++++++++ pkg/types/session.go | 6 +++ 5 files changed, 122 insertions(+) create mode 100644 internal/session/serialize.go diff --git a/dev/start b/dev/start index ad57f8a2..9aaf5c60 100755 --- a/dev/start +++ b/dev/start @@ -40,6 +40,7 @@ docker run --rm -it \ -e "NEKO_WEBRTC_UDPMUX=${NEKO_MUX}" \ -e "NEKO_WEBRTC_TCPMUX=${NEKO_MUX}" \ -e "NEKO_WEBRTC_NAT1TO1=${NEKO_NAT1TO1}" \ + -e "NEKO_SESSION_FILE=/home/neko/sessions.txt" \ -v "${PWD}/runtime/config.yml:/etc/neko/neko.yml" \ -e "NEKO_DEBUG=1" \ neko_server_app:latest; diff --git a/internal/config/session.go b/internal/config/session.go index 990ca129..04d9d8ce 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -8,6 +8,8 @@ import ( ) type Session struct { + File string + ImplicitHosting bool InactiveCursors bool MercifulReconnect bool @@ -20,6 +22,11 @@ type Session struct { } func (Session) Init(cmd *cobra.Command) error { + cmd.PersistentFlags().String("session.file", "", "if sessions should be stored in a file, otherwise they will be stored only in memory") + if err := viper.BindPFlag("session.file", cmd.PersistentFlags().Lookup("session.file")); err != nil { + return err + } + cmd.PersistentFlags().Bool("session.implicit_hosting", true, "allow implicit control switching") if err := viper.BindPFlag("session.implicit_hosting", cmd.PersistentFlags().Lookup("session.implicit_hosting")); err != nil { return err @@ -65,6 +72,8 @@ func (Session) Init(cmd *cobra.Command) error { } func (s *Session) Set() { + s.File = viper.GetString("session.file") + s.ImplicitHosting = viper.GetBool("session.implicit_hosting") s.InactiveCursors = viper.GetBool("session.inactive_cursors") s.MercifulReconnect = viper.GetBool("session.merciful_reconnect") diff --git a/internal/session/manager.go b/internal/session/manager.go index 6498d18d..2d1ff7ba 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -49,6 +49,9 @@ func New(config *config.Session) *SessionManagerCtx { } } + // try to load sessions from file + manager.load() + return manager } @@ -102,6 +105,8 @@ func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) manager.sessionsMu.Unlock() manager.emmiter.Emit("created", session) + manager.save() + return session, token, nil } @@ -118,6 +123,8 @@ func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) manager.sessionsMu.Unlock() manager.emmiter.Emit("profile_changed", session) + manager.save() + session.profileChanged() return nil } @@ -143,6 +150,8 @@ func (manager *SessionManagerCtx) Delete(id string) error { } manager.emmiter.Emit("deleted", session) + manager.save() + return nil } diff --git a/internal/session/serialize.go b/internal/session/serialize.go new file mode 100644 index 00000000..2d550b5c --- /dev/null +++ b/internal/session/serialize.go @@ -0,0 +1,97 @@ +package session + +import ( + "encoding/json" + "errors" + "os" + + "github.com/demodesk/neko/pkg/types" +) + +func (manager *SessionManagerCtx) save() { + if manager.config.File == "" { + return + } + + // serialize sessions + sessions := make([]types.SessionProfile, 0, len(manager.sessions)) + for _, session := range manager.sessions { + sessions = append(sessions, types.SessionProfile{ + Id: session.id, + Token: session.token, + Profile: session.profile, + }) + } + + // convert to json + data, err := json.Marshal(sessions) + if err != nil { + manager.logger.Error().Err(err).Msg("failed to marshal sessions") + return + } + + // write to file + err = os.WriteFile(manager.config.File, data, 0644) + if err != nil { + manager.logger.Error().Err(err). + Str("file", manager.config.File). + Msg("failed to write sessions to a file") + } +} + +func (manager *SessionManagerCtx) load() { + if manager.config.File == "" { + return + } + + // read file + data, err := os.ReadFile(manager.config.File) + if err != nil { + // if file does not exist + if errors.Is(err, os.ErrNotExist) { + manager.logger.Info(). + Str("file", manager.config.File). + Msg("sessions file does not exist") + return + } + manager.logger.Error().Err(err). + Str("file", manager.config.File). + Msg("failed to read sessions from a file") + return + } + + // if file is empty + if len(data) == 0 { + manager.logger.Info(). + Str("file", manager.config.File). + Msg("sessions file is empty") + return + } + + // deserialize sessions + sessions := make([]types.SessionProfile, 0) + err = json.Unmarshal(data, &sessions) + if err != nil { + manager.logger.Error().Err(err).Msg("failed to unmarshal sessions") + return + } + + // create sessions + manager.sessionsMu.Lock() + for _, session := range sessions { + manager.tokens[session.Token] = session.Id + manager.sessions[session.Id] = &SessionCtx{ + id: session.Id, + token: session.Token, + manager: manager, + logger: manager.logger.With().Str("session_id", session.Id).Logger(), + profile: session.Profile, + } + } + manager.sessionsMu.Unlock() + + manager.logger.Info(). + Int("sessions", len(sessions)). + Str("file", manager.config.File). + Msg("loaded sessions from a file") +} diff --git a/pkg/types/session.go b/pkg/types/session.go index 97b8183c..4527d687 100644 --- a/pkg/types/session.go +++ b/pkg/types/session.go @@ -17,6 +17,12 @@ type Cursor struct { Y int `json:"y"` } +type SessionProfile struct { + Id string + Token string + Profile MemberProfile +} + type SessionState struct { IsConnected bool `json:"is_connected"` IsWatching bool `json:"is_watching"` From f8edd988b34e438613d6e0e28ff87b70587a59c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 27 Mar 2023 18:34:05 +0200 Subject: [PATCH 803/876] configure pulseaudio from env. (#39) --- Dockerfile | 5 +---- Dockerfile.nvidia | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a723f00..f1ea73a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -103,10 +103,6 @@ RUN set -eux; \ adduser $USERNAME video; \ adduser $USERNAME pulse; \ # - # setup pulseaudio - mkdir -p /home/$USERNAME/.config/pulse/; \ - echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \ - # # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 mkdir /tmp/.X11-unix; \ chmod 1777 /tmp/.X11-unix; \ @@ -154,6 +150,7 @@ COPY runtime/fonts /usr/local/share/fonts # set default envs ENV USER=$USERNAME ENV DISPLAY=:99.0 +ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket ENV NEKO_SERVER_BIND=:8080 ENV NEKO_PLUGINS_ENABLED=true ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/ diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index 22daae35..df8396c2 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -119,10 +119,6 @@ RUN set -eux; \ adduser $USERNAME video; \ adduser $USERNAME pulse; \ # - # setup pulseaudio - mkdir -p /home/$USERNAME/.config/pulse/; \ - echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \ - # # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 mkdir /tmp/.X11-unix; \ chmod 1777 /tmp/.X11-unix; \ @@ -199,6 +195,7 @@ COPY runtime/fonts /usr/local/share/fonts # set default envs ENV USER=$USERNAME ENV DISPLAY=:99.0 +ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket ENV NEKO_SERVER_BIND=:8080 ENV NEKO_PLUGINS_ENABLED=true ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/ From 08a5d5abb49fd5e94df6a27d47e52925e8e9bfec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 27 Mar 2023 18:34:24 +0200 Subject: [PATCH 804/876] Split ICE Servers to frontend and backend (#37) * split iceservers to frontend and backend. * no backend ice servers when ice lite enabled. * update config. --- dev/runtime/config.yml | 10 ++++-- internal/config/webrtc.go | 68 +++++++++++++++++++++++++++++--------- internal/webrtc/manager.go | 7 ++-- 3 files changed, 64 insertions(+), 21 deletions(-) diff --git a/dev/runtime/config.yml b/dev/runtime/config.yml index ec2ca1c7..c08f1621 100644 --- a/dev/runtime/config.yml +++ b/dev/runtime/config.yml @@ -120,6 +120,10 @@ session: webrtc: icelite: true iceservers: - - urls: [ stun:stun.l.google.com:19302 ] - # username: foo - # credential: bar + # Backend servers are ignored if icelite is true. + backend: + - urls: [ stun:stun.l.google.com:19302 ] + frontend: + - urls: [ stun:stun.l.google.com:19305 ] + #username: foo + #credential: bar diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 2af7fa35..54a40b5b 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -16,13 +16,14 @@ import ( const defStunSrv = "stun:stun.l.google.com:19302" type WebRTC struct { - ICELite bool - ICETrickle bool - ICEServers []types.ICEServer - EphemeralMin uint16 - EphemeralMax uint16 - TCPMux int - UDPMux int + ICELite bool + ICETrickle bool + ICEServersFrontend []types.ICEServer + ICEServersBackend []types.ICEServer + EphemeralMin uint16 + EphemeralMax uint16 + TCPMux int + UDPMux int NAT1To1IPs []string IpRetrievalUrl string @@ -43,11 +44,21 @@ func (WebRTC) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().String("webrtc.iceservers", "[]", "STUN and TURN servers in JSON format with `urls`, `username`, `password` keys") + cmd.PersistentFlags().String("webrtc.iceservers", "[]", "Global STUN and TURN servers in JSON format with `urls`, `username` and `credential` keys") if err := viper.BindPFlag("webrtc.iceservers", cmd.PersistentFlags().Lookup("webrtc.iceservers")); err != nil { return err } + cmd.PersistentFlags().String("webrtc.iceservers.frontend", "[]", "Frontend only STUN and TURN servers in JSON format with `urls`, `username` and `credential` keys") + if err := viper.BindPFlag("webrtc.iceservers.frontend", cmd.PersistentFlags().Lookup("webrtc.iceservers.frontend")); err != nil { + return err + } + + cmd.PersistentFlags().String("webrtc.iceservers.backend", "[]", "Backend only STUN and TURN servers in JSON format with `urls`, `username` and `credential` keys") + if err := viper.BindPFlag("webrtc.iceservers.backend", cmd.PersistentFlags().Lookup("webrtc.iceservers.backend")); err != nil { + return err + } + cmd.PersistentFlags().String("webrtc.epr", "", "limits the pool of ephemeral ports that ICE UDP connections can allocate from") if err := viper.BindPFlag("webrtc.epr", cmd.PersistentFlags().Lookup("webrtc.epr")); err != nil { return err @@ -97,16 +108,43 @@ func (s *WebRTC) Set() { s.ICELite = viper.GetBool("webrtc.icelite") s.ICETrickle = viper.GetBool("webrtc.icetrickle") - if err := viper.UnmarshalKey("webrtc.iceservers", &s.ICEServers, viper.DecodeHook( - utils.JsonStringAutoDecode(s.ICEServers), + // parse frontend ice servers + if err := viper.UnmarshalKey("webrtc.iceservers.frontend", &s.ICEServersFrontend, viper.DecodeHook( + utils.JsonStringAutoDecode([]types.ICEServer{}), )); err != nil { - log.Warn().Err(err).Msgf("unable to parse ICE servers") + log.Warn().Err(err).Msgf("unable to parse frontend ICE servers") } - if len(s.ICEServers) == 0 { - s.ICEServers = append(s.ICEServers, types.ICEServer{ - URLs: []string{defStunSrv}, - }) + // parse backend ice servers + if err := viper.UnmarshalKey("webrtc.iceservers.backend", &s.ICEServersBackend, viper.DecodeHook( + utils.JsonStringAutoDecode([]types.ICEServer{}), + )); err != nil { + log.Warn().Err(err).Msgf("unable to parse backend ICE servers") + } + + if s.ICELite && len(s.ICEServersBackend) > 0 { + log.Warn().Msgf("ICE Lite is enabled, but backend ICE servers are configured. Backend ICE servers will be ignored.") + } + + // if no frontend or backend ice servers are configured + if len(s.ICEServersFrontend) == 0 && len(s.ICEServersBackend) == 0 { + // parse global ice servers + var iceServers []types.ICEServer + if err := viper.UnmarshalKey("webrtc.iceservers", &iceServers, viper.DecodeHook( + utils.JsonStringAutoDecode([]types.ICEServer{}), + )); err != nil { + log.Warn().Err(err).Msgf("unable to parse global ICE servers") + } + + // add default stun server if none are configured + if len(iceServers) == 0 { + iceServers = append(iceServers, types.ICEServer{ + URLs: []string{defStunSrv}, + }) + } + + s.ICEServersFrontend = append(s.ICEServersFrontend, iceServers...) + s.ICEServersBackend = append(s.ICEServersBackend, iceServers...) } s.TCPMux = viper.GetInt("webrtc.tcpmux") diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 1b483e31..d0782de4 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -47,7 +47,7 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con if !config.ICELite { ICEServers := []webrtc.ICEServer{} - for _, server := range config.ICEServers { + for _, server := range config.ICEServersBackend { var credential any if server.Credential != "" { credential = server.Credential @@ -137,7 +137,8 @@ func (manager *WebRTCManagerCtx) Start() { manager.logger.Info(). Bool("icelite", manager.config.ICELite). Bool("icetrickle", manager.config.ICETrickle). - Interface("iceservers", manager.config.ICEServers). + Interface("iceservers-frontend", manager.config.ICEServersFrontend). + Interface("iceservers-backend", manager.config.ICEServersBackend). Str("nat1to1", strings.Join(manager.config.NAT1To1IPs, ",")). Str("epr", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)). Int("tcpmux", manager.config.TCPMux). @@ -155,7 +156,7 @@ func (manager *WebRTCManagerCtx) Shutdown() error { } func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { - return manager.config.ICEServers + return manager.config.ICEServersFrontend } func (manager *WebRTCManagerCtx) newPeerConnection(bitrate int, codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, cc.BandwidthEstimator, error) { From 2ff47ac920a15f367b91bc8deb254b1ab9575fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 27 Mar 2023 19:28:28 +0200 Subject: [PATCH 805/876] fix: ensure webrtc close is executed only once. --- internal/webrtc/manager.go | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index d0782de4..29fc8654 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -4,6 +4,7 @@ import ( "fmt" "net" "strings" + "sync" "sync/atomic" "time" @@ -567,6 +568,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, logger.Info().Interface("data_channel", dc).Msg("got remote data channel") }) + var once sync.Once connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateConnected: @@ -575,13 +577,16 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, webrtc.PeerConnectionStateFailed: connection.Close() case webrtc.PeerConnectionStateClosed: - session.SetWebRTCConnected(peer, false) - if err = video.RemoveReceiver(videoTrack); err != nil { - logger.Err(err).Msg("failed to remove video receiver") - } - audioTrack.Shutdown() - videoTrack.Shutdown() - close(videoRtcp) + // ensure we only run this once + once.Do(func() { + session.SetWebRTCConnected(peer, false) + if err = video.RemoveReceiver(videoTrack); err != nil { + logger.Err(err).Msg("failed to remove video receiver") + } + audioTrack.Shutdown() + videoTrack.Shutdown() + close(videoRtcp) + }) } manager.metrics.SetState(session, state) From 43a649d2c40ce7a79eb593c0013bf5c38d21bc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 31 Mar 2023 12:02:19 +0200 Subject: [PATCH 806/876] websockets set max payload log size. (#42) --- internal/websocket/manager.go | 10 +++++++++- internal/websocket/peer.go | 18 +++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 083efd4b..282d14c1 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -23,6 +23,9 @@ const pingPeriod = 10 * time.Second // period for sending inactive cursor messages const inactiveCursorsPeriod = 750 * time.Millisecond +// maximum payload length for logging +const maxPayloadLogLength = 10_000 + // events that are not logged in debug mode var nologEvents = []string{ // don't log twice @@ -313,10 +316,15 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer type // log events if not ignored if ok, _ := utils.ArrayIn(data.Event, nologEvents); !ok { + payload := data.Payload + if len(payload) > maxPayloadLogLength { + payload = []byte("") + } + logger.Debug(). Str("address", connection.RemoteAddr().String()). Str("event", data.Event). - Str("payload", string(data.Payload)). + Str("payload", string(payload)). Msg("received message from client") } diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 52dacf06..e3d29e08 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -12,6 +12,7 @@ import ( "github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/types/event" "github.com/demodesk/neko/pkg/types/message" + "github.com/demodesk/neko/pkg/utils" ) type WebSocketPeerCtx struct { @@ -60,11 +61,18 @@ func (peer *WebSocketPeerCtx) Send(event string, payload any) { return } - peer.logger.Debug(). - Str("address", peer.connection.RemoteAddr().String()). - Str("event", event). - Str("payload", string(raw)). - Msg("sending message to client") + // log events if not ignored + if ok, _ := utils.ArrayIn(event, nologEvents); !ok { + if len(raw) > maxPayloadLogLength { + raw = []byte("") + } + + peer.logger.Debug(). + Str("address", peer.connection.RemoteAddr().String()). + Str("event", event). + Str("payload", string(raw)). + Msg("sending message to client") + } } func (peer *WebSocketPeerCtx) Ping() error { From 1a752e43d246fc66edb4714385023f7860832e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 31 Mar 2023 12:02:33 +0200 Subject: [PATCH 807/876] Add plugins required flag (#40) * add required plugins flag. * update plugins logs. * add plugins subcommand. * move preflight to prerun. --- cmd/plugins.go | 49 +++++++++++++ cmd/serve.go | 15 ++-- internal/config/plugins.go | 11 ++- internal/plugins/dependency.go | 129 +++++++++++++++++---------------- internal/plugins/manager.go | 71 +++++++++++++++--- pkg/types/plugins.go | 7 ++ 6 files changed, 197 insertions(+), 85 deletions(-) create mode 100644 cmd/plugins.go diff --git a/cmd/plugins.go b/cmd/plugins.go new file mode 100644 index 00000000..ffee9775 --- /dev/null +++ b/cmd/plugins.go @@ -0,0 +1,49 @@ +package cmd + +import ( + "encoding/json" + "os" + + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/internal/plugins" + "github.com/rs/zerolog/log" + "github.com/spf13/cobra" +) + +func init() { + command := &cobra.Command{ + Use: "plugins [directory]", + Short: "load, verify and list plugins", + Long: `load, verify and list plugins`, + Run: pluginsCmd, + Args: cobra.MaximumNArgs(1), + } + root.AddCommand(command) +} + +func pluginsCmd(cmd *cobra.Command, args []string) { + pluginDir := "/etc/neko/plugins" + if len(args) > 0 { + pluginDir = args[0] + } + log.Info().Str("dir", pluginDir).Msg("plugins directory") + + plugs := plugins.New(&config.Plugins{ + Enabled: true, + Required: true, + Dir: pluginDir, + }) + + meta := plugs.Metadata() + if len(meta) == 0 { + log.Fatal().Msg("no plugins found") + } + + // marshal indent to stdout + dec := json.NewEncoder(os.Stdout) + dec.SetIndent("", " ") + err := dec.Encode(meta) + if err != nil { + log.Fatal().Err(err).Msg("unable to marshal metadata") + } +} diff --git a/cmd/serve.go b/cmd/serve.go index 63e1579f..d709a523 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -24,14 +24,13 @@ func init() { service := serve{} command := &cobra.Command{ - Use: "serve", - Short: "serve neko streaming server", - Long: `serve neko streaming server`, - Run: service.Command, + Use: "serve", + Short: "serve neko streaming server", + Long: `serve neko streaming server`, + PreRun: service.PreRun, + Run: service.Run, } - cobra.OnInitialize(service.Preflight) - if err := service.Init(command); err != nil { log.Panic().Err(err).Msg("unable to initialize configuration") } @@ -91,7 +90,7 @@ func (c *serve) Init(cmd *cobra.Command) error { return nil } -func (c *serve) Preflight() { +func (c *serve) PreRun(cmd *cobra.Command, args []string) { c.logger = log.With().Str("service", "neko").Logger() c.configs.Desktop.Set() @@ -198,7 +197,7 @@ func (c *serve) Shutdown() { c.logger.Err(err).Msg("member manager disconnect") } -func (c *serve) Command(cmd *cobra.Command, args []string) { +func (c *serve) Run(cmd *cobra.Command, args []string) { c.logger.Info().Msg("starting neko server") c.Start(cmd) c.logger.Info().Msg("neko ready") diff --git a/internal/config/plugins.go b/internal/config/plugins.go index 3ca005be..2c3544c1 100644 --- a/internal/config/plugins.go +++ b/internal/config/plugins.go @@ -6,8 +6,9 @@ import ( ) type Plugins struct { - Enabled bool - Dir string + Enabled bool + Dir string + Required bool } func (Plugins) Init(cmd *cobra.Command) error { @@ -21,10 +22,16 @@ func (Plugins) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("plugins.required", false, "if true, neko will exit if there is an error when loading a plugin") + if err := viper.BindPFlag("plugins.required", cmd.PersistentFlags().Lookup("plugins.required")); err != nil { + return err + } + return nil } func (s *Plugins) Set() { s.Enabled = viper.GetBool("plugins.enabled") s.Dir = viper.GetString("plugins.dir") + s.Required = viper.GetBool("plugins.required") } diff --git a/internal/plugins/dependency.go b/internal/plugins/dependency.go index b9f19388..d31b2919 100644 --- a/internal/plugins/dependency.go +++ b/internal/plugins/dependency.go @@ -15,88 +15,113 @@ type dependency struct { logger zerolog.Logger } +func (a *dependency) findPlugin(name string) (*dependency, bool) { + if a == nil { + return nil, false + } + + if a.plugin.Name() == name { + return a, true + } + + for _, dep := range a.dependsOn { + plug, ok := dep.findPlugin(name) + if ok { + return plug, true + } + } + + return nil, false +} + +func (a *dependency) startPlugin(pm types.PluginManagers) error { + if a.invoked { + return nil + } + + a.invoked = true + + for _, do := range a.dependsOn { + if err := do.startPlugin(pm); err != nil { + return fmt.Errorf("plugin's '%s' dependency: %w", a.plugin.Name(), err) + } + } + + err := a.plugin.Start(pm) + if err != nil { + return fmt.Errorf("plugin '%s' failed to start: %w", a.plugin.Name(), err) + } + + a.logger.Info().Str("plugin", a.plugin.Name()).Msg("plugin started") + return nil +} + type dependiencies struct { deps map[string]*dependency logger zerolog.Logger } func (d *dependiencies) addPlugin(plugin types.Plugin) error { - plug, ok := d.deps[plugin.Name()] + pluginName := plugin.Name() + + plug, ok := d.deps[pluginName] if !ok { plug = &dependency{} } else if plug.plugin != nil { - return fmt.Errorf("plugin '%s' already added", plugin.Name()) + return fmt.Errorf("plugin '%s' already added", pluginName) } plug.plugin = plugin plug.logger = d.logger - d.deps[plugin.Name()] = plug + d.deps[pluginName] = plug dplug, ok := plugin.(types.DependablePlugin) if !ok { return nil } - for _, dep := range dplug.DependsOn() { - var dependsOn *dependency - dependsOn, ok = d.deps[dep] + for _, depName := range dplug.DependsOn() { + dependsOn, ok := d.deps[depName] if !ok { dependsOn = &dependency{} } else if dependsOn.plugin != nil { // if there is a cyclical dependency, break it and return error - if tdep := dependsOn.findPlugin(plugin.Name()); tdep != nil { + if tdep, ok := dependsOn.findPlugin(pluginName); ok { dependsOn.dependsOn = nil - delete(d.deps, plugin.Name()) - return fmt.Errorf("cyclical dependency detected: '%s' <-> '%s'", plugin.Name(), tdep.plugin.Name()) + delete(d.deps, pluginName) + return fmt.Errorf("cyclical dependency detected: '%s' <-> '%s'", pluginName, tdep.plugin.Name()) } } plug.dependsOn = append(plug.dependsOn, dependsOn) - d.deps[dep] = dependsOn + d.deps[depName] = dependsOn } return nil } +func (d *dependiencies) findPlugin(name string) (*dependency, bool) { + for _, dep := range d.deps { + plug, ok := dep.findPlugin(name) + if ok { + return plug, true + } + } + return nil, false +} + func (d *dependiencies) start(pm types.PluginManagers) error { - for _, p := range d.deps { - if err := p.start(pm); err != nil { + for _, dep := range d.deps { + if err := dep.startPlugin(pm); err != nil { return err } } return nil } -func (d *dependiencies) findPlugin(name string) (*dependency, bool) { - for _, p := range d.deps { - if found := p.findPlugin(name); found != nil { - return found, true - } - } - return nil, false -} - -func (a *dependency) findPlugin(name string) *dependency { - if a == nil { - return nil - } - - if a.plugin.Name() == name { - return a - } - - for _, p := range a.dependsOn { - if found := p.findPlugin(name); found != nil { - return found - } - } - - return nil -} - func (d *dependiencies) forEach(f func(*dependency) error) error { - for _, dp := range d.deps { - if err := f(dp); err != nil { + for _, dep := range d.deps { + if err := f(dep); err != nil { return err } } @@ -106,25 +131,3 @@ func (d *dependiencies) forEach(f func(*dependency) error) error { func (d *dependiencies) len() int { return len(d.deps) } - -func (a *dependency) start(pm types.PluginManagers) error { - if a.invoked { - return nil - } - - a.invoked = true - - for _, do := range a.dependsOn { - if err := do.start(pm); err != nil { - return err - } - } - - err := a.plugin.Start(pm) - a.logger.Err(err).Str("plugin", a.plugin.Name()).Msg("plugin start") - if err != nil { - return fmt.Errorf("plugin %s failed to start: %s", a.plugin.Name(), err) - } - - return nil -} diff --git a/internal/plugins/manager.go b/internal/plugins/manager.go index 027d9314..79d8cc28 100644 --- a/internal/plugins/manager.go +++ b/internal/plugins/manager.go @@ -16,12 +16,14 @@ import ( type ManagerCtx struct { logger zerolog.Logger + config *config.Plugins plugins dependiencies } func New(config *config.Plugins) *ManagerCtx { manager := &ManagerCtx{ logger: log.With().Str("module", "plugins").Logger(), + config: config, plugins: dependiencies{ deps: make(map[string]*dependency), }, @@ -31,7 +33,13 @@ func New(config *config.Plugins) *ManagerCtx { if config.Enabled { err := manager.loadDir(config.Dir) - manager.logger.Err(err).Msgf("loading finished, total %d plugins", manager.plugins.len()) + + // only log error if plugin is not required + if err != nil && config.Required { + manager.logger.Fatal().Err(err).Msg("error loading plugins") + } + + manager.logger.Info().Msgf("loading finished, total %d plugins", manager.plugins.len()) } return manager @@ -48,6 +56,13 @@ func (manager *ManagerCtx) loadDir(dir string) error { } err = manager.load(path) + + // return error if plugin is required + if err != nil && manager.config.Required { + return err + } + + // otherwise only log error if plugin is not required manager.logger.Err(err).Str("plugin", path).Msg("loading a plugin") return nil }) @@ -70,25 +85,24 @@ func (manager *ManagerCtx) load(path string) error { } if err = manager.plugins.addPlugin(p); err != nil { - return fmt.Errorf("failed to add plugin '%s': %w", p.Name(), err) + return fmt.Errorf("failed to add plugin: %w", err) } - manager.logger.Info().Msgf("loaded plugin '%s', total %d plugins", p.Name(), manager.plugins.len()) return nil } func (manager *ManagerCtx) InitConfigs(cmd *cobra.Command) { - _ = manager.plugins.forEach(func(plug *dependency) error { - if err := plug.plugin.Config().Init(cmd); err != nil { - log.Err(err).Str("plugin", plug.plugin.Name()).Msg("unable to initialize configuration") + _ = manager.plugins.forEach(func(d *dependency) error { + if err := d.plugin.Config().Init(cmd); err != nil { + log.Err(err).Str("plugin", d.plugin.Name()).Msg("unable to initialize configuration") } return nil }) } func (manager *ManagerCtx) SetConfigs() { - _ = manager.plugins.forEach(func(plug *dependency) error { - plug.plugin.Config().Set() + _ = manager.plugins.forEach(func(d *dependency) error { + d.plugin.Config().Set() return nil }) } @@ -98,18 +112,26 @@ func (manager *ManagerCtx) Start( webSocketManager types.WebSocketManager, apiManager types.ApiManager, ) { - _ = manager.plugins.start(types.PluginManagers{ + err := manager.plugins.start(types.PluginManagers{ SessionManager: sessionManager, WebSocketManager: webSocketManager, ApiManager: apiManager, LoadServiceFromPlugin: manager.LookupService, }) + + if err != nil { + if manager.config.Required { + manager.logger.Fatal().Err(err).Msg("failed to start plugins, exiting...") + } else { + manager.logger.Err(err).Msg("failed to start plugins, skipping...") + } + } } func (manager *ManagerCtx) Shutdown() error { - _ = manager.plugins.forEach(func(plug *dependency) error { - err := plug.plugin.Shutdown() - manager.logger.Err(err).Str("plugin", plug.plugin.Name()).Msg("plugin shutdown") + _ = manager.plugins.forEach(func(d *dependency) error { + err := d.plugin.Shutdown() + manager.logger.Err(err).Str("plugin", d.plugin.Name()).Msg("plugin shutdown") return nil }) return nil @@ -128,3 +150,28 @@ func (manager *ManagerCtx) LookupService(pluginName string) (any, error) { return expPlug.ExposeService(), nil } + +func (manager *ManagerCtx) Metadata() []types.PluginMetadata { + var plugins []types.PluginMetadata + + _ = manager.plugins.forEach(func(d *dependency) error { + dependsOn := make([]string, 0) + deps, isDependalbe := d.plugin.(types.DependablePlugin) + if isDependalbe { + dependsOn = deps.DependsOn() + } + + _, isExposable := d.plugin.(types.ExposablePlugin) + + plugins = append(plugins, types.PluginMetadata{ + Name: d.plugin.Name(), + IsDependable: isDependalbe, + IsExposable: isExposable, + DependsOn: dependsOn, + }) + + return nil + }) + + return plugins +} diff --git a/pkg/types/plugins.go b/pkg/types/plugins.go index 7176e382..fa57b8f1 100644 --- a/pkg/types/plugins.go +++ b/pkg/types/plugins.go @@ -28,6 +28,13 @@ type PluginConfig interface { Set() } +type PluginMetadata struct { + Name string + IsDependable bool + IsExposable bool + DependsOn []string `json:",omitempty"` +} + type PluginManagers struct { SessionManager SessionManager WebSocketManager WebSocketManager From bdebcd322175fddf4459ab635a7eb5c6cf3345ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 31 Mar 2023 19:07:38 +0200 Subject: [PATCH 808/876] pulseaudio log level error. --- runtime/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf index c144c253..6ba51b81 100644 --- a/runtime/supervisord.conf +++ b/runtime/supervisord.conf @@ -30,7 +30,7 @@ redirect_stderr=true [program:pulseaudio] environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/pulseaudio --log-level=info --disallow-module-loading --disallow-exit --exit-idle-time=-1 +command=/usr/bin/pulseaudio --log-level=error --disallow-module-loading --disallow-exit --exit-idle-time=-1 autorestart=true priority=300 user=%(ENV_USER)s From 3f117af3b9b17dca09c85a82683de8e608de3806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 31 Mar 2023 19:35:09 +0200 Subject: [PATCH 809/876] upgrade go dependencies. (#41) --- go.mod | 27 ++++++++++++--------------- go.sum | 55 ++++++++++++++++++++++++++----------------------------- 2 files changed, 38 insertions(+), 44 deletions(-) diff --git a/go.mod b/go.mod index bc26cd70..caef2766 100644 --- a/go.mod +++ b/go.mod @@ -8,11 +8,11 @@ require ( github.com/go-chi/cors v1.2.1 github.com/gorilla/websocket v1.5.0 github.com/kataras/go-events v0.0.3 - github.com/pion/ice/v2 v2.3.1 + github.com/pion/ice/v2 v2.3.2 github.com/pion/interceptor v0.1.12 github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.10 - github.com/pion/webrtc/v3 v3.1.56 + github.com/pion/webrtc/v3 v3.1.59 github.com/prometheus/client_golang v1.14.0 github.com/rs/zerolog v1.29.0 github.com/spf13/cobra v1.6.1 @@ -25,19 +25,16 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.0.6 // indirect + github.com/pelletier/go-toml/v2 v2.0.7 // indirect github.com/pion/datachannel v1.5.5 // indirect github.com/pion/dtls/v2 v2.2.6 // indirect github.com/pion/mdns v0.0.7 // indirect @@ -52,19 +49,19 @@ require ( github.com/pion/udp/v2 v2.0.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.40.0 // indirect + github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/spf13/afero v1.9.4 // indirect + github.com/spf13/afero v1.9.5 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect - golang.org/x/crypto v0.6.0 // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect + golang.org/x/crypto v0.7.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 7d48c465..6de8faf5 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -120,7 +121,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -153,8 +153,6 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4= @@ -173,17 +171,12 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -193,14 +186,14 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= -github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= +github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= github.com/pion/dtls/v2 v2.2.6 h1:yXMxKr0Skd+Ub6A8UqXTRLSywskx93ooMRHsQUtd+Z4= github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY= -github.com/pion/ice/v2 v2.3.1 h1:FQCmUfZe2Jpe7LYStVBOP6z1DiSzbIateih3TztgTjc= -github.com/pion/ice/v2 v2.3.1/go.mod h1:aq2kc6MtYNcn4XmMhobAv6hTNJiHzvD0yXRz80+bnP8= +github.com/pion/ice/v2 v2.3.2 h1:vh+fi4RkZ8H5fB4brZ/jm3j4BqFgMmNs+aB3X52Hu7M= +github.com/pion/ice/v2 v2.3.2/go.mod h1:AMIpuJqcpe+UwloocNebmTSWhCZM1TUCo9v7nW50jX0= github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8= github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= @@ -231,8 +224,8 @@ github.com/pion/turn/v2 v2.1.0 h1:5wGHSgGhJhP/RpabkUb/T9PdsAjkGLS6toYz5HNzoSI= github.com/pion/turn/v2 v2.1.0/go.mod h1:yrT5XbXSGX1VFSF31A3c1kCNB5bBZgk/uu5LET162qs= github.com/pion/udp/v2 v2.0.1 h1:xP0z6WNux1zWEjhC7onRA3EwwSliXqu1ElUZAQhUP54= github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8= -github.com/pion/webrtc/v3 v3.1.56 h1:ScaiqKQN3liQwT+kJwOBaYP6TwSfixzdUnZmzHAo0a0= -github.com/pion/webrtc/v3 v3.1.56/go.mod h1:7VhbA6ihqJlz6R/INHjyh1b8HpiV9Ct4UQvE1OB/xoM= +github.com/pion/webrtc/v3 v3.1.59 h1:B3YFo8q6dwBYKA2LUjWRChP59Qtt+xvv1Ul7UPDp6Zc= +github.com/pion/webrtc/v3 v3.1.59/go.mod h1:rJGgStRoFyFOWJULHLayaimsG+jIEoenhJ5MB5gIFqw= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -242,8 +235,8 @@ github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQg github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.40.0 h1:Afz7EVRqGg2Mqqf4JuF9vdvp1pi220m55Pi9T2JnO4Q= -github.com/prometheus/common v0.40.0/go.mod h1:L65ZJPSmfn/UBWLQIHV7dBrKFidB/wPlF1y5TlSt9OE= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -255,8 +248,8 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/spf13/afero v1.9.4 h1:Sd43wM1IWz/s1aVXdOBkjJvuP8UdyqioeE4AmM0QsBs= -github.com/spf13/afero v1.9.4/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= @@ -271,7 +264,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -300,10 +292,11 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -372,12 +365,14 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -447,8 +442,9 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -464,8 +460,9 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -612,8 +609,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From e66cd3978dfebcb50326eb32094cd366dc9c1c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 4 Apr 2023 23:52:15 +0200 Subject: [PATCH 810/876] Build gstreamer in nvidia image (#36) * build gstreamer 1.20 for nvidia dockerfile. * add nvidia to build. * add nvidia to start. * add config for nvidia. * upgrade cuda ro 11.4.3. * add cudaconvert to comment. * fix paths. * add cuda to ld. * upgrade supervisord version. * add config to suprtvisord in rebuild. * update nvenc params. * update nvidia dockerfile. * h264 profile constrained-baseline. * h264 send SPS PPS with every IDR. --- Dockerfile.nvidia | 178 +++++++++++++++++++++++++++------- dev/build | 15 ++- dev/rebuild | 2 +- dev/runtime/Dockerfile.nvidia | 20 ++++ dev/runtime/config.nvidia.yml | 101 +++++++++++++++++++ dev/start | 15 ++- 6 files changed, 293 insertions(+), 38 deletions(-) create mode 100644 dev/runtime/Dockerfile.nvidia create mode 100644 dev/runtime/config.nvidia.yml diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index df8396c2..1bccff48 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -1,5 +1,55 @@ ARG UBUNTU_RELEASE=20.04 -ARG CUDA_VERSION=11.2.2 +ARG CUDA_VERSION=11.4.3 +ARG VIRTUALGL_VERSION=3.1 +ARG GSTREAMER_VERSION=1.20 + +# +# Stage 0: Build gstreamer with nvidia plugins. +# +FROM ubuntu:${UBUNTU_RELEASE} AS gstreamer +ARG GSTREAMER_VERSION + +# +# install dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + # Install essentials + curl build-essential ca-certificates git \ + # Install pip and ninja + python3-pip python-gi-dev ninja-build \ + # Install build deps + autopoint autoconf automake autotools-dev libtool gettext bison flex gtk-doc-tools \ + # Install libraries + libtool-bin \ + libgtk2.0-dev \ + libgl1-mesa-dev \ + libopus-dev \ + libpulse-dev \ + libssl-dev \ + libx264-dev \ + libvpx-dev; \ + # Install meson + pip3 install meson; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# build gstreamer +RUN set -eux; \ + git clone --depth 1 --branch $GSTREAMER_VERSION https://gitlab.freedesktop.org/gstreamer/gstreamer.git /gstreamer/src; \ + cd /gstreamer/src; \ + mkdir -p /opt/gstreamer; \ + meson --prefix /opt/gstreamer \ + -Dgpl=enabled \ + -Dugly=enabled \ + -Dgst-plugins-ugly:x264=enabled \ + build; \ + ninja -C build; \ + meson install -C build; # # Stage 0: Build xserver-xorg-video-dummy 0.3.8-2 with RandR support. @@ -66,10 +116,12 @@ RUN ./build # # Stage 2: Runtime. # -FROM nvcr.io/nvidia/cudagl:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_RELEASE} as runtime +FROM nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_RELEASE} as runtime +ARG UBUNTU_RELEASE +ARG VIRTUALGL_VERSION # Make all NVIDIA GPUs visible by default -ARG NVIDIA_VISIBLE_DEVICES=all +ENV NVIDIA_VISIBLE_DEVICES all # All NVIDIA driver capabilities should preferably be used, check `NVIDIA_DRIVER_CAPABILITIES` inside the container if things do not work ENV NVIDIA_DRIVER_CAPABILITIES all @@ -83,34 +135,73 @@ ARG USERNAME=neko ARG USER_UID=1000 ARG USER_GID=$USER_UID +# +# install hardware accleration dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + dpkg --add-architecture i386; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + # opengl base: https://gitlab.com/nvidia/container-images/opengl/-/blob/ubuntu20.04/base/Dockerfile + libxau6 libxau6:i386 \ + libxdmcp6 libxdmcp6:i386 \ + libxcb1 libxcb1:i386 \ + libxext6 libxext6:i386 \ + libx11-6 libx11-6:i386 \ + # opengl runtime: https://gitlab.com/nvidia/container-images/opengl/-/blob/ubuntu20.04/glvnd/runtime/Dockerfile + libglvnd0 libglvnd0:i386 \ + libgl1 libgl1:i386 \ + libglx0 libglx0:i386 \ + libegl1 libegl1:i386 \ + libgles2 libgles2:i386 \ + # hardware accleration utilities + libglu1 libglu1:i386 \ + libvulkan-dev libvulkan-dev:i386 \ + mesa-utils mesa-utils-extra \ + mesa-va-drivers mesa-vulkan-drivers \ + vainfo vdpauinfo; \ + # + # install vulkan-utils or vulkan-tools depending on ubuntu release + if [ "${UBUNTU_RELEASE}" = "18.04" ]; then \ + apt-get install -y --no-install-recommends vulkan-utils; \ + else \ + apt-get install -y --no-install-recommends vulkan-tools; \ + fi; \ + # + # create symlink for libnvrtc.so (needed for cudaconvert) + find /usr/local/cuda/lib64/ -maxdepth 1 -type l -name "*libnvrtc.so.*" -exec sh -c 'ln -sf {} /usr/local/cuda/lib64/libnvrtc.so' \;; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# add cuda to ld path, for gstreamer cuda plugins +ENV LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu:/usr/lib/i386-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}:/usr/local/cuda/lib:/usr/local/cuda/lib64" + # # install dependencies ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - wget ca-certificates supervisor \ + wget ca-certificates \ pulseaudio dbus-x11 xserver-xorg-video-dummy \ - libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ - software-properties-common cabextract aptitude vim curl \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 libx264-155 \ + libgtk-3-bin software-properties-common cabextract aptitude vim curl \ # # needed for profile upload preStop hook zip curl \ # # file chooser handler, clipboard, drop - xdotool xclip libgtk-3-0 \ - # - # hardware acclerations utilities - libgtk-3-bin mesa-utils mesa-utils-extra mesa-va-drivers mesa-vulkan-drivers libvulkan-dev libvulkan-dev:i386 vdpauinfo \ - # - # gst - gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ - gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ - gstreamer1.0-pulseaudio; \ + xdotool xclip libgtk-3-0; \ # install libxcvt0 (not available in debian:bullseye) wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb; \ rm ./libxcvt0_0.1.2-1_amd64.deb; \ + # install never version for supervisor that supports -s flag + apt-get install -y --no-install-recommends pip; \ + pip install supervisor --upgrade; \ # # create a non-root user groupadd --gid $USER_GID $USERNAME; \ @@ -149,10 +240,17 @@ RUN set -eux; \ COPY --from=xserver-xorg-video-dummy /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so # -# Install and configure Vulkan manually -RUN if [ "${UBUNTU_RELEASE}" = "18.04" ]; then apt-get update && apt-get install --no-install-recommends -y vulkan-utils; else apt-get update && apt-get install --no-install-recommends -y vulkan-tools; fi && \ - rm -rf /var/lib/apt/lists/* && \ - VULKAN_API_VERSION=$(dpkg -s libvulkan1 | grep -oP 'Version: [0-9|\.]+' | grep -oP '[0-9]+(\.[0-9]+)(\.[0-9]+)') && \ +# configure EGL and Vulkan manually +RUN VULKAN_API_VERSION=$(dpkg -s libvulkan1 | grep -oP 'Version: [0-9|\.]+' | grep -oP '[0-9]+(\.[0-9]+)(\.[0-9]+)') && \ + # Configure EGL manually + mkdir -p /usr/share/glvnd/egl_vendor.d/ && \ + echo "{\n\ + \"file_format_version\" : \"1.0.0\",\n\ + \"ICD\": {\n\ + \"library_path\": \"libEGL_nvidia.so.0\"\n\ + }\n\ +}" > /usr/share/glvnd/egl_vendor.d/10_nvidia.json && \ + # Configure Vulkan manually mkdir -p /etc/vulkan/icd.d/ && \ echo "{\n\ \"file_format_version\" : \"1.0.0\",\n\ @@ -162,20 +260,24 @@ RUN if [ "${UBUNTU_RELEASE}" = "18.04" ]; then apt-get update && apt-get install }\n\ }" > /etc/vulkan/icd.d/nvidia_icd.json -ARG VIRTUALGL_VERSION=3.1 # -# Install VirtualGL and make libraries available for preload -RUN curl -fsSL -O "https://sourceforge.net/projects/virtualgl/files/virtualgl_${VIRTUALGL_VERSION}_amd64.deb" && \ - curl -fsSL -O "https://sourceforge.net/projects/virtualgl/files/virtualgl32_${VIRTUALGL_VERSION}_amd64.deb" && \ - apt-get update && apt-get install -y --no-install-recommends ./virtualgl_${VIRTUALGL_VERSION}_amd64.deb ./virtualgl32_${VIRTUALGL_VERSION}_amd64.deb && \ - rm -f "virtualgl_${VIRTUALGL_VERSION}_amd64.deb" "virtualgl32_${VIRTUALGL_VERSION}_amd64.deb" && \ - rm -rf /var/lib/apt/lists/* && \ - chmod u+s /usr/lib/libvglfaker.so && \ - chmod u+s /usr/lib/libdlfaker.so && \ - chmod u+s /usr/lib32/libvglfaker.so && \ - chmod u+s /usr/lib32/libdlfaker.so && \ - chmod u+s /usr/lib/i386-linux-gnu/libvglfaker.so && \ - chmod u+s /usr/lib/i386-linux-gnu/libdlfaker.so +# install VirtualGL and make libraries available for preload +RUN set -eux; \ + apt-get update; \ + wget "https://sourceforge.net/projects/virtualgl/files/virtualgl_${VIRTUALGL_VERSION}_amd64.deb"; \ + wget "https://sourceforge.net/projects/virtualgl/files/virtualgl32_${VIRTUALGL_VERSION}_amd64.deb"; \ + apt-get install -y --no-install-recommends ./virtualgl_${VIRTUALGL_VERSION}_amd64.deb ./virtualgl32_${VIRTUALGL_VERSION}_amd64.deb; \ + rm -f "virtualgl_${VIRTUALGL_VERSION}_amd64.deb" "virtualgl32_${VIRTUALGL_VERSION}_amd64.deb"; \ + chmod u+s /usr/lib/libvglfaker.so; \ + chmod u+s /usr/lib/libdlfaker.so; \ + chmod u+s /usr/lib32/libvglfaker.so; \ + chmod u+s /usr/lib32/libdlfaker.so; \ + chmod u+s /usr/lib/i386-linux-gnu/libvglfaker.so; \ + chmod u+s /usr/lib/i386-linux-gnu/libdlfaker.so; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/*; # # copy runtime configs @@ -200,6 +302,16 @@ ENV NEKO_SERVER_BIND=:8080 ENV NEKO_PLUGINS_ENABLED=true ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/ +# +# set gstreamer envs +ENV PATH="/opt/gstreamer/bin:${PATH}" +ENV LD_LIBRARY_PATH="/opt/gstreamer/lib/x86_64-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" +ENV PKG_CONFIG_PATH="/opt/gstreamer/lib/x86_64-linux-gnu/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}" + +# +# copy gstreamer from previous stage +COPY --from=gstreamer /opt/gstreamer /opt/gstreamer + # # copy plugins from previous stage COPY --from=build /src/bin/plugins/ $NEKO_PLUGINS_DIR @@ -215,4 +327,4 @@ HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ # # run neko -CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"] +CMD ["/usr/local/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"] diff --git a/dev/build b/dev/build index 3a6ef04b..f3ae34cd 100755 --- a/dev/build +++ b/dev/build @@ -8,7 +8,16 @@ set -e GIT_COMMIT=`git rev-parse --short HEAD` GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` -docker build -t neko_server_build --target build --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" .. -docker build -t neko_server_runtime --target runtime --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" .. +# if first argument is nvidia, use nvidia dockerfile +if [ "$1" = "nvidia" ]; then + echo "Building nvidia docker image" + DOCKERFILE="Dockerfile.nvidia" +else + echo "Building default docker image" + DOCKERFILE="Dockerfile" +fi -docker build -t neko_server_app --build-arg "BASE_IMAGE=neko_server_runtime" ./runtime +docker build -t neko_server_build --target build --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" -f ../$DOCKERFILE .. +docker build -t neko_server_runtime --target runtime --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" -f ../$DOCKERFILE .. + +docker build -t neko_server_app --build-arg "BASE_IMAGE=neko_server_runtime" -f ./runtime/$DOCKERFILE ./runtime diff --git a/dev/rebuild b/dev/rebuild index 34ca4328..ffa57bf3 100755 --- a/dev/rebuild +++ b/dev/rebuild @@ -29,4 +29,4 @@ fi # # restart server -docker exec neko_server_dev supervisorctl restart neko +docker exec neko_server_dev supervisorctl -c /etc/neko/supervisord.conf restart neko diff --git a/dev/runtime/Dockerfile.nvidia b/dev/runtime/Dockerfile.nvidia new file mode 100644 index 00000000..e01cbc6d --- /dev/null +++ b/dev/runtime/Dockerfile.nvidia @@ -0,0 +1,20 @@ +ARG BASE_IMAGE=neko_server_runtime:latest +FROM $BASE_IMAGE + +# +# install xfce +RUN set -eux; apt-get update; \ + # nvidia docker does not have firefox only firefox-esr + apt-get install -y --no-install-recommends xfce4 xfce4-terminal firefox sudo; \ + # + # add user to sudoers + usermod -aG sudo neko; \ + echo "neko:neko" | chpasswd; \ + echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \ + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# copy configuation files +COPY supervisord.conf /etc/neko/supervisord/xfce.conf diff --git a/dev/runtime/config.nvidia.yml b/dev/runtime/config.nvidia.yml new file mode 100644 index 00000000..0f193a5d --- /dev/null +++ b/dev/runtime/config.nvidia.yml @@ -0,0 +1,101 @@ +capture: + video: + codec: h264 + ids: + - nvh264enc + - x264enc + pipelines: + nvh264enc: + fps: 25 + bitrate: 2 + #gst_prefix: "! cudaupload ! cudaconvert ! video/x-raw(memory:CUDAMemory),format=NV12" + gst_prefix: "! video/x-raw,format=NV12" + gst_encoder: "nvh264enc" + gst_params: + bitrate: 3000 + rc-mode: 5 # Low-Delay CBR, High Quality + preset: 5 # Low Latency, High Performance + zerolatency: true + gop-size: 25 + gst_suffix: "! h264parse config-interval=-1 ! video/x-h264,stream-format=byte-stream,profile=constrained-baseline" + x264enc: + fps: 25 + bitrate: 1 + gst_prefix: "! video/x-raw,format=I420" + gst_encoder: "x264enc" + gst_params: + threads: 4 + bitrate: 4096 + key-int-max: 25 + byte-stream: true + tune: zerolatency + speed-preset: veryfast + gst_suffix: "! video/x-h264,stream-format=byte-stream,profile=constrained-baseline" + +server: + pprof: true + +desktop: + screen: "1920x1080@60" + +member: + provider: "object" + object: + users: + - username: "admin" + password: "admin" + profile: + name: "Administrator" + is_admin: true + can_login: true + can_connect: true + can_watch: true + can_host: true + can_share_media: true + can_access_clipboard: true + sends_inactive_cursor: true + can_see_inactive_cursors: true + - username: "user" + password: "neko" + profile: + name: "User" + is_admin: false + can_login: true + can_connect: true + can_watch: true + can_host: true + can_share_media: true + can_access_clipboard: true + sends_inactive_cursor: true + can_see_inactive_cursors: false + # provider: "file" + # file: + # path: "/home/neko/members.json" + # provider: "multiuser" + # multiuser: + # admin_password: "admin" + # user_password: "neko" + # provider: "noauth" + +session: + # Allows reconnecting the websocket even if the previous + # connection was not closed. Can lead to session hijacking. + merciful_reconnect: true + # Show inactive cursors on the screen. Can lead to multiple + # data sent via WebSockets and additonal rendering cost on + # the clients. + inactive_cursors: true + api_token: "neko123" + cookie: + # Disabling cookies will result to use Bearer Authentication. + # This is less secure, because access token will be sent to + # client in playload and accessible via JS app. + enabled: false + secure: false + +webrtc: + icelite: true + iceservers: + - urls: [ stun:stun.l.google.com:19302 ] + # username: foo + # credential: bar diff --git a/dev/start b/dev/start index 9aaf5c60..ad65b3cd 100755 --- a/dev/start +++ b/dev/start @@ -27,6 +27,17 @@ if [ -z $NEKO_NAT1TO1 ]; then fi fi +# if first argument is nvidia, start with nvidia runtime +if [ "$1" = "nvidia" ]; then + echo "Starting nvidia docker image" + EXTRAOPTS="--gpus all" + CONFIG="config.nvidia.yml" +else + echo "Starting default docker image" + EXTRAOPTS="" + CONFIG="config.yml" +fi + echo "Using app port: ${NEKO_PORT}" echo "Using mux port: ${NEKO_MUX}" echo "Using IP address: ${NEKO_NAT1TO1}" @@ -41,6 +52,8 @@ docker run --rm -it \ -e "NEKO_WEBRTC_TCPMUX=${NEKO_MUX}" \ -e "NEKO_WEBRTC_NAT1TO1=${NEKO_NAT1TO1}" \ -e "NEKO_SESSION_FILE=/home/neko/sessions.txt" \ - -v "${PWD}/runtime/config.yml:/etc/neko/neko.yml" \ + -v "${PWD}/runtime/$CONFIG:/etc/neko/neko.yml" \ -e "NEKO_DEBUG=1" \ + --shm-size=2G \ + $EXTRAOPTS \ neko_server_app:latest; From 7cd469f7bdbee84bb09c5c407defd3ccc4345b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 10 Apr 2023 21:21:11 +0200 Subject: [PATCH 811/876] cleanup peer. --- internal/webrtc/manager.go | 17 ++++++++---- internal/webrtc/peer.go | 57 ++++++++------------------------------ 2 files changed, 23 insertions(+), 51 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 29fc8654..f0fd27cb 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -448,18 +448,23 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, } peer := &WebRTCPeerCtx{ - logger: logger, - connection: connection, - dataChannel: dataChannel, + logger: logger, + connection: connection, + // tracks & channels + audioTrack: audioTrack, + videoTrack: videoTrack, + dataChannel: dataChannel, + rtcpChannel: videoRtcp, + // config + iceTrickle: manager.config.ICETrickle, + // deprecated functions changeVideoFromBitrate: changeVideoFromBitrate, changeVideoFromID: changeVideoFromID, - // TODO: Refactor. - videoId: videoTrack.stream.ID, + videoId: videoTrack.stream.ID, setPaused: func(isPaused bool) { videoTrack.SetPaused(isPaused) audioTrack.SetPaused(isPaused) }, - iceTrickle: manager.config.ICETrickle, setVideoAuto: func(videoAuto bool) { // if estimator is enabled and not in passive mode, enable video auto bitrate if manager.config.EstimatorEnabled && !manager.config.EstimatorPassive { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 09e982fa..7edd3e8f 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -5,6 +5,7 @@ import ( "encoding/binary" "sync" + "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/rs/zerolog" @@ -13,27 +14,29 @@ import ( ) type WebRTCPeerCtx struct { - mu sync.Mutex - logger zerolog.Logger - connection *webrtc.PeerConnection - dataChannel *webrtc.DataChannel + mu sync.Mutex + logger zerolog.Logger + connection *webrtc.PeerConnection + // tracks & channels + audioTrack *Track + videoTrack *Track + dataChannel *webrtc.DataChannel + rtcpChannel chan []rtcp.Packet + // config + iceTrickle bool + // deprecated functions changeVideoFromBitrate func(bitrate int) changeVideoFromID func(id string) int videoId func() string setPaused func(isPaused bool) setVideoAuto func(auto bool) getVideoAuto func() bool - iceTrickle bool } func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil { - return nil, types.ErrWebRTCConnectionNotFound - } - offer, err := peer.connection.CreateOffer(&webrtc.OfferOptions{ ICERestart: ICERestart, }) @@ -48,10 +51,6 @@ func (peer *WebRTCPeerCtx) CreateAnswer() (*webrtc.SessionDescription, error) { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil { - return nil, types.ErrWebRTCConnectionNotFound - } - answer, err := peer.connection.CreateAnswer(nil) if err != nil { return nil, err @@ -83,10 +82,6 @@ func (peer *WebRTCPeerCtx) SetOffer(sdp string) error { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil { - return types.ErrWebRTCConnectionNotFound - } - return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ SDP: sdp, Type: webrtc.SDPTypeOffer, @@ -97,10 +92,6 @@ func (peer *WebRTCPeerCtx) SetAnswer(sdp string) error { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil { - return types.ErrWebRTCConnectionNotFound - } - return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ SDP: sdp, Type: webrtc.SDPTypeAnswer, @@ -111,10 +102,6 @@ func (peer *WebRTCPeerCtx) SetCandidate(candidate webrtc.ICECandidateInit) error peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil { - return types.ErrWebRTCConnectionNotFound - } - return peer.connection.AddICECandidate(candidate) } @@ -122,10 +109,6 @@ func (peer *WebRTCPeerCtx) SetVideoBitrate(peerBitrate int) error { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil { - return types.ErrWebRTCConnectionNotFound - } - peer.changeVideoFromBitrate(peerBitrate) return nil } @@ -134,10 +117,6 @@ func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil { - return types.ErrWebRTCConnectionNotFound - } - peer.changeVideoFromID(videoID) return nil } @@ -154,10 +133,6 @@ func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil { - return types.ErrWebRTCConnectionNotFound - } - peer.logger.Info().Bool("is_paused", isPaused).Msg("set paused") peer.setPaused(isPaused) return nil @@ -167,10 +142,6 @@ func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { peer.mu.Lock() defer peer.mu.Unlock() - if peer.dataChannel == nil { - return types.ErrWebRTCDataChannelNotFound - } - data := payload.CursorPosition{ Header: payload.Header{ Event: payload.OP_CURSOR_POSITION, @@ -192,10 +163,6 @@ func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage, img []byte) e peer.mu.Lock() defer peer.mu.Unlock() - if peer.dataChannel == nil { - return types.ErrWebRTCDataChannelNotFound - } - data := payload.CursorImage{ Header: payload.Header{ Event: payload.OP_CURSOR_IMAGE, From 9928feefefcf80720633e4489a8940b6daa03828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 10 Apr 2023 21:33:53 +0200 Subject: [PATCH 812/876] refactor metrics. --- internal/webrtc/manager.go | 27 ++- internal/webrtc/metrics.go | 433 ++++++++++++++++++------------------- 2 files changed, 225 insertions(+), 235 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index f0fd27cb..a6348783 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -69,7 +69,7 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con return &WebRTCManagerCtx{ logger: log.With().Str("module", "webrtc").Logger(), config: config, - metrics: newMetrics(), + metrics: newMetricsManager(), webrtcConfiguration: configuration, @@ -83,7 +83,7 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con type WebRTCManagerCtx struct { logger zerolog.Logger config *config.WebRTC - metrics *metricsCtx + metrics *metricsManager peerId int32 desktop types.DesktopManager @@ -262,7 +262,10 @@ func (manager *WebRTCManagerCtx) newPeerConnection(bitrate int, codecs []codec.R func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, videoAuto bool) (*webrtc.SessionDescription, error) { id := atomic.AddInt32(&manager.peerId, 1) - manager.metrics.NewConnection(session) + + // get metrics for session + metrics := manager.metrics.getBySession(session) + metrics.NewConnection() // add session id to logger context logger := manager.logger.With().Str("session_id", session.ID()).Int32("peer_id", id).Logger() @@ -362,7 +365,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, videoID := videoTrack.stream.ID() bitrate := videoTrack.stream.Bitrate() - manager.metrics.SetVideoID(session, videoID) + metrics.SetVideoID(videoID) manager.logger.Debug(). Int("peer_bitrate", peerBitrate). Int("video_bitrate", bitrate). @@ -425,7 +428,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, for range ticker.C { targetBitrate := estimator.GetTargetBitrate() - manager.metrics.SetReceiverEstimatedTargetBitrate(session, float64(targetBitrate)) + metrics.SetReceiverEstimatedTargetBitrate(float64(targetBitrate)) if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { break @@ -594,7 +597,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, }) } - manager.metrics.SetState(session, state) + metrics.SetState(state) }) cursorImage := func(entry *cursor.ImageEntry) { @@ -682,13 +685,13 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, for _, p := range packets { switch rtcpPacket := p.(type) { case *rtcp.ReceiverEstimatedMaximumBitrate: // TODO: Deprecated. - manager.metrics.SetReceiverEstimatedMaximumBitrate(session, rtcpPacket.Bitrate) + metrics.SetReceiverEstimatedMaximumBitrate(rtcpPacket.Bitrate) case *rtcp.ReceiverReport: l := len(rtcpPacket.Reports) if l > 0 { // use only last report - manager.metrics.SetReceiverReport(session, rtcpPacket.Reports[l-1]) + metrics.SetReceiverReport(rtcpPacket.Reports[l-1]) } } } @@ -707,12 +710,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, stats := connection.GetStats() data, ok := stats["iceTransport"].(webrtc.TransportStats) if ok { - manager.metrics.SetIceTransportStats(session, data) + metrics.SetIceTransportStats(data) } data, ok = stats["sctpTransport"].(webrtc.TransportStats) if ok { - manager.metrics.SetSctpTransportStats(session, data) + metrics.SetSctpTransportStats(data) } remoteCandidates := map[string]webrtc.ICECandidateStats{} @@ -721,7 +724,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, // only remote ice candidate stats candidate, ok := entry.(webrtc.ICECandidateStats) if ok && candidate.Type == webrtc.StatsTypeRemoteCandidate { - manager.metrics.NewICECandidate(session, candidate) + metrics.NewICECandidate(candidate) remoteCandidates[candidate.ID] = candidate } @@ -739,7 +742,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, } } - manager.metrics.SetICECandidatesUsed(session, iceCandidatesUsed) + metrics.SetICECandidatesUsed(iceCandidatesUsed) } }() diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 923b791e..f0b2b3fc 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -10,7 +10,204 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" ) +type metricsManager struct { + mu sync.Mutex + + sessions map[string]metrics +} + +func newMetricsManager() *metricsManager { + return &metricsManager{ + sessions: map[string]metrics{}, + } +} + +func (m *metricsManager) getBySession(session types.Session) metrics { + m.mu.Lock() + defer m.mu.Unlock() + + sessionId := session.ID() + + met, ok := m.sessions[sessionId] + if ok { + return met + } + + met = metrics{ + sessionId: sessionId, + + connectionState: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "connection_state", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Connection state of session.", + ConstLabels: map[string]string{ + "session_id": sessionId, + }, + }), + connectionStateCount: promauto.NewCounter(prometheus.CounterOpts{ + Name: "connection_state_count", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Count of connection state changes for a session.", + ConstLabels: map[string]string{ + "session_id": sessionId, + }, + }), + connectionCount: promauto.NewCounter(prometheus.CounterOpts{ + Name: "connection_count", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Connection count of a session.", + ConstLabels: map[string]string{ + "session_id": sessionId, + }, + }), + + iceCandidates: map[string]struct{}{}, + iceCandidatesMu: &sync.Mutex{}, + iceCandidatesUdpCount: promauto.NewCounter(prometheus.CounterOpts{ + Name: "ice_candidates_count", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Count of ICE candidates sent by a remote client.", + ConstLabels: map[string]string{ + "session_id": sessionId, + "protocol": "udp", + }, + }), + iceCandidatesTcpCount: promauto.NewCounter(prometheus.CounterOpts{ + Name: "ice_candidates_count", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Count of ICE candidates sent by a remote client.", + ConstLabels: map[string]string{ + "session_id": sessionId, + "protocol": "tcp", + }, + }), + + iceCandidatesUsedUdp: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "ice_candidates_used", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Used ICE candidates that are currently in use.", + ConstLabels: map[string]string{ + "session_id": sessionId, + "protocol": "udp", + }, + }), + iceCandidatesUsedTcp: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "ice_candidates_used", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Used ICE candidates that are currently in use.", + ConstLabels: map[string]string{ + "session_id": sessionId, + "protocol": "tcp", + }, + }), + + videoIds: map[string]prometheus.Gauge{}, + videoIdsMu: &sync.Mutex{}, + + receiverEstimatedMaximumBitrate: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "receiver_estimated_maximum_bitrate", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Receiver Estimated Maximum Bitrate from SCTP.", + ConstLabels: map[string]string{ + "session_id": sessionId, + }, + }), + receiverEstimatedTargetBitrate: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "receiver_estimated_target_bitrate", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Receiver Estimated Target Bitrate using Google's congestion control.", + ConstLabels: map[string]string{ + "session_id": sessionId, + }, + }), + + receiverReportDelay: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "receiver_report_delay", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Receiver Report Delay from SCTP, expressed in units of 1/65536 seconds.", + ConstLabels: map[string]string{ + "session_id": sessionId, + }, + }), + receiverReportJitter: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "receiver_report_jitter", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Receiver Report Jitter from SCTP.", + ConstLabels: map[string]string{ + "session_id": sessionId, + }, + }), + receiverReportTotalLost: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "receiver_report_total_lost", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Receiver Report Total Lost from SCTP.", + ConstLabels: map[string]string{ + "session_id": sessionId, + }, + }), + + iceBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "bytes_sent", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Sent bytes to a session.", + ConstLabels: map[string]string{ + "session_id": sessionId, + "transport": "ice", + }, + }), + iceBytesReceived: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "bytes_received", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Received bytes from a session.", + ConstLabels: map[string]string{ + "session_id": sessionId, + "transport": "ice", + }, + }), + + sctpBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "bytes_sent", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Sent bytes to a session.", + ConstLabels: map[string]string{ + "session_id": sessionId, + "transport": "sctp", + }, + }), + sctpBytesReceived: promauto.NewGauge(prometheus.GaugeOpts{ + Name: "bytes_received", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Received bytes from a session.", + ConstLabels: map[string]string{ + "session_id": sessionId, + "transport": "sctp", + }, + }), + } + + m.sessions[sessionId] = met + return met +} + type metrics struct { + sessionId string + connectionState prometheus.Gauge connectionStateCount prometheus.Counter connectionCount prometheus.Counter @@ -39,198 +236,7 @@ type metrics struct { sctpBytesReceived prometheus.Gauge } -type metricsCtx struct { - mu sync.Mutex - - sessions map[string]metrics -} - -func newMetrics() *metricsCtx { - return &metricsCtx{ - sessions: map[string]metrics{}, - } -} - -func (m *metricsCtx) getBySession(session types.Session) metrics { - m.mu.Lock() - defer m.mu.Unlock() - - met, ok := m.sessions[session.ID()] - if ok { - return met - } - - met = metrics{ - connectionState: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "connection_state", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Connection state of session.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - }, - }), - connectionStateCount: promauto.NewCounter(prometheus.CounterOpts{ - Name: "connection_state_count", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Count of connection state changes for a session.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - }, - }), - connectionCount: promauto.NewCounter(prometheus.CounterOpts{ - Name: "connection_count", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Connection count of a session.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - }, - }), - - iceCandidates: map[string]struct{}{}, - iceCandidatesMu: &sync.Mutex{}, - iceCandidatesUdpCount: promauto.NewCounter(prometheus.CounterOpts{ - Name: "ice_candidates_count", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Count of ICE candidates sent by a remote client.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - "protocol": "udp", - }, - }), - iceCandidatesTcpCount: promauto.NewCounter(prometheus.CounterOpts{ - Name: "ice_candidates_count", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Count of ICE candidates sent by a remote client.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - "protocol": "tcp", - }, - }), - - iceCandidatesUsedUdp: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "ice_candidates_used", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Used ICE candidates that are currently in use.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - "protocol": "udp", - }, - }), - iceCandidatesUsedTcp: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "ice_candidates_used", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Used ICE candidates that are currently in use.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - "protocol": "tcp", - }, - }), - - videoIds: map[string]prometheus.Gauge{}, - videoIdsMu: &sync.Mutex{}, - - receiverEstimatedMaximumBitrate: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "receiver_estimated_maximum_bitrate", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Receiver Estimated Maximum Bitrate from SCTP.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - }, - }), - receiverEstimatedTargetBitrate: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "receiver_estimated_target_bitrate", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Receiver Estimated Target Bitrate using Google's congestion control.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - }, - }), - - receiverReportDelay: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "receiver_report_delay", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Receiver Report Delay from SCTP, expressed in units of 1/65536 seconds.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - }, - }), - receiverReportJitter: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "receiver_report_jitter", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Receiver Report Jitter from SCTP.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - }, - }), - receiverReportTotalLost: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "receiver_report_total_lost", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Receiver Report Total Lost from SCTP.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - }, - }), - - iceBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "bytes_sent", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Sent bytes to a session.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - "transport": "ice", - }, - }), - iceBytesReceived: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "bytes_received", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Received bytes from a session.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - "transport": "ice", - }, - }), - - sctpBytesSent: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "bytes_sent", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Sent bytes to a session.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - "transport": "sctp", - }, - }), - sctpBytesReceived: promauto.NewGauge(prometheus.GaugeOpts{ - Name: "bytes_received", - Namespace: "neko", - Subsystem: "webrtc", - Help: "Received bytes from a session.", - ConstLabels: map[string]string{ - "session_id": session.ID(), - "transport": "sctp", - }, - }), - } - - m.sessions[session.ID()] = met - return met -} - -func (m *metricsCtx) reset(met metrics) { +func (met *metrics) reset() { met.videoIdsMu.Lock() for _, entry := range met.videoIds { entry.Set(0) @@ -246,14 +252,11 @@ func (m *metricsCtx) reset(met metrics) { met.receiverReportJitter.Set(0) } -func (m *metricsCtx) NewConnection(session types.Session) { - met := m.getBySession(session) +func (met *metrics) NewConnection() { met.connectionCount.Add(1) } -func (m *metricsCtx) NewICECandidate(session types.Session, candidate webrtc.ICECandidateStats) { - met := m.getBySession(session) - +func (met *metrics) NewICECandidate(candidate webrtc.ICECandidateStats) { met.iceCandidatesMu.Lock() defer met.iceCandidatesMu.Unlock() @@ -269,9 +272,7 @@ func (m *metricsCtx) NewICECandidate(session types.Session, candidate webrtc.ICE } } -func (m *metricsCtx) SetICECandidatesUsed(session types.Session, candidates []webrtc.ICECandidateStats) { - met := m.getBySession(session) - +func (met *metrics) SetICECandidatesUsed(candidates []webrtc.ICECandidateStats) { udp, tcp := 0, 0 for _, candidate := range candidates { if candidate.Protocol == "udp" { @@ -285,9 +286,7 @@ func (m *metricsCtx) SetICECandidatesUsed(session types.Session, candidates []we met.iceCandidatesUsedTcp.Set(float64(tcp)) } -func (m *metricsCtx) SetState(session types.Session, state webrtc.PeerConnectionState) { - met := m.getBySession(session) - +func (met *metrics) SetState(state webrtc.PeerConnectionState) { switch state { case webrtc.PeerConnectionStateNew: met.connectionState.Set(0) @@ -301,7 +300,7 @@ func (m *metricsCtx) SetState(session types.Session, state webrtc.PeerConnection met.connectionState.Set(2) case webrtc.PeerConnectionStateClosed: met.connectionState.Set(1) - m.reset(met) + met.reset() default: met.connectionState.Set(-1) } @@ -309,9 +308,7 @@ func (m *metricsCtx) SetState(session types.Session, state webrtc.PeerConnection met.connectionStateCount.Add(1) } -func (m *metricsCtx) SetVideoID(session types.Session, videoId string) { - met := m.getBySession(session) - +func (met *metrics) SetVideoID(videoId string) { met.videoIdsMu.Lock() defer met.videoIdsMu.Unlock() @@ -322,7 +319,7 @@ func (m *metricsCtx) SetVideoID(session types.Session, videoId string) { Subsystem: "webrtc", Help: "Listeners for Video pipelines by a session.", ConstLabels: map[string]string{ - "session_id": session.ID(), + "session_id": met.sessionId, "video_id": videoId, }, }) @@ -337,36 +334,26 @@ func (m *metricsCtx) SetVideoID(session types.Session, videoId string) { } } -func (m *metricsCtx) SetReceiverEstimatedMaximumBitrate(session types.Session, bitrate float32) { - met := m.getBySession(session) - +func (met *metrics) SetReceiverEstimatedMaximumBitrate(bitrate float32) { met.receiverEstimatedMaximumBitrate.Set(float64(bitrate)) } -func (m *metricsCtx) SetReceiverEstimatedTargetBitrate(session types.Session, bitrate float64) { - met := m.getBySession(session) - +func (met *metrics) SetReceiverEstimatedTargetBitrate(bitrate float64) { met.receiverEstimatedTargetBitrate.Set(bitrate) } -func (m *metricsCtx) SetReceiverReport(session types.Session, report rtcp.ReceptionReport) { - met := m.getBySession(session) - +func (met *metrics) SetReceiverReport(report rtcp.ReceptionReport) { met.receiverReportDelay.Set(float64(report.Delay)) met.receiverReportJitter.Set(float64(report.Jitter)) met.receiverReportTotalLost.Set(float64(report.TotalLost)) } -func (m *metricsCtx) SetIceTransportStats(session types.Session, data webrtc.TransportStats) { - met := m.getBySession(session) - +func (met *metrics) SetIceTransportStats(data webrtc.TransportStats) { met.iceBytesSent.Set(float64(data.BytesSent)) met.iceBytesReceived.Set(float64(data.BytesReceived)) } -func (m *metricsCtx) SetSctpTransportStats(session types.Session, data webrtc.TransportStats) { - met := m.getBySession(session) - +func (met *metrics) SetSctpTransportStats(data webrtc.TransportStats) { met.sctpBytesSent.Set(float64(data.BytesSent)) met.sctpBytesReceived.Set(float64(data.BytesReceived)) } From ec8560b2906de481e19a6bfd7acc384b49d5acc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 10 Apr 2023 21:37:39 +0200 Subject: [PATCH 813/876] add session & metrics to webrtc peer. --- internal/webrtc/manager.go | 2 ++ internal/webrtc/metrics.go | 8 ++++---- internal/webrtc/peer.go | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index a6348783..e02104d9 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -452,6 +452,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, peer := &WebRTCPeerCtx{ logger: logger, + session: session, + metrics: metrics, connection: connection, // tracks & channels audioTrack: audioTrack, diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index f0b2b3fc..025bb4ba 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -13,16 +13,16 @@ import ( type metricsManager struct { mu sync.Mutex - sessions map[string]metrics + sessions map[string]*metrics } func newMetricsManager() *metricsManager { return &metricsManager{ - sessions: map[string]metrics{}, + sessions: map[string]*metrics{}, } } -func (m *metricsManager) getBySession(session types.Session) metrics { +func (m *metricsManager) getBySession(session types.Session) *metrics { m.mu.Lock() defer m.mu.Unlock() @@ -33,7 +33,7 @@ func (m *metricsManager) getBySession(session types.Session) metrics { return met } - met = metrics{ + met = &metrics{ sessionId: sessionId, connectionState: promauto.NewGauge(prometheus.GaugeOpts{ diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 7edd3e8f..322e71d8 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -16,6 +16,8 @@ import ( type WebRTCPeerCtx struct { mu sync.Mutex logger zerolog.Logger + session types.Session + metrics *metrics connection *webrtc.PeerConnection // tracks & channels audioTrack *Track From 9d362ed03641e08078d2e25bc68b5875bfb91d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 10 Apr 2023 21:44:17 +0200 Subject: [PATCH 814/876] move change funcs to peer. --- internal/webrtc/manager.go | 148 ++++++++++--------------------------- internal/webrtc/peer.go | 78 +++++++++++++++++-- 2 files changed, 110 insertions(+), 116 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index e02104d9..36feb391 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -340,76 +340,42 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, // let video stream bucket manager handle stream subscriptions video.SetReceiver(videoTrack) - changeVideoFromBitrate := func(peerBitrate int) { - // when switching from manual to auto bitrate estimation, in case the estimator is - // idle (lastBitrate > maxBitrate), we want to go back to the previous estimated bitrate - if peerBitrate == 0 && estimator != nil && !manager.config.EstimatorPassive { - peerBitrate = estimator.GetTargetBitrate() - manager.logger.Debug(). - Int("peer_bitrate", peerBitrate). - Msg("evaluated bitrate") - } + // data channel - ok, err := videoTrack.SetBitrate(peerBitrate) - if err != nil { - logger.Error().Err(err). - Int("peer_bitrate", peerBitrate). - Msg("unable to set video bitrate") - return - } - - if !ok { - return - } - - videoID := videoTrack.stream.ID() - bitrate := videoTrack.stream.Bitrate() - - metrics.SetVideoID(videoID) - manager.logger.Debug(). - Int("peer_bitrate", peerBitrate). - Int("video_bitrate", bitrate). - Str("video_id", videoID). - Msg("peer bitrate triggered video stream change") - - go session.Send( - event.SIGNAL_VIDEO, - message.SignalVideo{ - Video: videoID, - Bitrate: bitrate, - VideoAuto: videoTrack.VideoAuto(), - }) + dataChannel, err := connection.CreateDataChannel("data", nil) + if err != nil { + return nil, err } - changeVideoFromID := func(videoID string) (bitrate int) { - changed, err := videoTrack.SetVideoID(videoID) - if err != nil { - logger.Error().Err(err). - Str("video_id", videoID). - Msg("unable to set video stream") - return - } - - if !changed { - return - } - - bitrate = videoTrack.stream.Bitrate() - - manager.logger.Debug(). - Str("video_id", videoID). - Int("video_bitrate", bitrate). - Msg("peer video id triggered video stream change") - - go session.Send( - event.SIGNAL_VIDEO, - message.SignalVideo{ - Video: videoID, - Bitrate: bitrate, - VideoAuto: videoTrack.VideoAuto(), - }) - - return + peer := &WebRTCPeerCtx{ + logger: logger, + session: session, + metrics: metrics, + connection: connection, + estimator: estimator, + // tracks & channels + audioTrack: audioTrack, + videoTrack: videoTrack, + dataChannel: dataChannel, + rtcpChannel: videoRtcp, + // config + iceTrickle: manager.config.ICETrickle, + // deprecated functions + videoId: videoTrack.stream.ID, + setPaused: func(isPaused bool) { + videoTrack.SetPaused(isPaused) + audioTrack.SetPaused(isPaused) + }, + setVideoAuto: func(videoAuto bool) { + // if estimator is enabled and not in passive mode, enable video auto bitrate + if manager.config.EstimatorEnabled && !manager.config.EstimatorPassive { + videoTrack.SetVideoAuto(videoAuto) + } else { + logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") + videoTrack.SetVideoAuto(false) // ensure video auto is disabled + } + }, + getVideoAuto: videoTrack.VideoAuto, } manager.logger.Info(). @@ -417,7 +383,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, Msg("estimated initial peer bitrate") // set initial video bitrate - changeVideoFromBitrate(bitrate) + if err := peer.SetVideoBitrate(bitrate); err != nil { + return nil, err + } // if estimator is enabled, use it to change video stream if estimator != nil { @@ -437,51 +405,15 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, continue } if !manager.config.EstimatorPassive { - changeVideoFromBitrate(targetBitrate) + err := peer.SetVideoBitrate(targetBitrate) + if err != nil { + logger.Warn().Err(err).Msg("failed to set video bitrate") + } } } }() } - // data channel - - dataChannel, err := connection.CreateDataChannel("data", nil) - if err != nil { - return nil, err - } - - peer := &WebRTCPeerCtx{ - logger: logger, - session: session, - metrics: metrics, - connection: connection, - // tracks & channels - audioTrack: audioTrack, - videoTrack: videoTrack, - dataChannel: dataChannel, - rtcpChannel: videoRtcp, - // config - iceTrickle: manager.config.ICETrickle, - // deprecated functions - changeVideoFromBitrate: changeVideoFromBitrate, - changeVideoFromID: changeVideoFromID, - videoId: videoTrack.stream.ID, - setPaused: func(isPaused bool) { - videoTrack.SetPaused(isPaused) - audioTrack.SetPaused(isPaused) - }, - setVideoAuto: func(videoAuto bool) { - // if estimator is enabled and not in passive mode, enable video auto bitrate - if manager.config.EstimatorEnabled && !manager.config.EstimatorPassive { - videoTrack.SetVideoAuto(videoAuto) - } else { - logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") - videoTrack.SetVideoAuto(false) // ensure video auto is disabled - } - }, - getVideoAuto: videoTrack.VideoAuto, - } - connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) { logger := logger.With(). Str("kind", track.Kind().String()). diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 322e71d8..da2d5bff 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -5,12 +5,15 @@ import ( "encoding/binary" "sync" + "github.com/pion/interceptor/pkg/cc" "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/rs/zerolog" "github.com/demodesk/neko/internal/webrtc/payload" "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) type WebRTCPeerCtx struct { @@ -19,6 +22,7 @@ type WebRTCPeerCtx struct { session types.Session metrics *metrics connection *webrtc.PeerConnection + estimator cc.BandwidthEstimator // tracks & channels audioTrack *Track videoTrack *Track @@ -27,12 +31,10 @@ type WebRTCPeerCtx struct { // config iceTrickle bool // deprecated functions - changeVideoFromBitrate func(bitrate int) - changeVideoFromID func(id string) int - videoId func() string - setPaused func(isPaused bool) - setVideoAuto func(auto bool) - getVideoAuto func() bool + videoId func() string + setPaused func(isPaused bool) + setVideoAuto func(auto bool) + getVideoAuto func() bool } func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) { @@ -111,7 +113,43 @@ func (peer *WebRTCPeerCtx) SetVideoBitrate(peerBitrate int) error { peer.mu.Lock() defer peer.mu.Unlock() - peer.changeVideoFromBitrate(peerBitrate) + // when switching from manual to auto bitrate estimation, in case the estimator is + // idle (lastBitrate > maxBitrate), we want to go back to the previous estimated bitrate + if peerBitrate == 0 && peer.estimator != nil { + peerBitrate = peer.estimator.GetTargetBitrate() + peer.logger.Debug(). + Int("peer_bitrate", peerBitrate). + Msg("evaluated bitrate") + } + + changed, err := peer.videoTrack.SetBitrate(peerBitrate) + if err != nil { + return err + } + + if !changed { + // TODO: return error? + return nil + } + + videoID := peer.videoTrack.stream.ID() + bitrate := peer.videoTrack.stream.Bitrate() + + peer.metrics.SetVideoID(videoID) + peer.logger.Debug(). + Int("peer_bitrate", peerBitrate). + Int("video_bitrate", bitrate). + Str("video_id", videoID). + Msg("peer bitrate triggered video stream change") + + go peer.session.Send( + event.SIGNAL_VIDEO, + message.SignalVideo{ + Video: videoID, + Bitrate: bitrate, + VideoAuto: peer.videoTrack.VideoAuto(), + }) + return nil } @@ -119,7 +157,31 @@ func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { peer.mu.Lock() defer peer.mu.Unlock() - peer.changeVideoFromID(videoID) + changed, err := peer.videoTrack.SetVideoID(videoID) + if err != nil { + return err + } + + if !changed { + // TODO: return error? + return nil + } + + bitrate := peer.videoTrack.stream.Bitrate() + + peer.logger.Debug(). + Str("video_id", videoID). + Int("video_bitrate", bitrate). + Msg("peer video id triggered video stream change") + + go peer.session.Send( + event.SIGNAL_VIDEO, + message.SignalVideo{ + Video: videoID, + Bitrate: bitrate, + VideoAuto: peer.videoTrack.VideoAuto(), + }) + return nil } From 5f0aafca51a3b4bd91a4e80c56007aac0a83e16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 10 Apr 2023 21:47:22 +0200 Subject: [PATCH 815/876] remove deprecated functions. --- internal/webrtc/manager.go | 16 ---------------- internal/webrtc/peer.go | 24 +++++++++++++----------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 36feb391..88c4cdeb 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -360,22 +360,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, rtcpChannel: videoRtcp, // config iceTrickle: manager.config.ICETrickle, - // deprecated functions - videoId: videoTrack.stream.ID, - setPaused: func(isPaused bool) { - videoTrack.SetPaused(isPaused) - audioTrack.SetPaused(isPaused) - }, - setVideoAuto: func(videoAuto bool) { - // if estimator is enabled and not in passive mode, enable video auto bitrate - if manager.config.EstimatorEnabled && !manager.config.EstimatorPassive { - videoTrack.SetVideoAuto(videoAuto) - } else { - logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") - videoTrack.SetVideoAuto(false) // ensure video auto is disabled - } - }, - getVideoAuto: videoTrack.VideoAuto, } manager.logger.Info(). diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index da2d5bff..f250aee3 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -30,11 +30,6 @@ type WebRTCPeerCtx struct { rtcpChannel chan []rtcp.Packet // config iceTrickle bool - // deprecated functions - videoId func() string - setPaused func(isPaused bool) - setVideoAuto func(auto bool) - getVideoAuto func() bool } func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) { @@ -185,12 +180,12 @@ func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { return nil } -// TODO: Refactor. func (peer *WebRTCPeerCtx) GetVideoID() string { peer.mu.Lock() defer peer.mu.Unlock() - return peer.videoId() + // TODO: Refactor. + return peer.videoTrack.stream.ID() } func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { @@ -198,7 +193,8 @@ func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { defer peer.mu.Unlock() peer.logger.Info().Bool("is_paused", isPaused).Msg("set paused") - peer.setPaused(isPaused) + peer.videoTrack.SetPaused(isPaused) + peer.audioTrack.SetPaused(isPaused) return nil } @@ -262,10 +258,16 @@ func (peer *WebRTCPeerCtx) Destroy() { } } -func (peer *WebRTCPeerCtx) SetVideoAuto(auto bool) { - peer.setVideoAuto(auto) +func (peer *WebRTCPeerCtx) SetVideoAuto(videoAuto bool) { + // if estimator is enabled, enable video auto bitrate + if peer.estimator != nil { + peer.videoTrack.SetVideoAuto(videoAuto) + } else { + peer.logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") + peer.videoTrack.SetVideoAuto(false) // ensure video auto is disabled + } } func (peer *WebRTCPeerCtx) VideoAuto() bool { - return peer.getVideoAuto() + return peer.videoTrack.VideoAuto() } From c676d7a3a21b756edb9dcf60db9dd88999370832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 10 Apr 2023 22:24:16 +0200 Subject: [PATCH 816/876] move collectors to metrics. --- internal/webrtc/manager.go | 74 ++--------------------------------- internal/webrtc/metrics.go | 79 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 71 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 88c4cdeb..5a5ae8ee 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -309,7 +309,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, } // audio track - audioTrack, err := NewTrack(logger, audioCodec, connection) if err != nil { return nil, err @@ -593,76 +592,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, }) }) - go func() { - for { - packets, ok := <-videoRtcp - if !ok { - break - } - - for _, p := range packets { - switch rtcpPacket := p.(type) { - case *rtcp.ReceiverEstimatedMaximumBitrate: // TODO: Deprecated. - metrics.SetReceiverEstimatedMaximumBitrate(rtcpPacket.Bitrate) - - case *rtcp.ReceiverReport: - l := len(rtcpPacket.Reports) - if l > 0 { - // use only last report - metrics.SetReceiverReport(rtcpPacket.Reports[l-1]) - } - } - } - } - }() - - go func() { - ticker := time.NewTicker(5 * time.Second) - defer ticker.Stop() - - for range ticker.C { - if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { - break - } - - stats := connection.GetStats() - data, ok := stats["iceTransport"].(webrtc.TransportStats) - if ok { - metrics.SetIceTransportStats(data) - } - - data, ok = stats["sctpTransport"].(webrtc.TransportStats) - if ok { - metrics.SetSctpTransportStats(data) - } - - remoteCandidates := map[string]webrtc.ICECandidateStats{} - nominatedRemoteCandidates := map[string]struct{}{} - for _, entry := range stats { - // only remote ice candidate stats - candidate, ok := entry.(webrtc.ICECandidateStats) - if ok && candidate.Type == webrtc.StatsTypeRemoteCandidate { - metrics.NewICECandidate(candidate) - remoteCandidates[candidate.ID] = candidate - } - - // only nominated ice candidate pair stats - pair, ok := entry.(webrtc.ICECandidatePairStats) - if ok && pair.Nominated { - nominatedRemoteCandidates[pair.RemoteCandidateID] = struct{}{} - } - } - - iceCandidatesUsed := []webrtc.ICECandidateStats{} - for id := range nominatedRemoteCandidates { - if candidate, ok := remoteCandidates[id]; ok { - iceCandidatesUsed = append(iceCandidatesUsed, candidate) - } - } - - metrics.SetICECandidatesUsed(iceCandidatesUsed) - } - }() + // start metrics collectors + go metrics.rtcpReceiver(videoRtcp) + go metrics.connectionStats(connection) return offer, nil } diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 025bb4ba..513e86a4 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -2,6 +2,7 @@ package webrtc import ( "sync" + "time" "github.com/demodesk/neko/pkg/types" "github.com/pion/rtcp" @@ -10,6 +11,8 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" ) +var connectionStatsInterval = 5 * time.Second + type metricsManager struct { mu sync.Mutex @@ -357,3 +360,79 @@ func (met *metrics) SetSctpTransportStats(data webrtc.TransportStats) { met.sctpBytesSent.Set(float64(data.BytesSent)) met.sctpBytesReceived.Set(float64(data.BytesReceived)) } + +// +// collectors +// + +func (met *metrics) rtcpReceiver(rtcpCh chan []rtcp.Packet) { + for { + packets, ok := <-rtcpCh + if !ok { + break + } + + for _, p := range packets { + switch rtcpPacket := p.(type) { + case *rtcp.ReceiverEstimatedMaximumBitrate: // TODO: Deprecated. + met.SetReceiverEstimatedMaximumBitrate(rtcpPacket.Bitrate) + + case *rtcp.ReceiverReport: + l := len(rtcpPacket.Reports) + if l > 0 { + // use only last report + met.SetReceiverReport(rtcpPacket.Reports[l-1]) + } + } + } + } +} + +func (met *metrics) connectionStats(connection *webrtc.PeerConnection) { + ticker := time.NewTicker(connectionStatsInterval) + defer ticker.Stop() + + for range ticker.C { + if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { + break + } + + stats := connection.GetStats() + + data, ok := stats["iceTransport"].(webrtc.TransportStats) + if ok { + met.SetIceTransportStats(data) + } + + data, ok = stats["sctpTransport"].(webrtc.TransportStats) + if ok { + met.SetSctpTransportStats(data) + } + + remoteCandidates := map[string]webrtc.ICECandidateStats{} + nominatedRemoteCandidates := map[string]struct{}{} + for _, entry := range stats { + // only remote ice candidate stats + candidate, ok := entry.(webrtc.ICECandidateStats) + if ok && candidate.Type == webrtc.StatsTypeRemoteCandidate { + met.NewICECandidate(candidate) + remoteCandidates[candidate.ID] = candidate + } + + // only nominated ice candidate pair stats + pair, ok := entry.(webrtc.ICECandidatePairStats) + if ok && pair.Nominated { + nominatedRemoteCandidates[pair.RemoteCandidateID] = struct{}{} + } + } + + iceCandidatesUsed := []webrtc.ICECandidateStats{} + for id := range nominatedRemoteCandidates { + if candidate, ok := remoteCandidates[id]; ok { + iceCandidatesUsed = append(iceCandidatesUsed, candidate) + } + } + + met.SetICECandidatesUsed(iceCandidatesUsed) + } +} From dfea7fca427e7e0cc9df4ae6da0408de0544b610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 10 Apr 2023 23:12:11 +0200 Subject: [PATCH 817/876] refactor handler. --- internal/webrtc/handler.go | 18 ++++++++---------- internal/webrtc/payload/receive.go | 8 -------- internal/webrtc/payload/send.go | 4 ---- internal/webrtc/peer.go | 27 +++++++++++++++++++-------- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 28a64a1e..bcc9a501 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -21,13 +21,8 @@ func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataCha buffer := bytes.NewBuffer(data) - hbytes := make([]byte, 3) - if _, err := buffer.Read(hbytes); err != nil { - return err - } - header := &payload.Header{} - if err := binary.Read(bytes.NewBuffer(hbytes), binary.BigEndian, header); err != nil { + if err := binary.Read(buffer, binary.BigEndian, header); err != nil { return err } @@ -35,8 +30,6 @@ func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataCha // parse body // - buffer = bytes.NewBuffer(data) - // handle cursor move event if header.Event == payload.OP_MOVE { payload := &payload.Move{} @@ -64,8 +57,8 @@ func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataCha return err } - // change header event to pong - ping.Header = payload.Header{ + // create pong header + header := payload.Header{ Event: payload.OP_PONG, Length: 19, } @@ -81,6 +74,11 @@ func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataCha } buffer := &bytes.Buffer{} + + if err := binary.Write(buffer, binary.BigEndian, header); err != nil { + return err + } + if err := binary.Write(buffer, binary.BigEndian, pong); err != nil { return err } diff --git a/internal/webrtc/payload/receive.go b/internal/webrtc/payload/receive.go index 856c067c..68ef8f77 100644 --- a/internal/webrtc/payload/receive.go +++ b/internal/webrtc/payload/receive.go @@ -13,28 +13,20 @@ const ( ) type Move struct { - Header - X uint16 Y uint16 } type Scroll struct { - Header - X int16 Y int16 } type Key struct { - Header - Key uint32 } type Ping struct { - Header - // client's timestamp split into two uint32 ClientTs1 uint32 ClientTs2 uint32 diff --git a/internal/webrtc/payload/send.go b/internal/webrtc/payload/send.go index b539084e..949e27a3 100644 --- a/internal/webrtc/payload/send.go +++ b/internal/webrtc/payload/send.go @@ -9,15 +9,11 @@ const ( ) type CursorPosition struct { - Header - X uint16 Y uint16 } type CursorImage struct { - Header - Width uint16 Height uint16 Xhot uint16 diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index f250aee3..ca9b01ad 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -202,16 +202,22 @@ func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { peer.mu.Lock() defer peer.mu.Unlock() + header := payload.Header{ + Event: payload.OP_CURSOR_POSITION, + Length: 7, + } + data := payload.CursorPosition{ - Header: payload.Header{ - Event: payload.OP_CURSOR_POSITION, - Length: 7, - }, X: uint16(x), Y: uint16(y), } buffer := &bytes.Buffer{} + + if err := binary.Write(buffer, binary.BigEndian, header); err != nil { + return err + } + if err := binary.Write(buffer, binary.BigEndian, data); err != nil { return err } @@ -223,11 +229,12 @@ func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage, img []byte) e peer.mu.Lock() defer peer.mu.Unlock() + header := payload.Header{ + Event: payload.OP_CURSOR_IMAGE, + Length: uint16(11 + len(img)), + } + data := payload.CursorImage{ - Header: payload.Header{ - Event: payload.OP_CURSOR_IMAGE, - Length: uint16(11 + len(img)), - }, Width: cur.Width, Height: cur.Height, Xhot: cur.Xhot, @@ -236,6 +243,10 @@ func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage, img []byte) e buffer := &bytes.Buffer{} + if err := binary.Write(buffer, binary.BigEndian, header); err != nil { + return err + } + if err := binary.Write(buffer, binary.BigEndian, data); err != nil { return err } From a2e0aeec77306957faba881a61dd73db17effaf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 12 Apr 2023 00:36:11 +0200 Subject: [PATCH 818/876] receiver stop error reporting. --- internal/webrtc/manager.go | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 5a5ae8ee..2aa24ce1 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -406,16 +406,16 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, logger.Info().Msgf("received new remote track") if !session.Profile().CanShareMedia { - logger.Warn().Msg("media sharing is disabled for this session") - receiver.Stop() + err := receiver.Stop() + logger.Warn().Err(err).Msg("media sharing is disabled for this session") return } // parse codec from remote track codec, ok := codec.ParseRTC(track.Codec()) if !ok { - logger.Warn().Msg("remote track with unknown codec") - receiver.Stop() + err := receiver.Stop() + logger.Warn().Err(err).Msg("remote track with unknown codec") return } @@ -428,9 +428,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, } stopped = true - receiver.Stop() + err := receiver.Stop() srcManager.Stop() - logger.Info().Msg("remote track stopped") + logger.Err(err).Msg("remote track stopped") } if track.Kind() == webrtc.RTPCodecTypeAudio { @@ -452,8 +452,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, } manager.camStop = &stopFn } else { - logger.Warn().Msg("remote track with unsupported codec type") - receiver.Stop() + err := receiver.Stop() + logger.Warn().Err(err).Msg("remote track with unsupported codec type") return } @@ -468,7 +468,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, go func() { for range ticker.C { - err := connection.WriteRTCP([]rtcp.Packet{&rtcp.PictureLossIndication{MediaSSRC: uint32(track.SSRC())}}) + err := connection.WriteRTCP([]rtcp.Packet{ + &rtcp.PictureLossIndication{ + MediaSSRC: uint32(track.SSRC()), + }, + }) + if err != nil { logger.Err(err).Msg("remote track rtcp send err") } From 728e27da34e6c308d3f72b8ce56149f60a4846db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 16 Apr 2023 23:34:02 +0200 Subject: [PATCH 819/876] minor changes, moving things around. --- internal/webrtc/manager.go | 41 +++++++++------ internal/webrtc/peer.go | 79 ++++++++++++++-------------- internal/websocket/handler/signal.go | 11 +++- pkg/types/webrtc.go | 5 +- 4 files changed, 75 insertions(+), 61 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 2aa24ce1..536d4fd3 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -26,24 +26,32 @@ import ( "github.com/demodesk/neko/pkg/types/message" ) -// the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds -const disconnectedTimeout = 4 * time.Second +const ( + // size of receiving channel used to buffer incoming TCP packets + tcpReadChanBufferSize = 50 -// the duration without network activity before a Agent is considered failed after disconnected. Default is 25 Seconds -const failedTimeout = 6 * time.Second + // size of buffer used to buffer outgoing TCP packets. Default is 4MB + tcpWriteBufferSizeInBytes = 4 * 1024 * 1024 -// how often the ICE Agent sends extra traffic if there is no activity, if media is flowing no traffic will be sent. Default is 2 seconds -const keepAliveInterval = 2 * time.Second + // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds + disconnectedTimeout = 4 * time.Second -// send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval -const rtcpPLIInterval = 3 * time.Second + // the duration without network activity before a Agent is considered failed after disconnected. Default is 25 Seconds + failedTimeout = 6 * time.Second -// how often we check the bitrate of each client. Default is 250ms -const bitrateCheckInterval = 250 * time.Millisecond + // how often the ICE Agent sends extra traffic if there is no activity, if media is flowing no traffic will be sent. Default is 2 seconds + keepAliveInterval = 2 * time.Second + + // send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval + rtcpPLIInterval = 3 * time.Second + + // how often we check the bitrate of each client. Default is 250ms + bitrateCheckInterval = 250 * time.Millisecond +) func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { configuration := webrtc.Configuration{ - SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback, + SDPSemantics: webrtc.SDPSemanticsUnifiedPlan, } if !config.ICELite { @@ -112,14 +120,14 @@ func (manager *WebRTCManagerCtx) Start() { }) if err != nil { - manager.logger.Panic().Err(err).Msg("unable to setup ice TCP mux") + manager.logger.Fatal().Err(err).Msg("unable to setup ice TCP mux") } manager.tcpMux = ice.NewTCPMuxDefault(ice.TCPMuxParams{ Listener: tcpListener, Logger: logger.NewLogger("ice-tcp"), - ReadBufferSize: 32, // receiving channel size - WriteBufferSize: 4 * 1024 * 1024, // write buffer size, 4MB + ReadBufferSize: tcpReadChanBufferSize, + WriteBufferSize: tcpWriteBufferSizeInBytes, }) } @@ -131,7 +139,7 @@ func (manager *WebRTCManagerCtx) Start() { ) if err != nil { - manager.logger.Panic().Err(err).Msg("unable to setup ice UDP mux") + manager.logger.Fatal().Err(err).Msg("unable to setup ice UDP mux") } } @@ -174,6 +182,7 @@ func (manager *WebRTCManagerCtx) newPeerConnection(bitrate int, codecs []codec.R LoggerFactory: pionlog.New(logger), } + settings.DisableMediaEngineCopy(true) settings.SetICETimeouts(disconnectedTimeout, failedTimeout, keepAliveInterval) settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost) settings.SetLite(manager.config.ICELite) @@ -361,7 +370,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, iceTrickle: manager.config.ICETrickle, } - manager.logger.Info(). + logger.Info(). Int("target_bitrate", bitrate). Msg("estimated initial peer bitrate") diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index ca9b01ad..311276c4 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -32,6 +32,10 @@ type WebRTCPeerCtx struct { iceTrickle bool } +// +// connection +// + func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) { peer.mu.Lock() defer peer.mu.Unlock() @@ -77,24 +81,11 @@ func (peer *WebRTCPeerCtx) setLocalDescription(description webrtc.SessionDescrip return peer.connection.LocalDescription(), nil } -func (peer *WebRTCPeerCtx) SetOffer(sdp string) error { +func (peer *WebRTCPeerCtx) SetRemoteDescription(desc webrtc.SessionDescription) error { peer.mu.Lock() defer peer.mu.Unlock() - return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ - SDP: sdp, - Type: webrtc.SDPTypeOffer, - }) -} - -func (peer *WebRTCPeerCtx) SetAnswer(sdp string) error { - peer.mu.Lock() - defer peer.mu.Unlock() - - return peer.connection.SetRemoteDescription(webrtc.SessionDescription{ - SDP: sdp, - Type: webrtc.SDPTypeAnswer, - }) + return peer.connection.SetRemoteDescription(desc) } func (peer *WebRTCPeerCtx) SetCandidate(candidate webrtc.ICECandidateInit) error { @@ -104,6 +95,21 @@ func (peer *WebRTCPeerCtx) SetCandidate(candidate webrtc.ICECandidateInit) error return peer.connection.AddICECandidate(candidate) } +func (peer *WebRTCPeerCtx) Destroy() { + peer.mu.Lock() + defer peer.mu.Unlock() + + if peer.connection != nil { + err := peer.connection.Close() + peer.logger.Err(err).Msg("peer connection destroyed") + peer.connection = nil + } +} + +// +// video +// + func (peer *WebRTCPeerCtx) SetVideoBitrate(peerBitrate int) error { peer.mu.Lock() defer peer.mu.Unlock() @@ -198,6 +204,24 @@ func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { return nil } +func (peer *WebRTCPeerCtx) SetVideoAuto(videoAuto bool) { + // if estimator is enabled, enable video auto bitrate + if peer.estimator != nil { + peer.videoTrack.SetVideoAuto(videoAuto) + } else { + peer.logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") + peer.videoTrack.SetVideoAuto(false) // ensure video auto is disabled + } +} + +func (peer *WebRTCPeerCtx) VideoAuto() bool { + return peer.videoTrack.VideoAuto() +} + +// +// data channel +// + func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { peer.mu.Lock() defer peer.mu.Unlock() @@ -257,28 +281,3 @@ func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage, img []byte) e return peer.dataChannel.Send(buffer.Bytes()) } - -func (peer *WebRTCPeerCtx) Destroy() { - peer.mu.Lock() - defer peer.mu.Unlock() - - if peer.connection != nil { - err := peer.connection.Close() - peer.logger.Err(err).Msg("peer connection destroyed") - peer.connection = nil - } -} - -func (peer *WebRTCPeerCtx) SetVideoAuto(videoAuto bool) { - // if estimator is enabled, enable video auto bitrate - if peer.estimator != nil { - peer.videoTrack.SetVideoAuto(videoAuto) - } else { - peer.logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") - peer.videoTrack.SetVideoAuto(false) // ensure video auto is disabled - } -} - -func (peer *WebRTCPeerCtx) VideoAuto() bool { - return peer.videoTrack.VideoAuto() -} diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index f596f61d..f25f2bc1 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -6,6 +6,7 @@ import ( "github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/types/event" "github.com/demodesk/neko/pkg/types/message" + "github.com/pion/webrtc/v3" ) func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error { @@ -83,7 +84,10 @@ func (h *MessageHandlerCtx) signalOffer(session types.Session, payload *message. return errors.New("webRTC peer does not exist") } - err := peer.SetOffer(payload.SDP) + err := peer.SetRemoteDescription(webrtc.SessionDescription{ + SDP: payload.SDP, + Type: webrtc.SDPTypeOffer, + }) if err != nil { return err } @@ -108,7 +112,10 @@ func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message return errors.New("webRTC peer does not exist") } - return peer.SetAnswer(payload.SDP) + return peer.SetRemoteDescription(webrtc.SessionDescription{ + SDP: payload.SDP, + Type: webrtc.SDPTypeAnswer, + }) } func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *message.SignalCandidate) error { diff --git a/pkg/types/webrtc.go b/pkg/types/webrtc.go index ad5c503d..b255e6da 100644 --- a/pkg/types/webrtc.go +++ b/pkg/types/webrtc.go @@ -20,9 +20,8 @@ type ICEServer struct { type WebRTCPeer interface { CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) CreateAnswer() (*webrtc.SessionDescription, error) - SetOffer(sdp string) error - SetAnswer(sdp string) error - SetCandidate(candidate webrtc.ICECandidateInit) error + SetRemoteDescription(webrtc.SessionDescription) error + SetCandidate(webrtc.ICECandidateInit) error SetVideoBitrate(bitrate int) error SetVideoID(videoID string) error From e8aab98012f8f06f2be441e942b1df1b584a4a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 17 Apr 2023 00:42:29 +0200 Subject: [PATCH 820/876] refactro cursor image and pos. --- internal/webrtc/cursor/image.go | 122 +++++++++++++++++------------ internal/webrtc/cursor/position.go | 52 +++++++----- internal/webrtc/manager.go | 64 +++++++-------- internal/webrtc/peer.go | 5 ++ 4 files changed, 139 insertions(+), 104 deletions(-) diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 36e04b5c..542bf9be 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -5,43 +5,54 @@ import ( "sync" "github.com/rs/zerolog" - "github.com/rs/zerolog/log" "github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/utils" ) -func NewImage(desktop types.DesktopManager) *ImageCtx { - return &ImageCtx{ - logger: log.With().Str("module", "webrtc").Str("submodule", "cursor-image").Logger(), +type ImageListener interface { + SendCursorImage(cur *types.CursorImage, img []byte) error +} + +type Image interface { + Start() + Shutdown() + GetCurrent() (cur *types.CursorImage, img []byte, err error) + AddListener(listener ImageListener) + RemoveListener(listener ImageListener) +} + +type imageEntry struct { + *types.CursorImage + ImagePNG []byte +} + +type image struct { + logger zerolog.Logger + desktop types.DesktopManager + + listeners map[uintptr]ImageListener + listenersMu sync.RWMutex + + cache map[uint64]*imageEntry + cacheMu sync.RWMutex + current *imageEntry + maxSerial uint64 +} + +func NewImage(logger zerolog.Logger, desktop types.DesktopManager) *image { + return &image{ + logger: logger.With().Str("submodule", "cursor-image").Logger(), desktop: desktop, - listeners: map[uintptr]*func(entry *ImageEntry){}, - cache: map[uint64]*ImageEntry{}, + listeners: map[uintptr]ImageListener{}, + cache: map[uint64]*imageEntry{}, maxSerial: 300, // TODO: Cleanup? } } -type ImageCtx struct { - logger zerolog.Logger - desktop types.DesktopManager - - listeners map[uintptr]*func(entry *ImageEntry) - listenersMu sync.Mutex - - cache map[uint64]*ImageEntry - cacheMu sync.Mutex - current *ImageEntry - maxSerial uint64 -} - -type ImageEntry struct { - Cursor *types.CursorImage - Image []byte -} - -func (manager *ImageCtx) Start() { +func (manager *image) Start() { manager.desktop.OnCursorChanged(func(serial uint64) { - entry, err := manager.GetCached(serial) + entry, err := manager.getCached(serial) if err != nil { manager.logger.Err(err).Msg("failed to get cursor image") return @@ -49,17 +60,19 @@ func (manager *ImageCtx) Start() { manager.current = entry - manager.listenersMu.Lock() - for _, emit := range manager.listeners { - (*emit)(entry) + manager.listenersMu.RLock() + for _, l := range manager.listeners { + if err := l.SendCursorImage(entry.CursorImage, entry.ImagePNG); err != nil { + manager.logger.Err(err).Msg("failed to set cursor image") + } } - manager.listenersMu.Unlock() + manager.listenersMu.RUnlock() }) manager.logger.Info().Msg("starting") } -func (manager *ImageCtx) Shutdown() { +func (manager *image) Shutdown() { manager.logger.Info().Msg("shutdown") manager.listenersMu.Lock() @@ -69,43 +82,57 @@ func (manager *ImageCtx) Shutdown() { manager.listenersMu.Unlock() } -func (manager *ImageCtx) GetCached(serial uint64) (*ImageEntry, error) { +func (manager *image) getCached(serial uint64) (*imageEntry, error) { // zero means no serial available if serial == 0 || serial > manager.maxSerial { manager.logger.Debug().Uint64("serial", serial).Msg("cache bypass") return manager.fetchEntry() } - manager.cacheMu.Lock() + manager.cacheMu.RLock() entry, ok := manager.cache[serial] - manager.cacheMu.Unlock() + manager.cacheMu.RUnlock() if ok { return entry, nil } + manager.logger.Debug().Uint64("serial", serial).Msg("cache miss") + entry, err := manager.fetchEntry() if err != nil { return nil, err } manager.cacheMu.Lock() - manager.cache[serial] = entry + manager.cache[entry.Serial] = entry manager.cacheMu.Unlock() - manager.logger.Debug().Uint64("serial", serial).Msg("cache miss") + if entry.Serial != serial { + manager.logger.Warn(). + Uint64("requested_serial", serial). + Uint64("received_serial", entry.Serial). + Msg("serial mismatch") + } + return entry, nil } -func (manager *ImageCtx) Get() (*ImageEntry, error) { +func (manager *image) GetCurrent() (cur *types.CursorImage, img []byte, err error) { if manager.current != nil { - return manager.current, nil + return manager.current.CursorImage, manager.current.ImagePNG, nil } - return manager.fetchEntry() + entry, err := manager.fetchEntry() + if err != nil { + return nil, nil, err + } + + manager.current = entry + return entry.CursorImage, entry.ImagePNG, nil } -func (manager *ImageCtx) AddListener(listener *func(entry *ImageEntry)) { +func (manager *image) AddListener(listener ImageListener) { manager.listenersMu.Lock() defer manager.listenersMu.Unlock() @@ -115,7 +142,7 @@ func (manager *ImageCtx) AddListener(listener *func(entry *ImageEntry)) { } } -func (manager *ImageCtx) RemoveListener(listener *func(entry *ImageEntry)) { +func (manager *image) RemoveListener(listener ImageListener) { manager.listenersMu.Lock() defer manager.listenersMu.Unlock() @@ -125,18 +152,17 @@ func (manager *ImageCtx) RemoveListener(listener *func(entry *ImageEntry)) { } } -func (manager *ImageCtx) fetchEntry() (*ImageEntry, error) { +func (manager *image) fetchEntry() (*imageEntry, error) { cur := manager.desktop.GetCursorImage() img, err := utils.CreatePNGImage(cur.Image) if err != nil { return nil, err } + cur.Image = nil // free memory - entry := &ImageEntry{ - Cursor: cur, - Image: img, - } - - return entry, nil + return &imageEntry{ + CursorImage: cur, + ImagePNG: img, + }, nil } diff --git a/internal/webrtc/cursor/position.go b/internal/webrtc/cursor/position.go index 6c4ea7e2..ac1147bc 100644 --- a/internal/webrtc/cursor/position.go +++ b/internal/webrtc/cursor/position.go @@ -5,24 +5,34 @@ import ( "sync" "github.com/rs/zerolog" - "github.com/rs/zerolog/log" ) -func NewPosition() *PositionCtx { - return &PositionCtx{ - logger: log.With().Str("module", "webrtc").Str("submodule", "cursor-position").Logger(), - listeners: map[uintptr]*func(x, y int){}, +type PositionListener interface { + SendCursorPosition(x, y int) error +} + +type Position interface { + Shutdown() + Set(x, y int) + AddListener(listener PositionListener) + RemoveListener(listener PositionListener) +} + +type position struct { + logger zerolog.Logger + + listeners map[uintptr]PositionListener + listenersMu sync.RWMutex +} + +func NewPosition(logger zerolog.Logger) *position { + return &position{ + logger: logger.With().Str("submodule", "cursor-position").Logger(), + listeners: map[uintptr]PositionListener{}, } } -type PositionCtx struct { - logger zerolog.Logger - - listeners map[uintptr]*func(x, y int) - listenersMu sync.Mutex -} - -func (manager *PositionCtx) Shutdown() { +func (manager *position) Shutdown() { manager.logger.Info().Msg("shutdown") manager.listenersMu.Lock() @@ -32,16 +42,18 @@ func (manager *PositionCtx) Shutdown() { manager.listenersMu.Unlock() } -func (manager *PositionCtx) Set(x, y int) { - manager.listenersMu.Lock() - defer manager.listenersMu.Unlock() +func (manager *position) Set(x, y int) { + manager.listenersMu.RLock() + defer manager.listenersMu.RUnlock() - for _, emit := range manager.listeners { - (*emit)(x, y) + for _, l := range manager.listeners { + if err := l.SendCursorPosition(x, y); err != nil { + manager.logger.Err(err).Msg("failed to set cursor position") + } } } -func (manager *PositionCtx) AddListener(listener *func(x, y int)) { +func (manager *position) AddListener(listener PositionListener) { manager.listenersMu.Lock() defer manager.listenersMu.Unlock() @@ -51,7 +63,7 @@ func (manager *PositionCtx) AddListener(listener *func(x, y int)) { } } -func (manager *PositionCtx) RemoveListener(listener *func(x, y int)) { +func (manager *position) RemoveListener(listener PositionListener) { manager.listenersMu.Lock() defer manager.listenersMu.Unlock() diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 536d4fd3..cd948db6 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -50,6 +50,8 @@ const ( ) func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { + logger := log.With().Str("module", "webrtc").Logger() + configuration := webrtc.Configuration{ SDPSemantics: webrtc.SDPSemanticsUnifiedPlan, } @@ -75,7 +77,7 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con } return &WebRTCManagerCtx{ - logger: log.With().Str("module", "webrtc").Logger(), + logger: logger, config: config, metrics: newMetricsManager(), @@ -83,8 +85,8 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con desktop: desktop, capture: capture, - curImage: cursor.NewImage(desktop), - curPosition: cursor.NewPosition(), + curImage: cursor.NewImage(logger, desktop), + curPosition: cursor.NewPosition(logger), } } @@ -96,8 +98,8 @@ type WebRTCManagerCtx struct { desktop types.DesktopManager capture types.CaptureManager - curImage *cursor.ImageCtx - curPosition *cursor.PositionCtx + curImage cursor.Image + curPosition cursor.Position webrtcConfiguration webrtc.Configuration @@ -168,7 +170,7 @@ func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { return manager.config.ICEServersFrontend } -func (manager *WebRTCManagerCtx) newPeerConnection(bitrate int, codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, cc.BandwidthEstimator, error) { +func (manager *WebRTCManagerCtx) newPeerConnection(logger zerolog.Logger, codecs []codec.RTPCodec, bitrate int) (*webrtc.PeerConnection, cc.BandwidthEstimator, error) { // create media engine engine := &webrtc.MediaEngine{} for _, codec := range codecs { @@ -288,19 +290,14 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, video := manager.capture.Video() videoCodec := video.Codec() - connection, estimator, err := manager.newPeerConnection(bitrate, []codec.RTPCodec{ + connection, estimator, err := manager.newPeerConnection(logger, []codec.RTPCodec{ audioCodec, videoCodec, - }, logger) + }, bitrate) if err != nil { return nil, err } - // if bitrate is 0, and estimator is enabled, use estimator bitrate - if bitrate == 0 && estimator != nil { - bitrate = estimator.GetTargetBitrate() - } - // asynchronously send local ICE Candidates if manager.config.ICETrickle { connection.OnICECandidate(func(candidate *webrtc.ICECandidate) { @@ -317,6 +314,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, }) } + // if bitrate is 0, and estimator is enabled, use estimator bitrate + if bitrate == 0 && estimator != nil { + bitrate = estimator.GetTargetBitrate() + } + // audio track audioTrack, err := NewTrack(logger, audioCodec, connection) if err != nil { @@ -531,42 +533,32 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, metrics.SetState(state) }) - cursorImage := func(entry *cursor.ImageEntry) { - if err := peer.SendCursorImage(entry.Cursor, entry.Image); err != nil { - logger.Err(err).Msg("could not send cursor image") - } - } - - cursorPosition := func(x, y int) { - if session.IsHost() { - return - } - - if err := peer.SendCursorPosition(x, y); err != nil { - logger.Err(err).Msg("could not send cursor position") - } - } - dataChannel.OnOpen(func() { - manager.curImage.AddListener(&cursorImage) - manager.curPosition.AddListener(&cursorPosition) + manager.curImage.AddListener(peer) + manager.curPosition.AddListener(peer) // send initial cursor image - entry, err := manager.curImage.Get() + cur, img, err := manager.curImage.GetCurrent() if err == nil { - cursorImage(entry) + err := peer.SendCursorImage(cur, img) + if err != nil { + logger.Err(err).Msg("failed to set cursor image") + } } else { logger.Err(err).Msg("failed to get cursor image") } // send initial cursor position x, y := manager.desktop.GetCursorPosition() - cursorPosition(x, y) + err = peer.SendCursorPosition(x, y) + if err != nil { + logger.Err(err).Msg("failed to set cursor position") + } }) dataChannel.OnClose(func() { - manager.curImage.RemoveListener(&cursorImage) - manager.curPosition.RemoveListener(&cursorPosition) + manager.curImage.RemoveListener(peer) + manager.curPosition.RemoveListener(peer) }) dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 311276c4..16381e12 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -226,6 +226,11 @@ func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { peer.mu.Lock() defer peer.mu.Unlock() + // do not send cursor position to host + if peer.session.IsHost() { + return nil + } + header := payload.Header{ Event: payload.OP_CURSOR_POSITION, Length: 7, From c2b29ccf21348d91898bb6f59102776b5dbc85da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 17 Apr 2023 00:47:34 +0200 Subject: [PATCH 821/876] handle use webrtc logger. --- internal/webrtc/handler.go | 14 +++++++++----- internal/webrtc/manager.go | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index bcc9a501..7d828f2a 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -9,11 +9,15 @@ import ( "github.com/demodesk/neko/internal/webrtc/payload" "github.com/demodesk/neko/pkg/types" "github.com/pion/webrtc/v3" + "github.com/rs/zerolog" ) -func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataChannel, session types.Session) error { - // add session id to logger context - logger := manager.logger.With().Str("session_id", session.ID()).Logger() +func (manager *WebRTCManagerCtx) handle( + logger zerolog.Logger, data []byte, + dataChannel *webrtc.DataChannel, + session types.Session, +) error { + isHost := session.IsHost() // // parse header @@ -38,7 +42,7 @@ func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataCha } x, y := int(payload.X), int(payload.Y) - if session.IsHost() { + if isHost { // handle active cursor movement manager.desktop.Move(x, y) manager.curPosition.Set(x, y) @@ -87,7 +91,7 @@ func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataCha } // continue only if session is host - if !session.IsHost() { + if !isHost { return nil } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index cd948db6..41311617 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -562,7 +562,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, }) dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { - if err := manager.handle(message.Data, dataChannel, session); err != nil { + if err := manager.handle(logger, message.Data, dataChannel, session); err != nil { logger.Err(err).Msg("data handle failed") } }) From 1ba561b192aecd0c02ebc28fee042f7d3048ffd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 17 Apr 2023 00:57:53 +0200 Subject: [PATCH 822/876] fix logging. --- internal/webrtc/cursor/image.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 542bf9be..78049099 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -110,8 +110,8 @@ func (manager *image) getCached(serial uint64) (*imageEntry, error) { if entry.Serial != serial { manager.logger.Warn(). - Uint64("requested_serial", serial). - Uint64("received_serial", entry.Serial). + Uint64("expected-serial", serial). + Uint64("received-serial", entry.Serial). Msg("serial mismatch") } From fcf68228334bad5e03da2909b9aef46fc6530567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 17 Apr 2023 01:10:20 +0200 Subject: [PATCH 823/876] move estimator to peer. --- internal/webrtc/manager.go | 33 +++++------------------------- internal/webrtc/peer.go | 41 ++++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 41311617..74a4b2af 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -369,7 +369,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, dataChannel: dataChannel, rtcpChannel: videoRtcp, // config - iceTrickle: manager.config.ICETrickle, + iceTrickle: manager.config.ICETrickle, + estimatorPassive: manager.config.EstimatorPassive, } logger.Info(). @@ -381,33 +382,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, return nil, err } - // if estimator is enabled, use it to change video stream - if estimator != nil { - go func() { - // use a ticker to get current client target bitrate - ticker := time.NewTicker(bitrateCheckInterval) - defer ticker.Stop() - - for range ticker.C { - targetBitrate := estimator.GetTargetBitrate() - metrics.SetReceiverEstimatedTargetBitrate(float64(targetBitrate)) - - if connection.ConnectionState() == webrtc.PeerConnectionStateClosed { - break - } - if !videoTrack.VideoAuto() { - continue - } - if !manager.config.EstimatorPassive { - err := peer.SetVideoBitrate(targetBitrate) - if err != nil { - logger.Warn().Err(err).Msg("failed to set video bitrate") - } - } - } - }() - } - connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) { logger := logger.With(). Str("kind", track.Kind().String()). @@ -602,6 +576,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, go metrics.rtcpReceiver(videoRtcp) go metrics.connectionStats(connection) + // start estimator reader + go peer.estimatorReader() + return offer, nil } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 16381e12..ddadb036 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/binary" "sync" + "time" "github.com/pion/interceptor/pkg/cc" "github.com/pion/rtcp" @@ -29,7 +30,8 @@ type WebRTCPeerCtx struct { dataChannel *webrtc.DataChannel rtcpChannel chan []rtcp.Packet // config - iceTrickle bool + iceTrickle bool + estimatorPassive bool } // @@ -106,6 +108,37 @@ func (peer *WebRTCPeerCtx) Destroy() { } } +func (peer *WebRTCPeerCtx) estimatorReader() { + // if estimator is disabled, do nothing + if peer.estimator == nil { + return + } + + // use a ticker to get current client target bitrate + ticker := time.NewTicker(bitrateCheckInterval) + defer ticker.Stop() + + for range ticker.C { + targetBitrate := peer.estimator.GetTargetBitrate() + peer.metrics.SetReceiverEstimatedTargetBitrate(float64(targetBitrate)) + + if peer.connection.ConnectionState() == webrtc.PeerConnectionStateClosed { + break + } + + if !peer.videoTrack.VideoAuto() { + continue + } + + if !peer.estimatorPassive { + err := peer.SetVideoBitrate(targetBitrate) + if err != nil { + peer.logger.Warn().Err(err).Msg("failed to set video bitrate") + } + } + } +} + // // video // @@ -116,7 +149,7 @@ func (peer *WebRTCPeerCtx) SetVideoBitrate(peerBitrate int) error { // when switching from manual to auto bitrate estimation, in case the estimator is // idle (lastBitrate > maxBitrate), we want to go back to the previous estimated bitrate - if peerBitrate == 0 && peer.estimator != nil { + if peerBitrate == 0 && peer.estimator != nil && !peer.estimatorPassive { peerBitrate = peer.estimator.GetTargetBitrate() peer.logger.Debug(). Int("peer_bitrate", peerBitrate). @@ -205,8 +238,8 @@ func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { } func (peer *WebRTCPeerCtx) SetVideoAuto(videoAuto bool) { - // if estimator is enabled, enable video auto bitrate - if peer.estimator != nil { + // if estimator is enabled and is not passive, enable video auto bitrate + if peer.estimator != nil && !peer.estimatorPassive { peer.videoTrack.SetVideoAuto(videoAuto) } else { peer.logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") From 3f375c037f6f4b00aee39de42bd27d9a26442ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 17 Apr 2023 01:21:20 +0200 Subject: [PATCH 824/876] fix track rtcp & paused. --- internal/webrtc/track.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index 886de03f..dd528bda 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -33,33 +33,31 @@ type Track struct { videoChange func(string) (bool, error) } -type option func(*Track) +type trackOption func(*Track) -func WithVideoAuto(auto bool) option { +func WithVideoAuto(auto bool) trackOption { return func(t *Track) { t.videoAuto = auto } } -func WithRtcpChan(rtcp chan []rtcp.Packet) option { +func WithRtcpChan(rtcp chan []rtcp.Packet) trackOption { return func(t *Track) { t.rtcpCh = rtcp } } -func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.PeerConnection, opts ...option) (*Track, error) { +func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.PeerConnection, opts ...trackOption) (*Track, error) { id := codec.Type.String() track, err := webrtc.NewTrackLocalStaticSample(codec.Capability, id, "stream") if err != nil { return nil, err } - logger = logger.With().Str("id", id).Logger() - t := &Track{ - logger: logger, + logger: logger.With().Str("id", id).Logger(), track: track, - rtcpCh: make(chan []rtcp.Packet), + rtcpCh: nil, sample: make(chan types.Sample), } @@ -155,8 +153,9 @@ func (t *Track) RemoveStream() { t.streamMu.Lock() defer t.streamMu.Unlock() - // if there is no stream, or paused, do nothing + // if there is no stream, or paused we don't need to remove the listener if t.stream == nil || t.paused { + t.stream = nil return } From 5a2fcc1c8a613b1888b72228c65ed19018fcef26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 17 Apr 2023 01:21:32 +0200 Subject: [PATCH 825/876] move consts. --- internal/webrtc/manager.go | 3 --- internal/webrtc/metrics.go | 5 ++++- internal/webrtc/peer.go | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 74a4b2af..25b9de89 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -44,9 +44,6 @@ const ( // send a PLI on an interval so that the publisher is pushing a keyframe every rtcpPLIInterval rtcpPLIInterval = 3 * time.Second - - // how often we check the bitrate of each client. Default is 250ms - bitrateCheckInterval = 250 * time.Millisecond ) func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx { diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 513e86a4..79cbd620 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -11,7 +11,10 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" ) -var connectionStatsInterval = 5 * time.Second +const ( + // how often to read and process webrtc connection stats + connectionStatsInterval = 5 * time.Second +) type metricsManager struct { mu sync.Mutex diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index ddadb036..4e26f5d6 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -17,6 +17,11 @@ import ( "github.com/demodesk/neko/pkg/types/message" ) +const ( + // how often to read and process bandwidth estimation reports + estimatorReadInterval = 250 * time.Millisecond +) + type WebRTCPeerCtx struct { mu sync.Mutex logger zerolog.Logger @@ -115,7 +120,7 @@ func (peer *WebRTCPeerCtx) estimatorReader() { } // use a ticker to get current client target bitrate - ticker := time.NewTicker(bitrateCheckInterval) + ticker := time.NewTicker(estimatorReadInterval) defer ticker.Stop() for range ticker.C { From 43f8fe339feb4cfa369c6c2b618f2d7c1692ae86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 17 Apr 2023 22:38:03 +0200 Subject: [PATCH 826/876] webrtc peer do not set nil conn. --- internal/webrtc/manager.go | 2 +- internal/webrtc/peer.go | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 25b9de89..31c439aa 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -487,7 +487,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, session.SetWebRTCConnected(peer, true) case webrtc.PeerConnectionStateDisconnected, webrtc.PeerConnectionStateFailed: - connection.Close() + peer.Destroy() case webrtc.PeerConnectionStateClosed: // ensure we only run this once once.Do(func() { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 4e26f5d6..91b405c9 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -106,11 +106,8 @@ func (peer *WebRTCPeerCtx) Destroy() { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection != nil { - err := peer.connection.Close() - peer.logger.Err(err).Msg("peer connection destroyed") - peer.connection = nil - } + err := peer.connection.Close() + peer.logger.Err(err).Msg("peer connection destroyed") } func (peer *WebRTCPeerCtx) estimatorReader() { From 0ea1c2870f2bcf0d31ceb28f739b5a475e5f1cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 23 Apr 2023 11:23:20 +0200 Subject: [PATCH 827/876] Refactor websocket session sync (#44) * refactor websocket peer and comment functions. * update comments. * add DestroyWebSocketPeer. --- internal/session/manager.go | 2 +- internal/session/session.go | 92 ++++++++++++++++++++++++++--------- internal/websocket/manager.go | 15 +++--- internal/websocket/peer.go | 30 ++---------- pkg/types/session.go | 6 +-- 5 files changed, 84 insertions(+), 61 deletions(-) diff --git a/internal/session/manager.go b/internal/session/manager.go index 2d1ff7ba..2da614c4 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -142,7 +142,7 @@ func (manager *SessionManagerCtx) Delete(id string) error { manager.sessionsMu.Unlock() if session.State().IsConnected { - session.GetWebSocketPeer().Destroy("session deleted") + session.DestroyWebSocketPeer("session deleted") } if session.State().IsWatching { diff --git a/internal/session/session.go b/internal/session/session.go index ec1dff77..f5118407 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -51,7 +51,7 @@ func (session *SessionCtx) profileChanged() { } if (!session.profile.CanConnect || !session.profile.CanLogin) && session.state.IsConnected { - session.GetWebSocketPeer().Destroy("profile changed") + session.DestroyWebSocketPeer("profile changed") } // update webrtc paused state @@ -82,30 +82,49 @@ func (session *SessionCtx) SetCursor(cursor types.Cursor) { // websocket // --- -func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { +// +// Connect WebSocket peer sets current peer and emits connected event. It also destroys the +// previous peer, if there was one. If the peer is already set, it will be ignored. +// +func (session *SessionCtx) ConnectWebSocketPeer(websocketPeer types.WebSocketPeer) { session.websocketMu.Lock() + isCurrentPeer := websocketPeer == session.websocketPeer session.websocketPeer, websocketPeer = websocketPeer, session.websocketPeer session.websocketMu.Unlock() - if websocketPeer != nil && websocketPeer != session.websocketPeer { + // ignore if already set + if isCurrentPeer { + return + } + + session.logger.Info().Msg("set websocket connected") + session.state.IsConnected = true + session.manager.emmiter.Emit("connected", session) + + // if there is a previous peer, destroy it + if websocketPeer != nil { websocketPeer.Destroy("connection replaced") } } -func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPeer, connected bool, delayed bool) { +// +// Disconnect WebSocket peer sets current peer to nil and emits disconnected event. It also +// allows for a delayed disconnect. That means, the peer will not be disconnected immediately, +// but after a delay. If the peer is connected again before the delay, the disconnect will be +// cancelled. +// +// If the peer is not the current peer or the peer is nil, it will be ignored. +// +func (session *SessionCtx) DisconnectWebSocketPeer(websocketPeer types.WebSocketPeer, delayed bool) { session.websocketMu.Lock() - isCurrentPeer := websocketPeer == session.websocketPeer + isCurrentPeer := websocketPeer == session.websocketPeer && websocketPeer != nil session.websocketMu.Unlock() + // ignore if not current peer if !isCurrentPeer { return } - session.logger.Info(). - Bool("connected", connected). - Bool("delayed", delayed). - Msg("set websocket connected") - // // ws delayed // @@ -114,7 +133,7 @@ func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPe if delayed { wsDelayedTimer = time.AfterFunc(WS_DELAYED_DURATION, func() { - session.SetWebSocketConnected(websocketPeer, connected, false) + session.DisconnectWebSocketPeer(websocketPeer, false) }) } @@ -126,6 +145,7 @@ func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPe session.wsDelayedMu.Unlock() if delayed { + session.logger.Info().Msg("delayed websocket disconnected") return } @@ -133,13 +153,8 @@ func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPe // not delayed // - session.state.IsConnected = connected - - if connected { - session.manager.emmiter.Emit("connected", session) - return - } - + session.logger.Info().Msg("set websocket disconnected") + session.state.IsConnected = false session.manager.emmiter.Emit("disconnected", session) session.websocketMu.Lock() @@ -149,15 +164,34 @@ func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPe session.websocketMu.Unlock() } -func (session *SessionCtx) GetWebSocketPeer() types.WebSocketPeer { +// +// Destroy WebSocket peer disconnects the peer and destroys it. It ensures that the peer is +// disconnected immediately even though normal flow would be to disconnect it delayed. +// +func (session *SessionCtx) DestroyWebSocketPeer(reason string) { session.websocketMu.Lock() - defer session.websocketMu.Unlock() + peer := session.websocketPeer + session.websocketMu.Unlock() - return session.websocketPeer + if peer == nil { + return + } + + // disconnect peer first, so that it is not used anymore + session.DisconnectWebSocketPeer(peer, false) + + // destroy it afterwards + peer.Destroy(reason) } +// +// Send event to websocket peer. +// func (session *SessionCtx) Send(event string, payload any) { - peer := session.GetWebSocketPeer() + session.websocketMu.Lock() + peer := session.websocketPeer + session.websocketMu.Unlock() + if peer != nil { peer.Send(event, payload) } @@ -167,6 +201,9 @@ func (session *SessionCtx) Send(event string, payload any) { // webrtc // --- +// +// Set webrtc peer and destroy the old one, if there is old one. +// func (session *SessionCtx) SetWebRTCPeer(webrtcPeer types.WebRTCPeer) { session.webrtcMu.Lock() session.webrtcPeer, webrtcPeer = webrtcPeer, session.webrtcPeer @@ -177,6 +214,14 @@ func (session *SessionCtx) SetWebRTCPeer(webrtcPeer types.WebRTCPeer) { } } +// +// Set if current webrtc peer is connected or not. Since there might be lefover calls from +// webrtc peer, that are not used anymore, we need to check if the webrtc peer is still the +// same as the one we are setting the connected state for. +// +// If webrtc peer is disconnected, we don't expect it to be reconnected, so we set it to nil +// and send a signal close to the client. New connection is expected to use a new webrtc peer. +// func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, connected bool) { session.webrtcMu.Lock() isCurrentPeer := webrtcPeer == session.webrtcPeer @@ -209,6 +254,9 @@ func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, conne } } +// +// Get current WebRTC peer. Nil if not connected. +// func (session *SessionCtx) GetWebRTCPeer() types.WebRTCPeer { session.webrtcMu.Lock() defer session.webrtcMu.Unlock() diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 282d14c1..5ad9a0f8 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -207,19 +207,18 @@ func (manager *WebSocketManagerCtx) Upgrade(checkOrigin types.CheckOrigin) types } func (manager *WebSocketManagerCtx) connect(connection *websocket.Conn, r *http.Request) { - // create new peer - peer := newPeer(connection) - session, err := manager.sessions.Authenticate(r) if err != nil { manager.logger.Warn().Err(err).Msg("authentication failed") - peer.Destroy(err.Error()) + newPeer(manager.logger, connection).Destroy(err.Error()) return } // add session id to all log messages logger := manager.logger.With().Str("session_id", session.ID()).Logger() - peer.setSessionID(session.ID()) + + // create new peer + peer := newPeer(logger, connection) if !session.Profile().CanConnect { logger.Warn().Msg("connection disabled") @@ -238,14 +237,12 @@ func (manager *WebSocketManagerCtx) connect(connection *websocket.Conn, r *http. logger.Info().Msg("replacing peer connection") } - session.SetWebSocketPeer(peer) - logger.Info(). Str("address", connection.RemoteAddr().String()). Str("agent", r.UserAgent()). Msg("connection started") - session.SetWebSocketConnected(peer, true, false) + session.ConnectWebSocketPeer(peer) // this is a blocking function that lives // throughout whole websocket connection @@ -277,7 +274,7 @@ func (manager *WebSocketManagerCtx) connect(connection *websocket.Conn, r *http. } } - session.SetWebSocketConnected(peer, false, delayedDisconnect) + session.DisconnectWebSocketPeer(peer, delayedDisconnect) } func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer types.WebSocketPeer, session types.Session) error { diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index e3d29e08..203caa83 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -2,12 +2,10 @@ package websocket import ( "encoding/json" - "errors" "sync" "github.com/gorilla/websocket" "github.com/rs/zerolog" - "github.com/rs/zerolog/log" "github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/types/event" @@ -21,30 +19,17 @@ type WebSocketPeerCtx struct { connection *websocket.Conn } -func newPeer(connection *websocket.Conn) *WebSocketPeerCtx { - logger := log.With(). - Str("module", "websocket"). - Str("submodule", "peer"). - Logger() - +func newPeer(logger zerolog.Logger, connection *websocket.Conn) *WebSocketPeerCtx { return &WebSocketPeerCtx{ - logger: logger, + logger: logger.With().Str("submodule", "peer").Logger(), connection: connection, } } -func (peer *WebSocketPeerCtx) setSessionID(sessionId string) { - peer.logger = peer.logger.With().Str("session_id", sessionId).Logger() -} - func (peer *WebSocketPeerCtx) Send(event string, payload any) { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil { - return - } - raw, err := json.Marshal(payload) if err != nil { peer.logger.Err(err).Str("event", event).Msg("message marshalling has failed") @@ -79,10 +64,6 @@ func (peer *WebSocketPeerCtx) Ping() error { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection == nil { - return errors.New("peer connection not found") - } - // application level heartbeat if err := peer.connection.WriteJSON(types.WebSocketMessage{ Event: event.SYSTEM_HEARTBEAT, @@ -103,9 +84,6 @@ func (peer *WebSocketPeerCtx) Destroy(reason string) { peer.mu.Lock() defer peer.mu.Unlock() - if peer.connection != nil { - err := peer.connection.Close() - peer.logger.Err(err).Msg("peer connection destroyed") - peer.connection = nil - } + err := peer.connection.Close() + peer.logger.Err(err).Msg("peer connection destroyed") } diff --git a/pkg/types/session.go b/pkg/types/session.go index 4527d687..45d5ae92 100644 --- a/pkg/types/session.go +++ b/pkg/types/session.go @@ -46,9 +46,9 @@ type Session interface { SetCursor(cursor Cursor) // websocket - SetWebSocketPeer(websocketPeer WebSocketPeer) - SetWebSocketConnected(websocketPeer WebSocketPeer, connected bool, delayed bool) - GetWebSocketPeer() WebSocketPeer + ConnectWebSocketPeer(websocketPeer WebSocketPeer) + DisconnectWebSocketPeer(websocketPeer WebSocketPeer, delayed bool) + DestroyWebSocketPeer(reason string) Send(event string, payload any) // webrtc From 3ef4c5ce0f995cdb8d744ca443669895f6e3c9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 18 Apr 2023 23:48:44 +0200 Subject: [PATCH 828/876] use DefaultRootWindow. --- pkg/xevent/xevent.c | 2 +- pkg/xorg/xorg.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/xevent/xevent.c b/pkg/xevent/xevent.c index 3791375c..9a6252a9 100644 --- a/pkg/xevent/xevent.c +++ b/pkg/xevent/xevent.c @@ -16,7 +16,7 @@ static int XEventError(Display *display, XErrorEvent *event) { void XEventLoop(char *name) { Display *display = XOpenDisplay(name); - Window root = RootWindow(display, 0); + Window root = DefaultRootWindow(display); int xfixes_event_base, xfixes_error_base; if (!XFixesQueryExtension(display, &xfixes_event_base, &xfixes_error_base)) { diff --git a/pkg/xorg/xorg.c b/pkg/xorg/xorg.c index d70e5aaa..cd39fc12 100644 --- a/pkg/xorg/xorg.c +++ b/pkg/xorg/xorg.c @@ -231,7 +231,7 @@ void XKey(KeySym keysym, int down) { Status XSetScreenConfiguration(int width, int height, short rate) { Display *display = getXDisplay(); - Window root = RootWindow(display, 0); + Window root = DefaultRootWindow(display); XRRScreenConfiguration *conf = XRRGetScreenInfo(display, root); XRRScreenSize *xrrs; @@ -260,7 +260,7 @@ Status XSetScreenConfiguration(int width, int height, short rate) { void XGetScreenConfiguration(int *width, int *height, short *rate) { Display *display = getXDisplay(); - Window root = RootWindow(display, 0); + Window root = DefaultRootWindow(display); XRRScreenConfiguration *conf = XRRGetScreenInfo(display, root); Rotation current_rotation; @@ -284,7 +284,7 @@ void XGetScreenConfiguration(int *width, int *height, short *rate) { void XGetScreenConfigurations() { Display *display = getXDisplay(); - Window root = RootWindow(display, 0); + Window root = DefaultRootWindow(display); XRRScreenSize *xrrs; int num_sizes; @@ -304,7 +304,7 @@ void XGetScreenConfigurations() { // Inspired by https://github.com/raboof/xrandr/blob/master/xrandr.c void XCreateScreenMode(int width, int height, short rate) { Display *display = getXDisplay(); - Window root = RootWindow(display, 0); + Window root = DefaultRootWindow(display); char name[128]; XRRModeInfo mode; From 47a3f6d6fb6c82628b681fd5e02068c10299e3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 19 Apr 2023 00:01:28 +0200 Subject: [PATCH 829/876] twice toggle maximizes for fullscreen. --- pkg/xevent/xevent.c | 91 ++++++++++++++++++++++++++++++++++++--------- pkg/xevent/xevent.h | 2 + 2 files changed, 76 insertions(+), 17 deletions(-) diff --git a/pkg/xevent/xevent.c b/pkg/xevent/xevent.c index 9a6252a9..38dce306 100644 --- a/pkg/xevent/xevent.c +++ b/pkg/xevent/xevent.c @@ -23,6 +23,9 @@ void XEventLoop(char *name) { return; } + // save last size id for fullscreen bug fix + SizeID last_size_id; + Atom WM_WINDOW_ROLE = XInternAtom(display, "WM_WINDOW_ROLE", 1); Atom XA_CLIPBOARD = XInternAtom(display, "CLIPBOARD", 0); XFixesSelectSelectionInput(display, root, XA_CLIPBOARD, XFixesSetSelectionOwnerNotifyMask); @@ -75,27 +78,61 @@ void XEventLoop(char *name) { goXEventUnmapNotify(window); continue; } + + // ClientMessage + if (event.type == ClientMessage) { + Window window = event.xclient.window; + + // check for window manager state change + if (event.xclient.message_type == XInternAtom(display, "_NET_WM_STATE", 0)) { + // see documentation in XWindowManagerStateEvent + Atom action = event.xclient.data.l[0]; + Atom first = event.xclient.data.l[1]; + Atom second = event.xclient.data.l[2]; + + // check if user is entering or exiting fullscreen + if (first == XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", 0)) { + // get current size id + Rotation current_rotation; + XRRScreenConfiguration *conf = XRRGetScreenInfo(display, root); + SizeID current_size_id = XRRConfigCurrentConfiguration(conf, ¤t_rotation); + + // window just went fullscreen + if (action == 1) { + // save current size id + last_size_id = current_size_id; + continue; + } + + // window just exited fullscreen + if (action == 0) { + // if size id changed, that means user changed resolution while in fullscreen + // there is a bug in some window managers that causes the window to not resize + // if it was previously maximized, so we need to unmaximize it and maximize it again + if (current_size_id != last_size_id) { + // toggle maximized state twice + XWindowManagerStateEvent(display, window, 2, + XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_VERT", 0), + XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_HORZ", 0)); + XWindowManagerStateEvent(display, window, 2, + XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_VERT", 0), + XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_HORZ", 0)); + } + } + } + } + + continue; + } + } XCloseDisplay(display); } -void XFileChooserHide(Display *display, Window window) { - Window root = RootWindow(display, 0); +static void XWindowManagerStateEvent(Display *display, Window window, ulong action, ulong first, ulong second) { + Window root = DefaultRootWindow(display); - // The WM_TRANSIENT_FOR property is defined by the [ICCCM] for managed windows. - // This specification extends the use of the property to override-redirect windows. - // If an override-redirect is a pop-up on behalf of another window, then the Client - // SHOULD set WM_TRANSIENT_FOR on the override-redirect to this other window. - // - // As an example, a Client should set WM_TRANSIENT_FOR on dropdown menus to the - // toplevel application window that contains the menubar. - - // Remove WM_TRANSIENT_FOR - Atom WM_TRANSIENT_FOR = XInternAtom(display, "WM_TRANSIENT_FOR", 0); - XDeleteProperty(display, window, WM_TRANSIENT_FOR); - - // Add _NET_WM_STATE_BELOW XClientMessageEvent clientMessageEvent; memset(&clientMessageEvent, 0, sizeof(clientMessageEvent)); @@ -115,9 +152,29 @@ void XFileChooserHide(Display *display, Window window) { clientMessageEvent.window = window; clientMessageEvent.message_type = XInternAtom(display, "_NET_WM_STATE", 0); clientMessageEvent.format = 32; - clientMessageEvent.data.l[0] = 1; - clientMessageEvent.data.l[1] = XInternAtom(display, "_NET_WM_STATE_BELOW", 0); + clientMessageEvent.data.l[0] = action; + clientMessageEvent.data.l[1] = first; + clientMessageEvent.data.l[2] = second; clientMessageEvent.data.l[3] = 1; XSendEvent(display, root, 0, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent *)&clientMessageEvent); + XFlush(display); +} + +void XFileChooserHide(Display *display, Window window) { + // The WM_TRANSIENT_FOR property is defined by the [ICCCM] for managed windows. + // This specification extends the use of the property to override-redirect windows. + // If an override-redirect is a pop-up on behalf of another window, then the Client + // SHOULD set WM_TRANSIENT_FOR on the override-redirect to this other window. + // + // As an example, a Client should set WM_TRANSIENT_FOR on dropdown menus to the + // toplevel application window that contains the menubar. + + // Remove WM_TRANSIENT_FOR + Atom WM_TRANSIENT_FOR = XInternAtom(display, "WM_TRANSIENT_FOR", 0); + XDeleteProperty(display, window, WM_TRANSIENT_FOR); + + // Add _NET_WM_STATE_BELOW + XWindowManagerStateEvent(display, window, 1, // set property + XInternAtom(display, "_NET_WM_STATE_BELOW", 0), 0); } diff --git a/pkg/xevent/xevent.h b/pkg/xevent/xevent.h index 3dfdfc0b..95097545 100644 --- a/pkg/xevent/xevent.h +++ b/pkg/xevent/xevent.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -17,4 +18,5 @@ extern int goXEventActive(); static int XEventError(Display *display, XErrorEvent *event); void XEventLoop(char *display); +static void XWindowManagerStateEvent(Display *display, Window window, ulong action, ulong first, ulong second); void XFileChooserHide(Display *display, Window window); From 466185fc2430d138d5cf95460168b01f94e29950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 19 Apr 2023 00:13:53 +0200 Subject: [PATCH 830/876] fixed by using XFlush. --- pkg/xevent/xevent.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkg/xevent/xevent.go b/pkg/xevent/xevent.go index fc91e919..3cc6ff0b 100644 --- a/pkg/xevent/xevent.go +++ b/pkg/xevent/xevent.go @@ -9,7 +9,6 @@ import "C" import ( "strings" - "time" "unsafe" "github.com/kataras/go-events" @@ -53,10 +52,6 @@ func goXEventConfigureNotify(display *C.Display, window C.Window, name *C.char, C.XFileChooserHide(display, window) - // Because first dialog is not put properly to background - time.Sleep(10 * time.Millisecond) - C.XFileChooserHide(display, window) - if file_chooser_dialog_window == 0 { file_chooser_dialog_window = uint32(window) Emmiter.Emit("file-chooser-dialog-opened") From c70c8217ded1fd4dee794776f74e9be757ce08b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 22 Apr 2023 17:06:35 +0200 Subject: [PATCH 831/876] add unminimize. --- internal/config/desktop.go | 9 +++++++++ internal/desktop/manager.go | 1 + pkg/xevent/xevent.c | 11 ++++++++++- pkg/xevent/xevent.go | 12 ++++++++++++ pkg/xevent/xevent.h | 1 + 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/internal/config/desktop.go b/internal/config/desktop.go index 8dfe1d61..4a21674d 100644 --- a/internal/config/desktop.go +++ b/internal/config/desktop.go @@ -12,6 +12,8 @@ import ( type Desktop struct { Display string + Unminimize bool + ScreenWidth int ScreenHeight int ScreenRate int16 @@ -23,6 +25,11 @@ func (Desktop) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("desktop.unminimize", true, "automatically unminimize window when it is minimized") + if err := viper.BindPFlag("desktop.unminimize", cmd.PersistentFlags().Lookup("desktop.unminimize")); err != nil { + return err + } + return nil } @@ -30,6 +37,8 @@ func (s *Desktop) Set() { // Display is provided by env variable s.Display = os.Getenv("DISPLAY") + s.Unminimize = viper.GetBool("desktop.unminimize") + s.ScreenWidth = 1280 s.ScreenHeight = 720 s.ScreenRate = 30 diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 906326be..dff9b9f6 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -45,6 +45,7 @@ func (manager *DesktopManagerCtx) Start() { Str("screen_size", fmt.Sprintf("%dx%d@%d", width, height, rate)). Msgf("setting initial screen size") + xevent.Unminimize = manager.config.Unminimize go xevent.EventLoop(manager.config.Display) // In case it was opened diff --git a/pkg/xevent/xevent.c b/pkg/xevent/xevent.c index 38dce306..991f6987 100644 --- a/pkg/xevent/xevent.c +++ b/pkg/xevent/xevent.c @@ -83,7 +83,7 @@ void XEventLoop(char *name) { if (event.type == ClientMessage) { Window window = event.xclient.window; - // check for window manager state change + // check for net window manager state (fullscreen, maximized, etc) if (event.xclient.message_type == XInternAtom(display, "_NET_WM_STATE", 0)) { // see documentation in XWindowManagerStateEvent Atom action = event.xclient.data.l[0]; @@ -122,6 +122,15 @@ void XEventLoop(char *name) { } } + // check for window manager change state (minimize, maximize, etc) + if (event.xclient.message_type == XInternAtom(display, "WM_CHANGE_STATE", 0)) { + int window_state = event.xclient.data.l[0]; + // NormalState - The client's top-level window is viewable. + // IconicState - The client's top-level window is iconic (whatever that means for this window manager). + // WithdrawnState - Neither the client's top-level window nor its icon is visible. + goXEventWMChangeState(display, window, window_state); + } + continue; } diff --git a/pkg/xevent/xevent.go b/pkg/xevent/xevent.go index 3cc6ff0b..91e449e4 100644 --- a/pkg/xevent/xevent.go +++ b/pkg/xevent/xevent.go @@ -15,6 +15,7 @@ import ( ) var Emmiter events.EventEmmiter +var Unminimize bool = false var file_chooser_dialog_window uint32 = 0 func init() { @@ -68,6 +69,17 @@ func goXEventUnmapNotify(window C.Window) { Emmiter.Emit("file-chooser-dialog-closed") } +//export goXEventWMChangeState +func goXEventWMChangeState(display *C.Display, window C.Window, window_state C.ulong) { + // if we just realized that window is minimized and we want it to be unminimized + if window_state != C.NormalState && Unminimize { + // we want to unmap and map the window to force it to redraw + C.XUnmapWindow(display, window) + C.XMapWindow(display, window) + C.XFlush(display) + } +} + //export goXEventError func goXEventError(event *C.XErrorEvent, message *C.char) { Emmiter.Emit("event-error", uint8(event.error_code), C.GoString(message), uint8(event.request_code), uint8(event.minor_code)) diff --git a/pkg/xevent/xevent.h b/pkg/xevent/xevent.h index 95097545..801e0e6e 100644 --- a/pkg/xevent/xevent.h +++ b/pkg/xevent/xevent.h @@ -12,6 +12,7 @@ extern void goXEventCursorChanged(XFixesCursorNotifyEvent event); extern void goXEventClipboardUpdated(); extern void goXEventConfigureNotify(Display *display, Window window, char *name, char *role); extern void goXEventUnmapNotify(Window window); +extern void goXEventWMChangeState(Display *display, Window window, ulong state); extern void goXEventError(XErrorEvent *event, char *message); extern int goXEventActive(); From 52b4cbcbdf894103e615f44163f4fe277aedbd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 28 Apr 2023 22:19:52 +0200 Subject: [PATCH 832/876] add path prefix to server. --- internal/config/server.go | 23 ++++++++++++++++------- internal/http/manager.go | 6 ++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/internal/config/server.go b/internal/config/server.go index 12ae00e4..44ba64ca 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -1,6 +1,8 @@ package config import ( + "path" + "github.com/spf13/cobra" "github.com/spf13/viper" @@ -8,13 +10,14 @@ import ( ) type Server struct { - Cert string - Key string - Bind string - Static string - PProf bool - Metrics bool - CORS []string + Cert string + Key string + Bind string + Static string + PathPrefix string + PProf bool + Metrics bool + CORS []string } func (Server) Init(cmd *cobra.Command) error { @@ -38,6 +41,11 @@ func (Server) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().String("server.path_prefix", "/", "path prefix for HTTP requests") + if err := viper.BindPFlag("server.path_prefix", cmd.PersistentFlags().Lookup("server.path_prefix")); err != nil { + return err + } + cmd.PersistentFlags().Bool("server.pprof", false, "enable pprof endpoint available at /debug/pprof") if err := viper.BindPFlag("server.pprof", cmd.PersistentFlags().Lookup("server.pprof")); err != nil { return err @@ -61,6 +69,7 @@ func (s *Server) Set() { s.Key = viper.GetString("server.key") s.Bind = viper.GetString("server.bind") s.Static = viper.GetString("server.static") + s.PathPrefix = path.Join("/", path.Clean(viper.GetString("server.path_prefix"))) s.PProf = viper.GetBool("server.pprof") s.Metrics = viper.GetBool("server.metrics") diff --git a/internal/http/manager.go b/internal/http/manager.go index 5450c697..eb986f93 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -36,6 +36,12 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c MaxAge: 300, // Maximum value not ignored by any of major browsers })) + if config.PathPrefix != "/" { + router.UseBypass(func(h http.Handler) http.Handler { + return http.StripPrefix(config.PathPrefix, h) + }) + } + router.Route("/api", ApiManager.Route) router.Get("/api/ws", WebSocketManager.Upgrade(func(r *http.Request) bool { From a75ae187b40fb3dcd7f79425a9d1b6ddb0457946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 28 Apr 2023 22:53:41 +0200 Subject: [PATCH 833/876] add plugin scope to settings. --- pkg/types/session.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/types/session.go b/pkg/types/session.go index 45d5ae92..b1c2057d 100644 --- a/pkg/types/session.go +++ b/pkg/types/session.go @@ -33,6 +33,9 @@ type Settings struct { ImplicitHosting bool `json:"implicit_hosting"` InactiveCursors bool `json:"inactive_cursors"` MercifulReconnect bool `json:"merciful_reconnect"` + + // plugin scope + Plugins map[string]any `json:"plugins"` } type Session interface { From a4f9f0bff5645214b2660166b1dd39d6f5387ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 28 Apr 2023 23:12:26 +0200 Subject: [PATCH 834/876] CI build variant. --- .github/workflows/build.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c207153..d46cc8cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,3 +42,40 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + + build-and-push-image-variant: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + strategy: + matrix: + include: + - variant: nvidia + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Log in to the Container registry + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ matrix.variant }} + + - name: Build and push Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + file: Dockerfile.${{ matrix.variant }} + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 173bc6b05300438cb948cd8f7edb5df4a32520b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 28 Apr 2023 23:53:05 +0200 Subject: [PATCH 835/876] CI build variant only on tag. --- .github/workflows/build.yml | 37 --------------------- .github/workflows/build_variants.yml | 48 ++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 37 deletions(-) create mode 100644 .github/workflows/build_variants.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d46cc8cd..4c207153 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,40 +42,3 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - build-and-push-image-variant: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - strategy: - matrix: - include: - - variant: nvidia - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Log in to the Container registry - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ matrix.variant }} - - - name: Build and push Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - with: - context: . - file: Dockerfile.${{ matrix.variant }} - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/build_variants.yml b/.github/workflows/build_variants.yml new file mode 100644 index 00000000..bd53c524 --- /dev/null +++ b/.github/workflows/build_variants.yml @@ -0,0 +1,48 @@ +name: Create and publish a Docker image variant + +on: + push: + tags: + - 'v*' + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-and-push-image-variant: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + strategy: + matrix: + include: + - variant: nvidia + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Log in to the Container registry + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ matrix.variant }} + + - name: Build and push Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + file: Dockerfile.${{ matrix.variant }} + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From b8fccc4d0779d30bdbaf4d397f6fe24257129b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 28 Apr 2023 23:54:01 +0200 Subject: [PATCH 836/876] add settings plugins to openapi. --- openapi.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openapi.yaml b/openapi.yaml index 0ea556ef..23b9fcca 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -1030,6 +1030,9 @@ components: type: boolean merciful_reconnect: type: boolean + plugins: + type: object + additionalProperties: true BroadcastStatus: type: object From cf4e0666fea4cedaea5df9cca1ce4c133fa2b129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 May 2023 22:41:32 +0200 Subject: [PATCH 837/876] add locked controls to settings. --- internal/api/room/control.go | 4 ++++ internal/session/manager.go | 10 ++++++++++ internal/websocket/handler/control.go | 4 ++++ pkg/types/session.go | 1 + 4 files changed, 19 insertions(+) diff --git a/internal/api/room/control.go b/internal/api/room/control.go index ad6d27b3..ddf04346 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -39,6 +39,10 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) err } session, _ := auth.GetSession(r) + if h.sessions.Settings().LockedControls && !session.Profile().IsAdmin { + return utils.HttpForbidden("controls are locked") + } + h.sessions.SetHost(session) return utils.HttpSuccess(w) diff --git a/internal/session/manager.go b/internal/session/manager.go index 2da614c4..828cbffd 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -20,6 +20,7 @@ func New(config *config.Session) *SessionManagerCtx { config: config, settings: types.Settings{ PrivateMode: false, // By default disabled. + LockedControls: false, // By default disabled. ImplicitHosting: config.ImplicitHosting, InactiveCursors: config.InactiveCursors, MercifulReconnect: config.MercifulReconnect, @@ -387,6 +388,15 @@ func (manager *SessionManagerCtx) UpdateSettings(new types.Settings) { } } + // if contols have been locked + if old.LockedControls != new.LockedControls && new.LockedControls { + // if the host is not admin, it must release controls + host, hasHost := manager.GetHost() + if hasHost && !host.Profile().IsAdmin { + manager.ClearHost() + } + } + manager.emmiter.Emit("settings_changed", new, old) } diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 9a21cd1d..2eec4a3b 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -40,6 +40,10 @@ func (h *MessageHandlerCtx) controlRequest(session types.Session) error { return ErrIsAlreadyTheHost } + if h.sessions.Settings().LockedControls && !session.Profile().IsAdmin { + return ErrIsNotAllowedToHost + } + if !h.sessions.Settings().ImplicitHosting { // tell session if there is a host if host, hasHost := h.sessions.GetHost(); hasHost { diff --git a/pkg/types/session.go b/pkg/types/session.go index b1c2057d..a872587e 100644 --- a/pkg/types/session.go +++ b/pkg/types/session.go @@ -30,6 +30,7 @@ type SessionState struct { type Settings struct { PrivateMode bool `json:"private_mode"` + LockedControls bool `json:"locked_controls"` ImplicitHosting bool `json:"implicit_hosting"` InactiveCursors bool `json:"inactive_cursors"` MercifulReconnect bool `json:"merciful_reconnect"` From 0760976b4b54bed65063bf448ae3ab41b1ea4c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 May 2023 22:48:13 +0200 Subject: [PATCH 838/876] set all settings initially using config. --- internal/config/session.go | 14 ++++++++++++++ internal/session/manager.go | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/internal/config/session.go b/internal/config/session.go index 04d9d8ce..6ab4776f 100644 --- a/internal/config/session.go +++ b/internal/config/session.go @@ -10,6 +10,8 @@ import ( type Session struct { File string + PrivateMode bool + LockedControls bool ImplicitHosting bool InactiveCursors bool MercifulReconnect bool @@ -27,6 +29,16 @@ func (Session) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("session.private_mode", false, "whether private mode should be enabled initially") + if err := viper.BindPFlag("session.private_mode", cmd.PersistentFlags().Lookup("session.private_mode")); err != nil { + return err + } + + cmd.PersistentFlags().Bool("session.locked_controls", false, "whether controls should be locked for users initially") + if err := viper.BindPFlag("session.locked_controls", cmd.PersistentFlags().Lookup("session.locked_controls")); err != nil { + return err + } + cmd.PersistentFlags().Bool("session.implicit_hosting", true, "allow implicit control switching") if err := viper.BindPFlag("session.implicit_hosting", cmd.PersistentFlags().Lookup("session.implicit_hosting")); err != nil { return err @@ -74,6 +86,8 @@ func (Session) Init(cmd *cobra.Command) error { func (s *Session) Set() { s.File = viper.GetString("session.file") + s.PrivateMode = viper.GetBool("session.private_mode") + s.LockedControls = viper.GetBool("session.locked_controls") s.ImplicitHosting = viper.GetBool("session.implicit_hosting") s.InactiveCursors = viper.GetBool("session.inactive_cursors") s.MercifulReconnect = viper.GetBool("session.merciful_reconnect") diff --git a/internal/session/manager.go b/internal/session/manager.go index 828cbffd..df853456 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -19,8 +19,8 @@ func New(config *config.Session) *SessionManagerCtx { logger: log.With().Str("module", "session").Logger(), config: config, settings: types.Settings{ - PrivateMode: false, // By default disabled. - LockedControls: false, // By default disabled. + PrivateMode: config.PrivateMode, + LockedControls: config.LockedControls, ImplicitHosting: config.ImplicitHosting, InactiveCursors: config.InactiveCursors, MercifulReconnect: config.MercifulReconnect, From 82401391c82d713a7580a04233982ff7ebd755dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 14 May 2023 22:51:21 +0200 Subject: [PATCH 839/876] add locked_controls to openapi. --- openapi.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openapi.yaml b/openapi.yaml index 23b9fcca..af4f5af9 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -1024,6 +1024,8 @@ components: properties: private_mode: type: boolean + locked_controls: + type: boolean implicit_hosting: type: boolean inactive_cursors: From 848556adbd929e09b4a4cffadde5d7ddf4315dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 15 May 2023 00:28:45 +0200 Subject: [PATCH 840/876] add time stats to state. --- internal/session/session.go | 20 ++++++++++++++++++++ pkg/types/session.go | 12 +++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/internal/session/session.go b/internal/session/session.go index f5118407..716f1115 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -98,7 +98,13 @@ func (session *SessionCtx) ConnectWebSocketPeer(websocketPeer types.WebSocketPee } session.logger.Info().Msg("set websocket connected") + + // update state + now := time.Now() session.state.IsConnected = true + session.state.ConnectedSince = &now + session.state.NotConnectedSince = nil + session.manager.emmiter.Emit("connected", session) // if there is a previous peer, destroy it @@ -154,7 +160,12 @@ func (session *SessionCtx) DisconnectWebSocketPeer(websocketPeer types.WebSocket // session.logger.Info().Msg("set websocket disconnected") + + now := time.Now() session.state.IsConnected = false + session.state.ConnectedSince = nil + session.state.NotConnectedSince = &now + session.manager.emmiter.Emit("disconnected", session) session.websocketMu.Lock() @@ -235,7 +246,16 @@ func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, conne Bool("connected", connected). Msg("set webrtc connected") + // update state session.state.IsWatching = connected + if now := time.Now(); connected { + session.state.WatchingSince = &now + session.state.NotWatchingSince = nil + } else { + session.state.WatchingSince = nil + session.state.NotWatchingSince = &now + } + session.manager.emmiter.Emit("state_changed", session) if connected { diff --git a/pkg/types/session.go b/pkg/types/session.go index a872587e..e901ad7a 100644 --- a/pkg/types/session.go +++ b/pkg/types/session.go @@ -3,6 +3,7 @@ package types import ( "errors" "net/http" + "time" ) var ( @@ -25,7 +26,16 @@ type SessionProfile struct { type SessionState struct { IsConnected bool `json:"is_connected"` - IsWatching bool `json:"is_watching"` + // when the session was last connected + ConnectedSince *time.Time `json:"connected_since,omitempty"` + // when the session was last not connected + NotConnectedSince *time.Time `json:"not_connected_since,omitempty"` + + IsWatching bool `json:"is_watching"` + // when the session was last watching + WatchingSince *time.Time `json:"watching_since,omitempty"` + // when the session was last not watching + NotWatchingSince *time.Time `json:"not_watching_since,omitempty"` } type Settings struct { From 8660c1a2564e03baf5efa1241a466659ff659d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 15 May 2023 00:34:37 +0200 Subject: [PATCH 841/876] add sessions to API. --- internal/api/router.go | 1 + internal/api/session.go | 13 +++++++++++++ openapi.yaml | 19 +++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/internal/api/router.go b/internal/api/router.go index 3cf1d218..dbe877a9 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -45,6 +45,7 @@ func (api *ApiManagerCtx) Route(r types.Router) { r.Post("/logout", api.Logout) r.Get("/whoami", api.Whoami) + r.Get("/sessions", api.Sessions) membersHandler := members.New(api.members) r.Route("/members", membersHandler.Route) diff --git a/internal/api/session.go b/internal/api/session.go index e221d1d6..e1991ad6 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -81,3 +81,16 @@ func (api *ApiManagerCtx) Whoami(w http.ResponseWriter, r *http.Request) error { State: session.State(), }) } + +func (api *ApiManagerCtx) Sessions(w http.ResponseWriter, r *http.Request) error { + sessions := []SessionDataPayload{} + for _, session := range api.sessions.List() { + sessions = append(sessions, SessionDataPayload{ + ID: session.ID(), + Profile: session.Profile(), + State: session.State(), + }) + } + + return utils.HttpSuccess(w, sessions) +} diff --git a/openapi.yaml b/openapi.yaml index af4f5af9..db9fa981 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -116,6 +116,25 @@ paths: $ref: '#/components/responses/Unauthorized' '403': $ref: '#/components/responses/Forbidden' + /api/sessions: + get: + tags: + - session + summary: get sessions + operationId: sessionsGet + responses: + '200': + description: OK + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/SessionData' + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' # # room From 3e8d686c0f37de117f745da34d01e09a8dfeeddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 15 May 2023 19:29:39 +0200 Subject: [PATCH 842/876] Bandwidth estimator refactor (#46) * rewrite to use stream selector. * WIP. * add nacks to metrics. * add estimate trend. * estimator based on trend detector. * add estimator unstable duration. * add estimator debug. * add stalled duration. * estimator move values to config. * change default estimator values. * minor style changes. * fix websocket video messages. * replace video track with ivdeo id. --- internal/capture/buckets/buckets.go | 145 ------------ internal/capture/buckets/buckets_test.go | 83 ------- internal/capture/buckets/queue.go | 88 ------- internal/capture/buckets/queue_test.go | 99 -------- internal/capture/manager.go | 31 +-- internal/capture/streamselector.go | 206 +++++++++++++++++ internal/capture/streamsink.go | 59 ++--- internal/config/webrtc.go | 81 ++++++- internal/webrtc/manager.go | 91 ++++---- internal/webrtc/metrics.go | 25 +- internal/webrtc/peer.go | 279 +++++++++++++++++------ internal/webrtc/track.go | 73 ++---- internal/websocket/handler/signal.go | 48 ++-- pkg/types/capture.go | 141 ++++++------ pkg/types/message/messages.go | 9 +- pkg/types/webrtc.go | 9 +- pkg/utils/trenddetector.go | 153 +++++++++++++ 17 files changed, 845 insertions(+), 775 deletions(-) delete mode 100644 internal/capture/buckets/buckets.go delete mode 100644 internal/capture/buckets/buckets_test.go delete mode 100644 internal/capture/buckets/queue.go delete mode 100644 internal/capture/buckets/queue_test.go create mode 100644 internal/capture/streamselector.go create mode 100644 pkg/utils/trenddetector.go diff --git a/internal/capture/buckets/buckets.go b/internal/capture/buckets/buckets.go deleted file mode 100644 index 6d0c9870..00000000 --- a/internal/capture/buckets/buckets.go +++ /dev/null @@ -1,145 +0,0 @@ -package buckets - -import ( - "errors" - "sort" - - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" - - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/codec" -) - -type BucketsManagerCtx struct { - logger zerolog.Logger - codec codec.RTPCodec - streams map[string]types.StreamSinkManager - streamIDs []string -} - -func BucketsNew(codec codec.RTPCodec, streams map[string]types.StreamSinkManager, streamIDs []string) *BucketsManagerCtx { - logger := log.With(). - Str("module", "capture"). - Str("submodule", "buckets"). - Logger() - - return &BucketsManagerCtx{ - logger: logger, - codec: codec, - streams: streams, - streamIDs: streamIDs, - } -} - -func (manager *BucketsManagerCtx) Shutdown() { - manager.logger.Info().Msgf("shutdown") - - manager.DestroyAll() -} - -func (manager *BucketsManagerCtx) DestroyAll() { - for _, stream := range manager.streams { - if stream.Started() { - stream.DestroyPipeline() - } - } -} - -func (manager *BucketsManagerCtx) RecreateAll() error { - for _, stream := range manager.streams { - if stream.Started() { - err := stream.CreatePipeline() - if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { - return err - } - } - } - return nil -} - -func (manager *BucketsManagerCtx) IDs() []string { - return manager.streamIDs -} - -func (manager *BucketsManagerCtx) Codec() codec.RTPCodec { - return manager.codec -} - -func (manager *BucketsManagerCtx) SetReceiver(receiver types.Receiver) { - // bitrate history is per receiver - bitrateHistory := &queue{} - - receiver.OnBitrateChange(func(peerBitrate int) (bool, error) { - bitrate := peerBitrate - if receiver.VideoAuto() { - bitrate = bitrateHistory.normaliseBitrate(bitrate) - } - - stream := manager.findNearestStream(bitrate) - streamID := stream.ID() - - // TODO: make this less noisy in logs - manager.logger.Debug(). - Str("video_id", streamID). - Int("len", bitrateHistory.len()). - Int("peer_bitrate", peerBitrate). - Int("bitrate", bitrate). - Msg("change video bitrate") - - return receiver.SetStream(stream) - }) - - receiver.OnVideoChange(func(videoID string) (bool, error) { - stream := manager.streams[videoID] - manager.logger.Info(). - Str("video_id", videoID). - Msg("video change") - - return receiver.SetStream(stream) - }) -} - -func (manager *BucketsManagerCtx) findNearestStream(peerBitrate int) types.StreamSinkManager { - type streamDiff struct { - id string - bitrateDiff int - } - - sortDiff := func(a, b int) bool { - switch { - case a < 0 && b < 0: - return a > b - case a >= 0: - if b >= 0 { - return a <= b - } - return true - } - return false - } - - var diffs []streamDiff - - for _, stream := range manager.streams { - diffs = append(diffs, streamDiff{ - id: stream.ID(), - bitrateDiff: peerBitrate - stream.Bitrate(), - }) - } - - sort.Slice(diffs, func(i, j int) bool { - return sortDiff(diffs[i].bitrateDiff, diffs[j].bitrateDiff) - }) - - bestDiff := diffs[0] - - return manager.streams[bestDiff.id] -} - -func (manager *BucketsManagerCtx) RemoveReceiver(receiver types.Receiver) error { - receiver.OnBitrateChange(nil) - receiver.OnVideoChange(nil) - receiver.RemoveStream() - return nil -} diff --git a/internal/capture/buckets/buckets_test.go b/internal/capture/buckets/buckets_test.go deleted file mode 100644 index 9fedcdd2..00000000 --- a/internal/capture/buckets/buckets_test.go +++ /dev/null @@ -1,83 +0,0 @@ -package buckets - -import ( - "reflect" - "testing" - - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/codec" -) - -func TestBucketsManagerCtx_FindNearestStream(t *testing.T) { - type fields struct { - codec codec.RTPCodec - streams map[string]types.StreamSinkManager - } - type args struct { - peerBitrate int - } - tests := []struct { - name string - fields fields - args args - want types.StreamSinkManager - }{ - { - name: "findNearestStream", - fields: fields{ - streams: map[string]types.StreamSinkManager{ - "1": mockStreamSink{ - id: "1", - bitrate: 500, - }, - "2": mockStreamSink{ - id: "2", - bitrate: 750, - }, - "3": mockStreamSink{ - id: "3", - bitrate: 1000, - }, - "4": mockStreamSink{ - id: "4", - bitrate: 1250, - }, - "5": mockStreamSink{ - id: "5", - bitrate: 1700, - }, - }, - }, - args: args{ - peerBitrate: 950, - }, - want: mockStreamSink{ - id: "2", - bitrate: 750, - }, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - m := BucketsNew(tt.fields.codec, tt.fields.streams, []string{}) - - if got := m.findNearestStream(tt.args.peerBitrate); !reflect.DeepEqual(got, tt.want) { - t.Errorf("findNearestStream() = %v, want %v", got, tt.want) - } - }) - } -} - -type mockStreamSink struct { - id string - bitrate int - types.StreamSinkManager -} - -func (m mockStreamSink) ID() string { - return m.id -} - -func (m mockStreamSink) Bitrate() int { - return m.bitrate -} diff --git a/internal/capture/buckets/queue.go b/internal/capture/buckets/queue.go deleted file mode 100644 index e79eb635..00000000 --- a/internal/capture/buckets/queue.go +++ /dev/null @@ -1,88 +0,0 @@ -package buckets - -import ( - "math" - "sync" - "time" -) - -type queue struct { - sync.Mutex - q []elem -} - -type elem struct { - created time.Time - bitrate int -} - -func (q *queue) push(v elem) { - q.Lock() - defer q.Unlock() - - // if the first element is older than 10 seconds, remove it - if len(q.q) > 0 && time.Since(q.q[0].created) > 10*time.Second { - q.q = q.q[1:] - } - q.q = append(q.q, v) -} - -func (q *queue) len() int { - q.Lock() - defer q.Unlock() - return len(q.q) -} - -func (q *queue) avg() int { - q.Lock() - defer q.Unlock() - if len(q.q) == 0 { - return 0 - } - sum := 0 - for _, v := range q.q { - sum += v.bitrate - } - return sum / len(q.q) -} - -func (q *queue) avgLastN(n int) int { - if n <= 0 { - return q.avg() - } - q.Lock() - defer q.Unlock() - if len(q.q) == 0 { - return 0 - } - sum := 0 - for _, v := range q.q[len(q.q)-n:] { - sum += v.bitrate - } - return sum / n -} - -func (q *queue) normaliseBitrate(currentBitrate int) int { - avgBitrate := float64(q.avg()) - histLen := float64(q.len()) - - q.push(elem{ - bitrate: currentBitrate, - created: time.Now(), - }) - - if avgBitrate == 0 || histLen == 0 || currentBitrate == 0 { - return currentBitrate - } - - lastN := int(math.Floor(float64(currentBitrate) / avgBitrate * histLen)) - if lastN > q.len() { - lastN = q.len() - } - - if lastN == 0 { - return currentBitrate - } - - return q.avgLastN(lastN) -} diff --git a/internal/capture/buckets/queue_test.go b/internal/capture/buckets/queue_test.go deleted file mode 100644 index 4deda5f8..00000000 --- a/internal/capture/buckets/queue_test.go +++ /dev/null @@ -1,99 +0,0 @@ -package buckets - -import "testing" - -func Queue_normaliseBitrate(t *testing.T) { - type fields struct { - queue *queue - } - type args struct { - currentBitrate int - } - tests := []struct { - name string - fields fields - args args - want []int - }{ - { - name: "normaliseBitrate: big drop", - fields: fields{ - queue: &queue{ - q: []elem{ - {bitrate: 900}, - {bitrate: 750}, - {bitrate: 780}, - {bitrate: 1100}, - {bitrate: 950}, - {bitrate: 700}, - {bitrate: 800}, - {bitrate: 900}, - {bitrate: 1000}, - {bitrate: 1100}, - // avg = 898 - }, - }, - }, - args: args{ - currentBitrate: 350, - }, - want: []int{816, 700, 537, 350, 350}, - }, { - name: "normaliseBitrate: small drop", - fields: fields{ - queue: &queue{ - q: []elem{ - {bitrate: 900}, - {bitrate: 750}, - {bitrate: 780}, - {bitrate: 1100}, - {bitrate: 950}, - {bitrate: 700}, - {bitrate: 800}, - {bitrate: 900}, - {bitrate: 1000}, - {bitrate: 1100}, - // avg = 898 - }, - }, - }, - args: args{ - currentBitrate: 700, - }, - want: []int{878, 842, 825, 825, 812, 787, 750, 700}, - }, { - name: "normaliseBitrate", - fields: fields{ - queue: &queue{ - q: []elem{ - {bitrate: 900}, - {bitrate: 750}, - {bitrate: 780}, - {bitrate: 1100}, - {bitrate: 950}, - {bitrate: 700}, - {bitrate: 800}, - {bitrate: 900}, - {bitrate: 1000}, - {bitrate: 1100}, - // avg = 898 - }, - }, - }, - args: args{ - currentBitrate: 1350, - }, - want: []int{943, 1003, 1060, 1085}, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - m := tt.fields.queue - for i := 0; i < len(tt.want); i++ { - if got := m.normaliseBitrate(tt.args.currentBitrate); got != tt.want[i] { - t.Errorf("normaliseBitrate() [%d] = %v, want %v", i, got, tt.want[i]) - } - } - }) - } -} diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 3b8288f3..2a71485e 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -8,7 +8,6 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/demodesk/neko/internal/capture/buckets" "github.com/demodesk/neko/internal/config" "github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/types/codec" @@ -23,7 +22,7 @@ type CaptureManagerCtx struct { broadcast *BroacastManagerCtx screencast *ScreencastManagerCtx audio *StreamSinkManagerCtx - video types.BucketsManager + video *StreamSelectorManagerCtx // sources webcam *StreamSrcManagerCtx @@ -68,13 +67,8 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt Str("pipeline", pipeline). Msg("syntax check for video stream pipeline passed") - getVideoBitrate := pipelineConf.GetBitrateFn(desktop.GetScreenSize) - if _, err = getVideoBitrate(); err != nil { - logger.Panic().Err(err).Msg("unable to get video bitrate") - } - // append to videos - videos[video_id] = streamSinkNew(config.VideoCodec, createPipeline, video_id, getVideoBitrate) + videos[video_id] = streamSinkNew(config.VideoCodec, createPipeline, video_id) } return &CaptureManagerCtx{ @@ -140,8 +134,8 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt "! %s "+ "! appsink name=appsink", config.AudioDevice, config.AudioCodec.Pipeline, ), nil - }, "audio", nil), - video: buckets.BucketsNew(config.VideoCodec, videos, config.VideoIDs), + }, "audio"), + video: streamSelectorNew(config.VideoCodec, videos, config.VideoIDs), // sources webcam: streamSrcNew(config.WebcamEnabled, map[string]string{ @@ -202,7 +196,7 @@ func (manager *CaptureManagerCtx) Start() { } manager.desktop.OnBeforeScreenSizeChange(func() { - manager.video.DestroyAll() + manager.video.destroyPipelines() if manager.broadcast.Started() { manager.broadcast.destroyPipeline() @@ -214,7 +208,7 @@ func (manager *CaptureManagerCtx) Start() { }) manager.desktop.OnAfterScreenSizeChange(func() { - err := manager.video.RecreateAll() + err := manager.video.recreatePipelines() if err != nil { manager.logger.Panic().Err(err).Msg("unable to recreate video pipelines") } @@ -242,7 +236,7 @@ func (manager *CaptureManagerCtx) Shutdown() error { manager.screencast.shutdown() manager.audio.shutdown() - manager.video.Shutdown() + manager.video.shutdown() manager.webcam.shutdown() manager.microphone.shutdown() @@ -250,15 +244,6 @@ func (manager *CaptureManagerCtx) Shutdown() error { return nil } -func (manager *CaptureManagerCtx) GetBitrateFromVideoID(videoID string) (int, error) { - cfg, ok := manager.config.VideoPipelines[videoID] - if !ok { - return 0, fmt.Errorf("video config not found for %s", videoID) - } - - return cfg.GetBitrateFn(manager.desktop.GetScreenSize)() -} - func (manager *CaptureManagerCtx) Broadcast() types.BroadcastManager { return manager.broadcast } @@ -271,7 +256,7 @@ func (manager *CaptureManagerCtx) Audio() types.StreamSinkManager { return manager.audio } -func (manager *CaptureManagerCtx) Video() types.BucketsManager { +func (manager *CaptureManagerCtx) Video() types.StreamSelectorManager { return manager.video } diff --git a/internal/capture/streamselector.go b/internal/capture/streamselector.go new file mode 100644 index 00000000..fd139032 --- /dev/null +++ b/internal/capture/streamselector.go @@ -0,0 +1,206 @@ +package capture + +import ( + "errors" + "sort" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" +) + +type StreamSelectorManagerCtx struct { + logger zerolog.Logger + codec codec.RTPCodec + streams map[string]types.StreamSinkManager + streamIDs []string +} + +func streamSelectorNew(codec codec.RTPCodec, streams map[string]types.StreamSinkManager, streamIDs []string) *StreamSelectorManagerCtx { + logger := log.With(). + Str("module", "capture"). + Str("submodule", "stream-selector"). + Logger() + + return &StreamSelectorManagerCtx{ + logger: logger, + codec: codec, + streams: streams, + streamIDs: streamIDs, + } +} + +func (manager *StreamSelectorManagerCtx) shutdown() { + manager.logger.Info().Msgf("shutdown") + + manager.destroyPipelines() +} + +func (manager *StreamSelectorManagerCtx) destroyPipelines() { + for _, stream := range manager.streams { + if stream.Started() { + stream.DestroyPipeline() + } + } +} + +func (manager *StreamSelectorManagerCtx) recreatePipelines() error { + for _, stream := range manager.streams { + if stream.Started() { + err := stream.CreatePipeline() + if err != nil && !errors.Is(err, types.ErrCapturePipelineAlreadyExists) { + return err + } + } + } + return nil +} + +func (manager *StreamSelectorManagerCtx) IDs() []string { + return manager.streamIDs +} + +func (manager *StreamSelectorManagerCtx) Codec() codec.RTPCodec { + return manager.codec +} + +func (manager *StreamSelectorManagerCtx) GetStream(selector types.StreamSelector) (types.StreamSinkManager, bool) { + // select stream by ID + if selector.ID != "" { + // select lower stream + if selector.Type == types.StreamSelectorTypeLower { + var lastStream types.StreamSinkManager + for i := len(manager.streamIDs) - 1; i >= 0; i-- { + streamID := manager.streamIDs[i] + if streamID == selector.ID { + return lastStream, lastStream != nil + } + stream, ok := manager.streams[streamID] + if ok { + lastStream = stream + } + } + // we couldn't find a lower stream + return nil, false + } + + // select higher stream + if selector.Type == types.StreamSelectorTypeHigher { + var lastStream types.StreamSinkManager + for _, streamID := range manager.streamIDs { + if streamID == selector.ID { + return lastStream, lastStream != nil + } + stream, ok := manager.streams[streamID] + if ok { + lastStream = stream + } + } + // we couldn't find a higher stream + return nil, false + } + + // select exact stream + stream, ok := manager.streams[selector.ID] + return stream, ok + } + + // select stream by bitrate + if selector.Bitrate != 0 { + // select stream by nearest bitrate + if selector.Type == types.StreamSelectorTypeNearest { + return manager.nearestBitrate(selector.Bitrate), true + } + + // select lower stream + if selector.Type == types.StreamSelectorTypeLower { + // start from the highest stream, and go down, until we find a lower stream + for i := len(manager.streamIDs) - 1; i >= 0; i-- { + streamID := manager.streamIDs[i] + stream := manager.streams[streamID] + // if stream should be considered in calculation + considered := stream.Bitrate() != 0 && stream.Started() + if considered && stream.Bitrate() < selector.Bitrate { + return stream, true + } + } + // we couldn't find a lower stream + return nil, false + } + + // select higher stream + if selector.Type == types.StreamSelectorTypeHigher { + // start from the lowest stream, and go up, until we find a higher stream + for _, streamID := range manager.streamIDs { + stream := manager.streams[streamID] + // if stream should be considered in calculation + considered := stream.Bitrate() != 0 && stream.Started() + if considered && stream.Bitrate() > selector.Bitrate { + return stream, true + } + } + // we couldn't find a higher stream + return nil, false + } + + // select stream by exact bitrate + for _, stream := range manager.streams { + if stream.Bitrate() == selector.Bitrate { + return stream, true + } + } + } + + // we couldn't find a stream + return nil, false +} + +// TODO: This is a very naive implementation, we should use a binary search instead. +func (manager *StreamSelectorManagerCtx) nearestBitrate(bitrate uint64) types.StreamSinkManager { + type streamDiff struct { + id string + bitrateDiff int + } + + sortDiff := func(a, b int) bool { + switch { + case a < 0 && b < 0: + return a > b + case a >= 0: + if b >= 0 { + return a <= b + } + return true + } + return false + } + + var diffs []streamDiff + + for _, stream := range manager.streams { + // if stream should be considered in calculation + considered := stream.Bitrate() != 0 && stream.Started() + if !considered { + continue + } + diffs = append(diffs, streamDiff{ + id: stream.ID(), + bitrateDiff: int(bitrate) - int(stream.Bitrate()), + }) + } + + // no streams available + if len(diffs) == 0 { + // return first (lowest) stream + return manager.streams[manager.streamIDs[0]] + } + + sort.Slice(diffs, func(i, j int) bool { + return sortDiff(diffs[i].bitrateDiff, diffs[j].bitrateDiff) + }) + + bestDiff := diffs[0] + return manager.streams[bestDiff.id] +} diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index 8df41a54..99703bba 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -21,9 +21,10 @@ import ( var moveSinkListenerMu = sync.Mutex{} type StreamSinkManagerCtx struct { - id string - getBitrate func() (int, error) - waitForKf bool // wait for a keyframe before sending samples + id string + + // wait for a keyframe before sending samples + waitForKf bool bitrate uint64 // atomic brBuckets map[int]float64 @@ -48,22 +49,23 @@ type StreamSinkManagerCtx struct { pipelinesActive prometheus.Gauge } -func streamSinkNew(c codec.RTPCodec, pipelineFn func() (string, error), id string, getBitrate func() (int, error)) *StreamSinkManagerCtx { +func streamSinkNew(codec codec.RTPCodec, pipelineFn func() (string, error), id string) *StreamSinkManagerCtx { logger := log.With(). Str("module", "capture"). Str("submodule", "stream-sink"). Str("id", id).Logger() manager := &StreamSinkManagerCtx{ - id: id, - getBitrate: getBitrate, - // only wait for keyframes if the codec is video - waitForKf: c.IsVideo(), + id: id, + // only wait for keyframes if the codec is video + waitForKf: codec.IsVideo(), + + bitrate: 0, brBuckets: map[int]float64{}, logger: logger, - codec: c, + codec: codec, pipelineFn: pipelineFn, listeners: map[uintptr]types.SampleListener{}, @@ -77,8 +79,8 @@ func streamSinkNew(c codec.RTPCodec, pipelineFn func() (string, error), id strin Help: "Current number of listeners for a pipeline.", ConstLabels: map[string]string{ "video_id": id, - "codec_name": c.Name, - "codec_type": c.Type.String(), + "codec_name": codec.Name, + "codec_type": codec.Type.String(), }, }), totalBytes: promauto.NewCounter(prometheus.CounterOpts{ @@ -88,8 +90,8 @@ func streamSinkNew(c codec.RTPCodec, pipelineFn func() (string, error), id strin Help: "Total number of bytes created by the pipeline.", ConstLabels: map[string]string{ "video_id": id, - "codec_name": c.Name, - "codec_type": c.Type.String(), + "codec_name": codec.Name, + "codec_type": codec.Type.String(), }, }), pipelinesCounter: promauto.NewCounter(prometheus.CounterOpts{ @@ -100,8 +102,8 @@ func streamSinkNew(c codec.RTPCodec, pipelineFn func() (string, error), id strin ConstLabels: map[string]string{ "submodule": "streamsink", "video_id": id, - "codec_name": c.Name, - "codec_type": c.Type.String(), + "codec_name": codec.Name, + "codec_type": codec.Type.String(), }, }), pipelinesActive: promauto.NewGauge(prometheus.GaugeOpts{ @@ -112,8 +114,8 @@ func streamSinkNew(c codec.RTPCodec, pipelineFn func() (string, error), id strin ConstLabels: map[string]string{ "submodule": "streamsink", "video_id": id, - "codec_name": c.Name, - "codec_type": c.Type.String(), + "codec_name": codec.Name, + "codec_type": codec.Type.String(), }, }), } @@ -141,27 +143,8 @@ func (manager *StreamSinkManagerCtx) ID() string { return manager.id } -func (manager *StreamSinkManagerCtx) Bitrate() int { - // TODO: fix bitrate switching calculation - // return real bitrate if available - //realBitrate := atomic.LoadUint64(&manager.bitrate) - //if realBitrate != 0 { - // return int(realBitrate) - //} - - // if we do not have function to estimate bitrate, return 0 - if manager.getBitrate == nil { - return 0 - } - - // recalculate bitrate every time, take screen resolution (and fps) into account - // we called this function during startup, so it shouldn't error here - bitrate, err := manager.getBitrate() - if err != nil { - manager.logger.Err(err).Msg("unexpected error while getting bitrate") - } - - return bitrate +func (manager *StreamSinkManagerCtx) Bitrate() uint64 { + return atomic.LoadUint64(&manager.bitrate) } func (manager *StreamSinkManagerCtx) Codec() codec.RTPCodec { diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 54a40b5b..40fad4bd 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -3,6 +3,7 @@ package config import ( "strconv" "strings" + "time" "github.com/rs/zerolog/log" "github.com/spf13/cobra" @@ -15,6 +16,28 @@ import ( // default stun server const defStunSrv = "stun:stun.l.google.com:19302" +type WebRTCEstimator struct { + Enabled bool + Passive bool + Debug bool + InitialBitrate int + + // how often to read and process bandwidth estimation reports + ReadInterval time.Duration + // how long to wait for stable connection (only neutral or upward trend) before upgrading + StableDuration time.Duration + // how long to wait for unstable connection (downward trend) before downgrading + UnstableDuration time.Duration + // how long to wait for stalled connection (neutral trend with low bandwidth) before downgrading + StalledDuration time.Duration + // how long to wait before downgrading again after previous downgrade + DowngradeBackoff time.Duration + // how long to wait before upgrading again after previous upgrade + UpgradeBackoff time.Duration + // how bigger the difference between estimated and stream bitrate must be to trigger upgrade/downgrade + DiffThreshold float64 +} + type WebRTC struct { ICELite bool ICETrickle bool @@ -28,9 +51,7 @@ type WebRTC struct { NAT1To1IPs []string IpRetrievalUrl string - EstimatorEnabled bool - EstimatorPassive bool - EstimatorInitialBitrate int + Estimator WebRTCEstimator } func (WebRTC) Init(cmd *cobra.Command) error { @@ -96,11 +117,51 @@ func (WebRTC) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("webrtc.estimator.debug", false, "enables debug logging for the bandwidth estimator") + if err := viper.BindPFlag("webrtc.estimator.debug", cmd.PersistentFlags().Lookup("webrtc.estimator.debug")); err != nil { + return err + } + cmd.PersistentFlags().Int("webrtc.estimator.initial_bitrate", 1_000_000, "initial bitrate for the bandwidth estimator") if err := viper.BindPFlag("webrtc.estimator.initial_bitrate", cmd.PersistentFlags().Lookup("webrtc.estimator.initial_bitrate")); err != nil { return err } + cmd.PersistentFlags().Duration("webrtc.estimator.read_interval", 2*time.Second, "how often to read and process bandwidth estimation reports") + if err := viper.BindPFlag("webrtc.estimator.read_interval", cmd.PersistentFlags().Lookup("webrtc.estimator.read_interval")); err != nil { + return err + } + + cmd.PersistentFlags().Duration("webrtc.estimator.stable_duration", 12*time.Second, "how long to wait for stable connection (upward or neutral trend) before upgrading") + if err := viper.BindPFlag("webrtc.estimator.stable_duration", cmd.PersistentFlags().Lookup("webrtc.estimator.stable_duration")); err != nil { + return err + } + + cmd.PersistentFlags().Duration("webrtc.estimator.unstable_duration", 6*time.Second, "how long to wait for stalled connection (neutral trend with low bandwidth) before downgrading") + if err := viper.BindPFlag("webrtc.estimator.unstable_duration", cmd.PersistentFlags().Lookup("webrtc.estimator.unstable_duration")); err != nil { + return err + } + + cmd.PersistentFlags().Duration("webrtc.estimator.stalled_duration", 24*time.Second, "how long to wait for stalled bandwidth estimation before downgrading") + if err := viper.BindPFlag("webrtc.estimator.stalled_duration", cmd.PersistentFlags().Lookup("webrtc.estimator.stalled_duration")); err != nil { + return err + } + + cmd.PersistentFlags().Duration("webrtc.estimator.downgrade_backoff", 10*time.Second, "how long to wait before downgrading again after previous downgrade") + if err := viper.BindPFlag("webrtc.estimator.downgrade_backoff", cmd.PersistentFlags().Lookup("webrtc.estimator.downgrade_backoff")); err != nil { + return err + } + + cmd.PersistentFlags().Duration("webrtc.estimator.upgrade_backoff", 5*time.Second, "how long to wait before upgrading again after previous upgrade") + if err := viper.BindPFlag("webrtc.estimator.upgrade_backoff", cmd.PersistentFlags().Lookup("webrtc.estimator.upgrade_backoff")); err != nil { + return err + } + + cmd.PersistentFlags().Float64("webrtc.estimator.diff_threshold", 0.15, "how bigger the difference between estimated and stream bitrate must be to trigger upgrade/downgrade") + if err := viper.BindPFlag("webrtc.estimator.diff_threshold", cmd.PersistentFlags().Lookup("webrtc.estimator.diff_threshold")); err != nil { + return err + } + return nil } @@ -197,7 +258,15 @@ func (s *WebRTC) Set() { // bandwidth estimator - s.EstimatorEnabled = viper.GetBool("webrtc.estimator.enabled") - s.EstimatorPassive = viper.GetBool("webrtc.estimator.passive") - s.EstimatorInitialBitrate = viper.GetInt("webrtc.estimator.initial_bitrate") + s.Estimator.Enabled = viper.GetBool("webrtc.estimator.enabled") + s.Estimator.Passive = viper.GetBool("webrtc.estimator.passive") + s.Estimator.Debug = viper.GetBool("webrtc.estimator.debug") + s.Estimator.InitialBitrate = viper.GetInt("webrtc.estimator.initial_bitrate") + s.Estimator.ReadInterval = viper.GetDuration("webrtc.estimator.read_interval") + s.Estimator.StableDuration = viper.GetDuration("webrtc.estimator.stable_duration") + s.Estimator.UnstableDuration = viper.GetDuration("webrtc.estimator.unstable_duration") + s.Estimator.StalledDuration = viper.GetDuration("webrtc.estimator.stalled_duration") + s.Estimator.DowngradeBackoff = viper.GetDuration("webrtc.estimator.downgrade_backoff") + s.Estimator.UpgradeBackoff = viper.GetDuration("webrtc.estimator.upgrade_backoff") + s.Estimator.DiffThreshold = viper.GetFloat64("webrtc.estimator.diff_threshold") } diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 31c439aa..e98f0b8e 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -24,6 +24,7 @@ import ( "github.com/demodesk/neko/pkg/types/codec" "github.com/demodesk/neko/pkg/types/event" "github.com/demodesk/neko/pkg/types/message" + "github.com/demodesk/neko/pkg/utils" ) const ( @@ -167,7 +168,7 @@ func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer { return manager.config.ICEServersFrontend } -func (manager *WebRTCManagerCtx) newPeerConnection(logger zerolog.Logger, codecs []codec.RTPCodec, bitrate int) (*webrtc.PeerConnection, cc.BandwidthEstimator, error) { +func (manager *WebRTCManagerCtx) newPeerConnection(logger zerolog.Logger, codecs []codec.RTPCodec) (*webrtc.PeerConnection, cc.BandwidthEstimator, error) { // create media engine engine := &webrtc.MediaEngine{} for _, codec := range codecs { @@ -223,14 +224,10 @@ func (manager *WebRTCManagerCtx) newPeerConnection(logger zerolog.Logger, codecs // create bandwidth estimator estimatorChan := make(chan cc.BandwidthEstimator, 1) - if manager.config.EstimatorEnabled { + if manager.config.Estimator.Enabled { congestionController, err := cc.NewInterceptor(func() (cc.BandwidthEstimator, error) { - if bitrate == 0 { - bitrate = manager.config.EstimatorInitialBitrate - } - return gcc.NewSendSideBWE( - gcc.SendSideBWEInitialBitrate(bitrate), + gcc.SendSideBWEInitialBitrate(manager.config.Estimator.InitialBitrate), gcc.SendSideBWEPacer(gcc.NewNoOpPacer()), ) }) @@ -268,7 +265,7 @@ func (manager *WebRTCManagerCtx) newPeerConnection(logger zerolog.Logger, codecs return connection, <-estimatorChan, err } -func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, videoAuto bool) (*webrtc.SessionDescription, error) { +func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.SessionDescription, types.WebRTCPeer, error) { id := atomic.AddInt32(&manager.peerId, 1) // get metrics for session @@ -287,12 +284,10 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, video := manager.capture.Video() videoCodec := video.Codec() - connection, estimator, err := manager.newPeerConnection(logger, []codec.RTPCodec{ - audioCodec, - videoCodec, - }, bitrate) + connection, estimator, err := manager.newPeerConnection( + logger, []codec.RTPCodec{audioCodec, videoCodec}) if err != nil { - return nil, err + return nil, nil, err } // asynchronously send local ICE Candidates @@ -311,47 +306,34 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, }) } - // if bitrate is 0, and estimator is enabled, use estimator bitrate - if bitrate == 0 && estimator != nil { - bitrate = estimator.GetTargetBitrate() - } - // audio track audioTrack, err := NewTrack(logger, audioCodec, connection) if err != nil { - return nil, err + return nil, nil, err } // set stream for audio track _, err = audioTrack.SetStream(audio) if err != nil { - return nil, err + return nil, nil, err } - // if estimator is disabled, or in passive mode, disable video auto bitrate - if !manager.config.EstimatorEnabled || manager.config.EstimatorPassive { - videoAuto = false - } - - videoRtcp := make(chan []rtcp.Packet, 1) - // video track - videoTrack, err := NewTrack(logger, videoCodec, connection, - WithVideoAuto(videoAuto), - WithRtcpChan(videoRtcp), - ) + videoRtcp := make(chan []rtcp.Packet, 1) + videoTrack, err := NewTrack(logger, videoCodec, connection, WithRtcpChan(videoRtcp)) if err != nil { - return nil, err + return nil, nil, err } - // let video stream bucket manager handle stream subscriptions - video.SetReceiver(videoTrack) + // + // stream for video track will be set later + // // data channel dataChannel, err := connection.CreateDataChannel("data", nil) if err != nil { - return nil, err + return nil, nil, err } peer := &WebRTCPeerCtx{ @@ -359,24 +341,29 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, session: session, metrics: metrics, connection: connection, - estimator: estimator, + // bandwidth estimator + estimator: estimator, + estimateTrend: utils.NewTrendDetector( + utils.TrendDetectorParams{ + // Probing + //RequiredSamples: 3, + //DownwardTrendThreshold: 0.0, + //CollapseValues: false, + // Non-Probing + RequiredSamples: 8, + DownwardTrendThreshold: -0.5, + CollapseValues: true, + }), + // stream selectors + videoSelector: manager.capture.Video(), // tracks & channels audioTrack: audioTrack, videoTrack: videoTrack, dataChannel: dataChannel, rtcpChannel: videoRtcp, // config - iceTrickle: manager.config.ICETrickle, - estimatorPassive: manager.config.EstimatorPassive, - } - - logger.Info(). - Int("target_bitrate", bitrate). - Msg("estimated initial peer bitrate") - - // set initial video bitrate - if err := peer.SetVideoBitrate(bitrate); err != nil { - return nil, err + iceTrickle: manager.config.ICETrickle, + estimatorConfig: manager.config.Estimator, } connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) { @@ -492,9 +479,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, // ensure we only run this once once.Do(func() { session.SetWebRTCConnected(peer, false) - if err = video.RemoveReceiver(videoTrack); err != nil { - logger.Err(err).Msg("failed to remove video receiver") - } + // + // TODO: Shutdown peer? + // audioTrack.Shutdown() videoTrack.Shutdown() close(videoRtcp) @@ -542,7 +529,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, offer, err := peer.CreateOffer(false) if err != nil { - return nil, err + return nil, nil, err } // on negotiation needed handler must be registered after creating initial @@ -576,7 +563,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int, // start estimator reader go peer.estimatorReader() - return offer, nil + return offer, peer, nil } func (manager *WebRTCManagerCtx) SetCursorPosition(x, y int) { diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 79cbd620..cc212575 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -121,7 +121,7 @@ func (m *metricsManager) getBySession(session types.Session) *metrics { Name: "receiver_estimated_maximum_bitrate", Namespace: "neko", Subsystem: "webrtc", - Help: "Receiver Estimated Maximum Bitrate from SCTP.", + Help: "Receiver Estimated Maximum Bitrate from RTCP.", ConstLabels: map[string]string{ "session_id": sessionId, }, @@ -140,7 +140,7 @@ func (m *metricsManager) getBySession(session types.Session) *metrics { Name: "receiver_report_delay", Namespace: "neko", Subsystem: "webrtc", - Help: "Receiver Report Delay from SCTP, expressed in units of 1/65536 seconds.", + Help: "Receiver Report Delay from RTCP, expressed in units of 1/65536 seconds.", ConstLabels: map[string]string{ "session_id": sessionId, }, @@ -149,7 +149,7 @@ func (m *metricsManager) getBySession(session types.Session) *metrics { Name: "receiver_report_jitter", Namespace: "neko", Subsystem: "webrtc", - Help: "Receiver Report Jitter from SCTP.", + Help: "Receiver Report Jitter from RTCP.", ConstLabels: map[string]string{ "session_id": sessionId, }, @@ -158,7 +158,17 @@ func (m *metricsManager) getBySession(session types.Session) *metrics { Name: "receiver_report_total_lost", Namespace: "neko", Subsystem: "webrtc", - Help: "Receiver Report Total Lost from SCTP.", + Help: "Receiver Report Total Lost from RTCP.", + ConstLabels: map[string]string{ + "session_id": sessionId, + }, + }), + + transportLayerNacks: promauto.NewCounter(prometheus.CounterOpts{ + Name: "transport_layer_nacks", + Namespace: "neko", + Subsystem: "webrtc", + Help: "Transport Layer NACKs from RTCP.", ConstLabels: map[string]string{ "session_id": sessionId, }, @@ -236,6 +246,8 @@ type metrics struct { receiverReportJitter prometheus.Gauge receiverReportTotalLost prometheus.Gauge + transportLayerNacks prometheus.Counter + iceBytesSent prometheus.Gauge iceBytesReceived prometheus.Gauge sctpBytesSent prometheus.Gauge @@ -386,6 +398,11 @@ func (met *metrics) rtcpReceiver(rtcpCh chan []rtcp.Packet) { // use only last report met.SetReceiverReport(rtcpPacket.Reports[l-1]) } + case *rtcp.TransportLayerNack: + for _, pair := range rtcpPacket.Nacks { + packetList := pair.PacketList() + met.transportLayerNacks.Add(float64(len(packetList))) + } } } } diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 91b405c9..590b598e 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -11,15 +11,12 @@ import ( "github.com/pion/webrtc/v3" "github.com/rs/zerolog" + "github.com/demodesk/neko/internal/config" "github.com/demodesk/neko/internal/webrtc/payload" "github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/types/event" "github.com/demodesk/neko/pkg/types/message" -) - -const ( - // how often to read and process bandwidth estimation reports - estimatorReadInterval = 250 * time.Millisecond + "github.com/demodesk/neko/pkg/utils" ) type WebRTCPeerCtx struct { @@ -28,15 +25,20 @@ type WebRTCPeerCtx struct { session types.Session metrics *metrics connection *webrtc.PeerConnection - estimator cc.BandwidthEstimator + // bandwidth estimator + estimator cc.BandwidthEstimator + estimateTrend *utils.TrendDetector + // stream selectors + videoSelector types.StreamSelectorManager // tracks & channels audioTrack *Track videoTrack *Track dataChannel *webrtc.DataChannel rtcpChannel chan []rtcp.Packet // config - iceTrickle bool - estimatorPassive bool + iceTrickle bool + estimatorConfig config.WebRTCEstimator + videoAuto bool } // @@ -102,6 +104,7 @@ func (peer *WebRTCPeerCtx) SetCandidate(candidate webrtc.ICECandidateInit) error return peer.connection.AddICECandidate(candidate) } +// TODO: Add shutdown function? func (peer *WebRTCPeerCtx) Destroy() { peer.mu.Lock() defer peer.mu.Unlock() @@ -111,32 +114,186 @@ func (peer *WebRTCPeerCtx) Destroy() { } func (peer *WebRTCPeerCtx) estimatorReader() { + conf := peer.estimatorConfig + + // if estimator is not in debug mode, use a nop logger + var debugLogger zerolog.Logger + if conf.Debug { + debugLogger = peer.logger.With().Str("component", "estimator").Logger().Level(zerolog.DebugLevel) + } else { + debugLogger = zerolog.Nop() + } + // if estimator is disabled, do nothing if peer.estimator == nil { return } // use a ticker to get current client target bitrate - ticker := time.NewTicker(estimatorReadInterval) + ticker := time.NewTicker(conf.ReadInterval) defer ticker.Stop() + // since when is the estimate stable/unstable + stableSince := time.Now() // we asume stable at start + unstableSince := time.Time{} + // since when are we neutral but cannot accomodate current bitrate + // we migt be stalled or estimator just reached zer (very bad connection) + stalledSince := time.Time{} + // when was the last upgrade/downgrade + lastUpgradeTime := time.Time{} + lastDowngradeTime := time.Time{} + for range ticker.C { targetBitrate := peer.estimator.GetTargetBitrate() peer.metrics.SetReceiverEstimatedTargetBitrate(float64(targetBitrate)) + // if peer connection is closed, stop reading if peer.connection.ConnectionState() == webrtc.PeerConnectionStateClosed { break } - if !peer.videoTrack.VideoAuto() { + // if estimation is disabled, do nothing + if !peer.videoAuto || conf.Passive { continue } - if !peer.estimatorPassive { - err := peer.SetVideoBitrate(targetBitrate) - if err != nil { - peer.logger.Warn().Err(err).Msg("failed to set video bitrate") + // get trend direction to decide if we should upgrade or downgrade + peer.estimateTrend.AddValue(int64(targetBitrate)) + direction := peer.estimateTrend.GetDirection() + + // get current stream bitrate + stream, ok := peer.videoTrack.Stream() + if !ok { + debugLogger.Warn().Msg("looks like we don't have a stream yet, skipping bitrate estimation") + continue + } + + // if stream bitrate is 0, we need to wait for some time until we get a valid value + streamId, streamBitrate := stream.ID(), stream.Bitrate() + if streamBitrate == 0 { + debugLogger.Warn().Msg("looks like stream bitrate is 0, we need to wait for some time") + continue + } + + // check whats the difference between target and stream bitrate + diff := float64(targetBitrate) / float64(streamBitrate) + + debugLogger.Info(). + Float64("diff", diff). + Int("target_bitrate", targetBitrate). + Uint64("stream_bitrate", streamBitrate). + Str("direction", direction.String()). + Msg("got bitrate from estimator") + + // if we can accomodate current stream or we are not netural anymore, + // we are not stalled so we reset the stalled time + if direction != utils.TrendDirectionNeutral || diff > 1+conf.DiffThreshold { + stalledSince = time.Now() + } + + // if we are neutral and stalled for too long, we might be congesting + stalled := direction == utils.TrendDirectionNeutral && time.Since(stalledSince) > conf.StalledDuration + if stalled { + debugLogger.Warn(). + Time("stalled_since", stalledSince). + Msgf("it looks like we are stalled") + } + + // if we have an downward trend or are stalled, we might be congesting + if direction == utils.TrendDirectionDownward || stalled { + // we reset the stable time because we are congesting + stableSince = time.Now() + + // if we downgraded recently, we wait for some more time + if time.Since(lastDowngradeTime) < conf.DowngradeBackoff { + debugLogger.Debug(). + Time("last_downgrade", lastDowngradeTime). + Msgf("downgraded recently, waiting for at least %v", conf.DowngradeBackoff) + continue } + + // if we are not unstable but we fluctuate we should wait for some more time + if time.Since(unstableSince) < conf.UnstableDuration { + debugLogger.Debug(). + Time("unstable_since", unstableSince). + Msgf("we are not unstable long enough, waiting for at least %v", conf.UnstableDuration) + continue + } + + // if we still have a big difference between target and stream bitrate, we wait for some more time + if conf.DiffThreshold >= 0 && diff > 1+conf.DiffThreshold { + debugLogger.Debug(). + Float64("diff", diff). + Float64("threshold", conf.DiffThreshold). + Msgf("we still have a big difference between target and stream bitrate, " + + "therefore we still should be able to accomodate current stream") + continue + } + + err := peer.SetVideo(types.StreamSelector{ + ID: streamId, + Type: types.StreamSelectorTypeLower, + }) + if err != nil && err != types.ErrWebRTCStreamNotFound { + peer.logger.Warn().Err(err).Msg("failed to downgrade video stream") + } + lastDowngradeTime = time.Now() + + if err == types.ErrWebRTCStreamNotFound { + debugLogger.Info().Msg("looks like we are already on the lowest stream") + } else { + debugLogger.Info().Msg("downgraded video stream") + } + continue + } + + // we reset the unstable time because we are not congesting + unstableSince = time.Now() + + // if we have a neutral or upward trend, that means our estimate is stable + // if we are on the highest stream, we don't need to do anything + // but if there is a higher stream, we should try to upgrade and see if it works + + // if we upgraded recently, we wait for some more time + if time.Since(lastUpgradeTime) < conf.UpgradeBackoff { + debugLogger.Debug(). + Time("last_upgrade", lastUpgradeTime). + Msgf("upgraded recently, waiting for at least %v", conf.UpgradeBackoff) + continue + } + + // if we are not stable for long enough, we wait for some more time + // because bandwidth estimation might fluctuate + if time.Since(stableSince) < conf.StableDuration { + debugLogger.Debug(). + Time("stable_since", stableSince). + Msgf("we are not stable long enough, waiting for at least %v", conf.StableDuration) + continue + } + + // upgrade only if estimated bitrate passed the threshold + if conf.DiffThreshold >= 0 && diff < 1+conf.DiffThreshold { + debugLogger.Debug(). + Float64("diff", diff). + Float64("threshold", conf.DiffThreshold). + Msgf("looks like we don't have enough bitrate to accomodate higher stream, " + + "therefore we should wait for some more time") + continue + } + + err := peer.SetVideo(types.StreamSelector{ + ID: streamId, + Type: types.StreamSelectorTypeHigher, + }) + if err != nil && err != types.ErrWebRTCStreamNotFound { + peer.logger.Warn().Err(err).Msg("failed to upgrade video stream") + } + lastUpgradeTime = time.Now() + + if err == types.ErrWebRTCStreamNotFound { + debugLogger.Info().Msg("looks like we are already on the highest stream") + } else { + debugLogger.Info().Msg("upgraded video stream") } } } @@ -145,88 +302,52 @@ func (peer *WebRTCPeerCtx) estimatorReader() { // video // -func (peer *WebRTCPeerCtx) SetVideoBitrate(peerBitrate int) error { +func (peer *WebRTCPeerCtx) SetVideo(selector types.StreamSelector) error { peer.mu.Lock() defer peer.mu.Unlock() - // when switching from manual to auto bitrate estimation, in case the estimator is - // idle (lastBitrate > maxBitrate), we want to go back to the previous estimated bitrate - if peerBitrate == 0 && peer.estimator != nil && !peer.estimatorPassive { - peerBitrate = peer.estimator.GetTargetBitrate() - peer.logger.Debug(). - Int("peer_bitrate", peerBitrate). - Msg("evaluated bitrate") + // get requested video stream from selector + stream, ok := peer.videoSelector.GetStream(selector) + if !ok { + return types.ErrWebRTCStreamNotFound } - changed, err := peer.videoTrack.SetBitrate(peerBitrate) + // set video stream to track + changed, err := peer.videoTrack.SetStream(stream) if err != nil { return err } + // if video stream was already set, do nothing if !changed { - // TODO: return error? return nil } - videoID := peer.videoTrack.stream.ID() - bitrate := peer.videoTrack.stream.Bitrate() - + videoID := stream.ID() peer.metrics.SetVideoID(videoID) - peer.logger.Debug(). - Int("peer_bitrate", peerBitrate). - Int("video_bitrate", bitrate). - Str("video_id", videoID). - Msg("peer bitrate triggered video stream change") + + peer.logger.Info().Str("video_id", videoID).Msg("set video") go peer.session.Send( event.SIGNAL_VIDEO, message.SignalVideo{ - Video: videoID, - Bitrate: bitrate, - VideoAuto: peer.videoTrack.VideoAuto(), + Video: videoID, + Auto: peer.videoAuto, }) return nil } -func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error { +func (peer *WebRTCPeerCtx) VideoID() (string, bool) { peer.mu.Lock() defer peer.mu.Unlock() - changed, err := peer.videoTrack.SetVideoID(videoID) - if err != nil { - return err + stream, ok := peer.videoTrack.Stream() + if !ok { + return "", false } - if !changed { - // TODO: return error? - return nil - } - - bitrate := peer.videoTrack.stream.Bitrate() - - peer.logger.Debug(). - Str("video_id", videoID). - Int("video_bitrate", bitrate). - Msg("peer video id triggered video stream change") - - go peer.session.Send( - event.SIGNAL_VIDEO, - message.SignalVideo{ - Video: videoID, - Bitrate: bitrate, - VideoAuto: peer.videoTrack.VideoAuto(), - }) - - return nil -} - -func (peer *WebRTCPeerCtx) GetVideoID() string { - peer.mu.Lock() - defer peer.mu.Unlock() - - // TODO: Refactor. - return peer.videoTrack.stream.ID() + return stream.ID(), true } func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { @@ -239,18 +360,32 @@ func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { return nil } +func (peer *WebRTCPeerCtx) Paused() bool { + peer.mu.Lock() + defer peer.mu.Unlock() + + return peer.videoTrack.Paused() || peer.audioTrack.Paused() +} + func (peer *WebRTCPeerCtx) SetVideoAuto(videoAuto bool) { + peer.mu.Lock() + defer peer.mu.Unlock() + // if estimator is enabled and is not passive, enable video auto bitrate - if peer.estimator != nil && !peer.estimatorPassive { - peer.videoTrack.SetVideoAuto(videoAuto) + if peer.estimator != nil && !peer.estimatorConfig.Passive { + peer.logger.Info().Bool("video_auto", videoAuto).Msg("set video auto") + peer.videoAuto = videoAuto } else { peer.logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") - peer.videoTrack.SetVideoAuto(false) // ensure video auto is disabled + peer.videoAuto = false // ensure video auto is disabled } } func (peer *WebRTCPeerCtx) VideoAuto() bool { - return peer.videoTrack.VideoAuto() + peer.mu.Lock() + defer peer.mu.Unlock() + + return peer.videoAuto } // diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index dd528bda..f18122e2 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -2,7 +2,6 @@ package webrtc import ( "errors" - "fmt" "io" "sync" @@ -22,25 +21,13 @@ type Track struct { rtcpCh chan []rtcp.Packet sample chan types.Sample - videoAuto bool - videoAutoMu sync.RWMutex - paused bool stream types.StreamSinkManager streamMu sync.Mutex - - bitrateChange func(int) (bool, error) - videoChange func(string) (bool, error) } type trackOption func(*Track) -func WithVideoAuto(auto bool) trackOption { - return func(t *Track) { - t.videoAuto = auto - } -} - func WithRtcpChan(rtcp chan []rtcp.Packet) trackOption { return func(t *Track) { t.rtcpCh = rtcp @@ -100,6 +87,8 @@ func (t *Track) rtcpReader(sender *webrtc.RTPSender) { } } +// --- sample --- + func (t *Track) sampleReader() { for { sample, ok := <-t.sample @@ -120,6 +109,12 @@ func (t *Track) sampleReader() { } } +func (t *Track) WriteSample(sample types.Sample) { + t.sample <- sample +} + +// --- stream --- + func (t *Track) SetStream(stream types.StreamSinkManager) (bool, error) { t.streamMu.Lock() defer t.streamMu.Unlock() @@ -167,6 +162,15 @@ func (t *Track) RemoveStream() { t.stream = nil } +func (t *Track) Stream() (types.StreamSinkManager, bool) { + t.streamMu.Lock() + defer t.streamMu.Unlock() + + return t.stream, t.stream != nil +} + +// --- paused --- + func (t *Track) SetPaused(paused bool) { t.streamMu.Lock() defer t.streamMu.Unlock() @@ -190,42 +194,9 @@ func (t *Track) SetPaused(paused bool) { t.paused = paused } -func (t *Track) WriteSample(sample types.Sample) { - t.sample <- sample -} - -func (t *Track) SetBitrate(bitrate int) (bool, error) { - if t.bitrateChange == nil { - return false, fmt.Errorf("bitrate change not supported") - } - - return t.bitrateChange(bitrate) -} - -func (t *Track) SetVideoID(videoID string) (bool, error) { - if t.videoChange == nil { - return false, fmt.Errorf("video change not supported") - } - - return t.videoChange(videoID) -} - -func (t *Track) OnBitrateChange(f func(bitrate int) (bool, error)) { - t.bitrateChange = f -} - -func (t *Track) OnVideoChange(f func(string) (bool, error)) { - t.videoChange = f -} - -func (t *Track) SetVideoAuto(auto bool) { - t.videoAutoMu.Lock() - defer t.videoAutoMu.Unlock() - t.videoAuto = auto -} - -func (t *Track) VideoAuto() bool { - t.videoAutoMu.RLock() - defer t.videoAutoMu.RUnlock() - return t.videoAuto +func (t *Track) Paused() bool { + t.streamMu.Lock() + defer t.streamMu.Unlock() + + return t.paused } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index f25f2bc1..0fe6918a 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -20,28 +20,26 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag payload.Video = videos[0] } - var err error - if payload.Bitrate == 0 { - // get bitrate from video id - payload.Bitrate, err = h.capture.GetBitrateFromVideoID(payload.Video) - if err != nil { - return err - } - } - - offer, err := h.webrtc.CreatePeer(session, payload.Bitrate, payload.VideoAuto) + offer, peer, err := h.webrtc.CreatePeer(session) if err != nil { return err } - if webrtcPeer := session.GetWebRTCPeer(); webrtcPeer != nil { - // set webrtc as paused if session has private mode enabled - if session.PrivateModeEnabled() { - webrtcPeer.SetPaused(true) - } + // set webrtc as paused if session has private mode enabled + if session.PrivateModeEnabled() { + peer.SetPaused(true) + } - payload.Video = webrtcPeer.GetVideoID() - payload.VideoAuto = webrtcPeer.VideoAuto() + // set video auto state + peer.SetVideoAuto(payload.Auto) + + // set video stream + err = peer.SetVideo(types.StreamSelector{ + ID: payload.Video, + Type: types.StreamSelectorTypeNearest, + }) + if err != nil { + return err } session.Send( @@ -49,9 +47,6 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag message.SignalProvide{ SDP: offer.SDP, ICEServers: h.webrtc.ICEServers(), - Video: payload.Video, // TODO: Refactor - Bitrate: payload.Bitrate, - VideoAuto: payload.VideoAuto, }) return nil @@ -133,16 +128,13 @@ func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message. return errors.New("webRTC peer does not exist") } - peer.SetVideoAuto(payload.VideoAuto) + peer.SetVideoAuto(payload.Auto) if payload.Video != "" { - if err := peer.SetVideoID(payload.Video); err != nil { - h.logger.Error().Err(err).Msg("failed to set video id") - } - } else { - if err := peer.SetVideoBitrate(payload.Bitrate); err != nil { - h.logger.Error().Err(err).Msg("failed to set video bitrate") - } + return peer.SetVideo(types.StreamSelector{ + ID: payload.Video, + Type: types.StreamSelectorTypeNearest, + }) } return nil diff --git a/pkg/types/capture.go b/pkg/types/capture.go index 485161a4..140cde44 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -31,26 +31,6 @@ type SampleListener interface { WriteSample(Sample) } -type Receiver interface { - SetStream(stream StreamSinkManager) (changed bool, err error) - RemoveStream() - OnBitrateChange(f func(bitrate int) (changed bool, err error)) - OnVideoChange(f func(videoID string) (changed bool, err error)) - VideoAuto() bool - SetVideoAuto(videoAuto bool) -} - -type BucketsManager interface { - IDs() []string - Codec() codec.RTPCodec - SetReceiver(receiver Receiver) - RemoveReceiver(receiver Receiver) error - - DestroyAll() - RecreateAll() error - Shutdown() -} - type BroadcastManager interface { Start(url string) error Stop() @@ -64,10 +44,74 @@ type ScreencastManager interface { Image() ([]byte, error) } +type StreamSelectorType int + +const ( + // select exact stream + StreamSelectorTypeExact StreamSelectorType = iota + // select nearest stream (in either direction) if exact stream is not available + StreamSelectorTypeNearest + // if exact stream is found select the next lower stream, otherwise select the nearest lower stream + StreamSelectorTypeLower + // if exact stream is found select the next higher stream, otherwise select the nearest higher stream + StreamSelectorTypeHigher +) + +func (s StreamSelectorType) String() string { + switch s { + case StreamSelectorTypeExact: + return "exact" + case StreamSelectorTypeNearest: + return "nearest" + case StreamSelectorTypeLower: + return "lower" + case StreamSelectorTypeHigher: + return "higher" + default: + return fmt.Sprintf("%d", int(s)) + } +} + +func (s *StreamSelectorType) UnmarshalText(text []byte) error { + switch strings.ToLower(string(text)) { + case "exact", "": + *s = StreamSelectorTypeExact + case "nearest": + *s = StreamSelectorTypeNearest + case "lower": + *s = StreamSelectorTypeLower + case "higher": + *s = StreamSelectorTypeHigher + default: + return fmt.Errorf("invalid stream selector type: %s", string(text)) + } + return nil +} + +func (s StreamSelectorType) MarshalText() ([]byte, error) { + return []byte(s.String()), nil +} + +type StreamSelector struct { + // type of stream selector + Type StreamSelectorType + // select stream by its ID + ID string + // select stream by its bitrate + Bitrate uint64 +} + +type StreamSelectorManager interface { + IDs() []string + Codec() codec.RTPCodec + + GetStream(selector StreamSelector) (StreamSinkManager, bool) +} + type StreamSinkManager interface { ID() string Codec() codec.RTPCodec - Bitrate() int + Bitrate() uint64 AddListener(listener SampleListener) error RemoveListener(listener SampleListener) error @@ -94,12 +138,10 @@ type CaptureManager interface { Start() Shutdown() error - GetBitrateFromVideoID(videoID string) (int, error) - Broadcast() BroadcastManager Screencast() ScreencastManager Audio() StreamSinkManager - Video() BucketsManager + Video() StreamSelectorManager Webcam() StreamSrcManager Microphone() StreamSrcManager @@ -201,54 +243,3 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { config.GstSuffix, }[:], " "), nil } - -func (config *VideoConfig) GetBitrateFn(getScreen func() ScreenSize) func() (int, error) { - return func() (int, error) { - if config.Bitrate > 0 { - return config.Bitrate, nil - } - - screen := getScreen() - - values := map[string]any{ - "width": screen.Width, - "height": screen.Height, - "fps": screen.Rate, - } - - language := []gval.Language{ - gval.Function("round", func(args ...any) (any, error) { - return (int)(math.Round(args[0].(float64))), nil - }), - } - - // TOOD: do not read target-bitrate from pipeline, but only from config. - - // TODO: This is only for vp8. - expr, ok := config.GstParams["target-bitrate"] - if !ok { - // TODO: This is only for h264. - expr, ok = config.GstParams["bitrate"] - if !ok { - return 0, fmt.Errorf("bitrate not found") - } - } - - bitrate, err := gval.Evaluate(expr, values, language...) - if err != nil { - return 0, fmt.Errorf("failed to evaluate bitrate: %w", err) - } - - var bitrateInt int - switch val := bitrate.(type) { - case int: - bitrateInt = val - case float64: - bitrateInt = (int)(val) - default: - return 0, fmt.Errorf("bitrate is not int or float64") - } - - return bitrateInt, nil - } -} diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index 832b24f0..3b536b1e 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -48,10 +48,6 @@ type SystemDisconnect struct { type SignalProvide struct { SDP string `json:"sdp"` ICEServers []types.ICEServer `json:"iceservers"` - // TODO: Use SignalVideo struct. - Video string `json:"video"` - Bitrate int `json:"bitrate"` - VideoAuto bool `json:"video_auto"` } type SignalCandidate struct { @@ -63,9 +59,8 @@ type SignalDescription struct { } type SignalVideo struct { - Video string `json:"video"` - Bitrate int `json:"bitrate"` - VideoAuto bool `json:"video_auto"` + Video string `json:"video"` + Auto bool `json:"auto"` } ///////////////////////////// diff --git a/pkg/types/webrtc.go b/pkg/types/webrtc.go index b255e6da..0b6f026c 100644 --- a/pkg/types/webrtc.go +++ b/pkg/types/webrtc.go @@ -9,6 +9,7 @@ import ( var ( ErrWebRTCDataChannelNotFound = errors.New("webrtc data channel not found") ErrWebRTCConnectionNotFound = errors.New("webrtc connection not found") + ErrWebRTCStreamNotFound = errors.New("webrtc stream not found") ) type ICEServer struct { @@ -23,10 +24,10 @@ type WebRTCPeer interface { SetRemoteDescription(webrtc.SessionDescription) error SetCandidate(webrtc.ICECandidateInit) error - SetVideoBitrate(bitrate int) error - SetVideoID(videoID string) error - GetVideoID() string + SetVideo(StreamSelector) error + VideoID() (string, bool) SetPaused(isPaused bool) error + Paused() bool SetVideoAuto(auto bool) VideoAuto() bool @@ -42,6 +43,6 @@ type WebRTCManager interface { ICEServers() []ICEServer - CreatePeer(session Session, bitrate int, videoAuto bool) (*webrtc.SessionDescription, error) + CreatePeer(session Session) (*webrtc.SessionDescription, WebRTCPeer, error) SetCursorPosition(x, y int) } diff --git a/pkg/utils/trenddetector.go b/pkg/utils/trenddetector.go new file mode 100644 index 00000000..a07f68be --- /dev/null +++ b/pkg/utils/trenddetector.go @@ -0,0 +1,153 @@ +// From https://github.com/livekit/livekit/blob/master/pkg/sfu/streamallocator/trenddetector.go +package utils + +import ( + "fmt" + "time" +) + +// ------------------------------------------------ + +type TrendDirection int + +const ( + TrendDirectionNeutral TrendDirection = iota + TrendDirectionUpward + TrendDirectionDownward +) + +func (t TrendDirection) String() string { + switch t { + case TrendDirectionNeutral: + return "NEUTRAL" + case TrendDirectionUpward: + return "UPWARD" + case TrendDirectionDownward: + return "DOWNWARD" + default: + return fmt.Sprintf("%d", int(t)) + } +} + +// ------------------------------------------------ + +type TrendDetectorParams struct { + RequiredSamples int + DownwardTrendThreshold float64 + CollapseValues bool +} + +type TrendDetector struct { + params TrendDetectorParams + + startTime time.Time + numSamples int + values []int64 + lowestValue int64 + highestValue int64 + + direction TrendDirection +} + +func NewTrendDetector(params TrendDetectorParams) *TrendDetector { + return &TrendDetector{ + params: params, + startTime: time.Now(), + direction: TrendDirectionNeutral, + } +} + +func (t *TrendDetector) Seed(value int64) { + if len(t.values) != 0 { + return + } + + t.values = append(t.values, value) +} + +func (t *TrendDetector) AddValue(value int64) { + t.numSamples++ + if t.lowestValue == 0 || value < t.lowestValue { + t.lowestValue = value + } + if value > t.highestValue { + t.highestValue = value + } + + // ignore duplicate values + if t.params.CollapseValues && len(t.values) != 0 && t.values[len(t.values)-1] == value { + return + } + + if len(t.values) == t.params.RequiredSamples { + t.values = t.values[1:] + } + t.values = append(t.values, value) + + t.updateDirection() +} + +func (t *TrendDetector) GetLowest() int64 { + return t.lowestValue +} + +func (t *TrendDetector) GetHighest() int64 { + return t.highestValue +} + +func (t *TrendDetector) GetValues() []int64 { + return t.values +} + +func (t *TrendDetector) GetDirection() TrendDirection { + return t.direction +} + +func (t *TrendDetector) ToString() string { + now := time.Now() + elapsed := now.Sub(t.startTime).Seconds() + str := fmt.Sprintf("t: %+v|%+v|%.2fs", t.startTime.Format(time.UnixDate), now.Format(time.UnixDate), elapsed) + str += fmt.Sprintf(", v: %d|%d|%d|%+v|%.2f", t.numSamples, t.lowestValue, t.highestValue, t.values, kendallsTau(t.values)) + return str +} + +func (t *TrendDetector) updateDirection() { + if len(t.values) < t.params.RequiredSamples { + t.direction = TrendDirectionNeutral + return + } + + // using Kendall's Tau to find trend + kt := kendallsTau(t.values) + + t.direction = TrendDirectionNeutral + switch { + case kt > 0: + t.direction = TrendDirectionUpward + case kt < t.params.DownwardTrendThreshold: + t.direction = TrendDirectionDownward + } +} + +// ------------------------------------------------ + +func kendallsTau(values []int64) float64 { + concordantPairs := 0 + discordantPairs := 0 + + for i := 0; i < len(values)-1; i++ { + for j := i + 1; j < len(values); j++ { + if values[i] < values[j] { + concordantPairs++ + } else if values[i] > values[j] { + discordantPairs++ + } + } + } + + if (concordantPairs + discordantPairs) == 0 { + return 0.0 + } + + return (float64(concordantPairs) - float64(discordantPairs)) / (float64(concordantPairs) + float64(discordantPairs)) +} From dfc7eb3882f06680a942551912671da8edb19a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 19 May 2023 17:19:38 +0200 Subject: [PATCH 843/876] Fix noisy errors (#49) * send message error. * read message error. * close webrtc conn only if not closed yet. * file upload no files received. --- internal/api/room/upload.go | 12 +++++------- internal/webrtc/peer.go | 8 +++++++- internal/websocket/manager.go | 14 +++++++++++--- internal/websocket/peer.go | 4 +++- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index bba7b989..046c6d94 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -95,15 +95,13 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) e //nolint defer r.MultipartForm.RemoveAll() - if !h.desktop.IsFileChooserDialogOpened() { - return utils.HttpUnprocessableEntity("file chooser dialog is not open") - } - req_files := r.MultipartForm.File["files"] if len(req_files) == 0 { - return utils.HttpInternalServerError(). - WithInternalErr(err). - WithInternalMsg("unable to copy uploaded file to destination file") + return utils.HttpBadRequest("no files received") + } + + if !h.desktop.IsFileChooserDialogOpened() { + return utils.HttpUnprocessableEntity("file chooser dialog is not open") } dir, err := os.MkdirTemp("", "neko-dialog-*") diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 590b598e..5d0ae2a9 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -109,7 +109,13 @@ func (peer *WebRTCPeerCtx) Destroy() { peer.mu.Lock() defer peer.mu.Unlock() - err := peer.connection.Close() + var err error + + // if peer connection is not closed, close it + if peer.connection.ConnectionState() != webrtc.PeerConnectionStateClosed { + err = peer.connection.Close() + } + peer.logger.Err(err).Msg("peer connection destroyed") } diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 5ad9a0f8..03da86b2 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -2,6 +2,7 @@ package websocket import ( "encoding/json" + "errors" "net/http" "sync" "time" @@ -253,19 +254,26 @@ func (manager *WebSocketManagerCtx) connect(connection *websocket.Conn, r *http. Str("agent", r.UserAgent()). Msg("connection ended") + if err == nil { + logger.Debug().Msg("websocket close") + session.DisconnectWebSocketPeer(peer, false) + return + } + delayedDisconnect := false e, ok := err.(*websocket.CloseError) if !ok { - logger.Err(err).Msg("read message error") + err = errors.Unwrap(err) // unwrap if possible + logger.Warn().Err(err).Msg("read message error") // client is expected to reconnect soon delayedDisconnect = true } else { switch e.Code { case websocket.CloseNormalClosure: - logger.Info().Str("reason", e.Text).Msg("websocket close") + logger.Debug().Str("reason", e.Text).Msg("websocket close") case websocket.CloseGoingAway: - logger.Info().Str("reason", "going away").Msg("websocket close") + logger.Debug().Str("reason", "going away").Msg("websocket close") default: logger.Warn().Err(err).Msg("websocket close") // abnormal websocket closure: diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 203caa83..8722acb6 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -2,6 +2,7 @@ package websocket import ( "encoding/json" + "errors" "sync" "github.com/gorilla/websocket" @@ -42,7 +43,8 @@ func (peer *WebSocketPeerCtx) Send(event string, payload any) { }) if err != nil { - peer.logger.Err(err).Str("event", event).Msg("send message error") + err = errors.Unwrap(err) // unwrap if possible + peer.logger.Warn().Err(err).Str("event", event).Msg("send message error") return } From ac76c81f6993010b60d96ff01f8eb565064f357d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 19 May 2023 22:29:25 +0200 Subject: [PATCH 844/876] Upgrade go dependencies (#50) * upgrade go dependencies. * remove testify deep equal. --- go.mod | 39 ++++++------- go.sum | 91 +++++++++++++++++------------ internal/plugins/dependency_test.go | 7 ++- 3 files changed, 76 insertions(+), 61 deletions(-) diff --git a/go.mod b/go.mod index caef2766..0290919c 100644 --- a/go.mod +++ b/go.mod @@ -8,16 +8,15 @@ require ( github.com/go-chi/cors v1.2.1 github.com/gorilla/websocket v1.5.0 github.com/kataras/go-events v0.0.3 - github.com/pion/ice/v2 v2.3.2 - github.com/pion/interceptor v0.1.12 + github.com/pion/ice/v2 v2.3.4 + github.com/pion/interceptor v0.1.17 github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.10 - github.com/pion/webrtc/v3 v3.1.59 - github.com/prometheus/client_golang v1.14.0 - github.com/rs/zerolog v1.29.0 - github.com/spf13/cobra v1.6.1 + github.com/pion/webrtc/v3 v3.2.5 + github.com/prometheus/client_golang v1.15.1 + github.com/rs/zerolog v1.29.1 + github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.15.0 - github.com/stretchr/testify v1.8.2 ) require ( @@ -36,31 +35,31 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pelletier/go-toml/v2 v2.0.7 // indirect github.com/pion/datachannel v1.5.5 // indirect - github.com/pion/dtls/v2 v2.2.6 // indirect + github.com/pion/dtls/v2 v2.2.7 // indirect github.com/pion/mdns v0.0.7 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtp v1.7.13 // indirect - github.com/pion/sctp v1.8.6 // indirect + github.com/pion/sctp v1.8.7 // indirect github.com/pion/sdp/v3 v3.0.6 // indirect - github.com/pion/srtp/v2 v2.0.12 // indirect - github.com/pion/stun v0.4.0 // indirect - github.com/pion/transport/v2 v2.0.2 // indirect + github.com/pion/srtp/v2 v2.0.15 // indirect + github.com/pion/stun v0.5.2 // indirect + github.com/pion/transport/v2 v2.2.1 // indirect github.com/pion/turn/v2 v2.1.0 // indirect - github.com/pion/udp/v2 v2.0.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/client_model v0.4.0 // indirect + github.com/prometheus/common v0.43.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/spf13/afero v1.9.5 // indirect - github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/testify v1.8.3 // indirect github.com/subosito/gotenv v1.4.2 // indirect - golang.org/x/crypto v0.7.0 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect + golang.org/x/crypto v0.9.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 6de8faf5..bf74375e 100644 --- a/go.sum +++ b/go.sum @@ -54,7 +54,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -65,7 +65,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -150,7 +150,6 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -160,7 +159,7 @@ github.com/kataras/go-events v0.0.3/go.mod h1:bFBgtzwwzrag7kQmGuU1ZaVxhK2qseYPQo github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -190,12 +189,13 @@ github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9Cjg github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= -github.com/pion/dtls/v2 v2.2.6 h1:yXMxKr0Skd+Ub6A8UqXTRLSywskx93ooMRHsQUtd+Z4= github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY= -github.com/pion/ice/v2 v2.3.2 h1:vh+fi4RkZ8H5fB4brZ/jm3j4BqFgMmNs+aB3X52Hu7M= -github.com/pion/ice/v2 v2.3.2/go.mod h1:AMIpuJqcpe+UwloocNebmTSWhCZM1TUCo9v7nW50jX0= -github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8= -github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA= +github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8= +github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= +github.com/pion/ice/v2 v2.3.4 h1:tjYjTLpWyZzUjpDnzk6T1y3oQyhyY2DiM2t095iDhyQ= +github.com/pion/ice/v2 v2.3.4/go.mod h1:jVbxqPWQDK5+/V/YqpinUcP0YtDGYqd24n2lusVdX80= +github.com/pion/interceptor v0.1.17 h1:prJtgwFh/gB8zMqGZoOgJPHivOwVAp61i2aG61Du/1w= +github.com/pion/interceptor v0.1.17/go.mod h1:SY8kpmfVBvrbUzvj2bsXz7OJt5JvmVNZ+4Kjq7FcwrI= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.7 h1:P0UB4Sr6xDWEox0kTVxF0LmQihtCbSAdW0H2nEgkA3U= @@ -207,53 +207,56 @@ github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= -github.com/pion/sctp v1.8.6 h1:CUex11Vkt9YS++VhLf8b55O3VqKrWL6W3SDwX4jAqsI= -github.com/pion/sctp v1.8.6/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= +github.com/pion/sctp v1.8.7 h1:JnABvFakZueGAn4KU/4PSKg+GWbF6QWbKTWZOSGJjXw= +github.com/pion/sctp v1.8.7/go.mod h1:g1Ul+ARqZq5JEmoFy87Q/4CePtKnTJ1QCL9dBBdN6AU= github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw= github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= -github.com/pion/srtp/v2 v2.0.12 h1:WrmiVCubGMOAObBU1vwWjG0H3VSyQHawKeer2PVA5rY= -github.com/pion/srtp/v2 v2.0.12/go.mod h1:C3Ep44hlOo2qEYaq4ddsmK5dL63eLehXFbHaZ9F5V9Y= -github.com/pion/stun v0.4.0 h1:vgRrbBE2htWHy7l3Zsxckk7rkjnjOsSM7PHZnBwo8rk= +github.com/pion/srtp/v2 v2.0.15 h1:+tqRtXGsGwHC0G0IUIAzRmdkHvriF79IHVfZGfHrQoA= +github.com/pion/srtp/v2 v2.0.15/go.mod h1:b/pQOlDrbB0HEH5EUAQXzSYxikFbNcNuKmF8tM0hCtw= github.com/pion/stun v0.4.0/go.mod h1:QPsh1/SbXASntw3zkkrIk3ZJVKz4saBY2G7S10P3wCw= +github.com/pion/stun v0.5.2 h1:J/8glQnDV91dfk2+ZnGN0o9bUJgABhTNljwfQWByoXE= +github.com/pion/stun v0.5.2/go.mod h1:TNo1HjyjaFVpMZsvowqPeV8TfwRytympQC0//neaksA= github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40= github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI= github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc= -github.com/pion/transport/v2 v2.0.2 h1:St+8o+1PEzPT51O9bv+tH/KYYLMNR5Vwm5Z3Qkjsywg= github.com/pion/transport/v2 v2.0.2/go.mod h1:vrz6bUbFr/cjdwbnxq8OdDDzHf7JJfGsIRkxfpZoTA0= +github.com/pion/transport/v2 v2.1.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ= +github.com/pion/transport/v2 v2.2.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ= +github.com/pion/transport/v2 v2.2.1 h1:7qYnCBlpgSJNYMbLCKuSY9KbQdBFoETvPNETv0y4N7c= +github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g= github.com/pion/turn/v2 v2.1.0 h1:5wGHSgGhJhP/RpabkUb/T9PdsAjkGLS6toYz5HNzoSI= github.com/pion/turn/v2 v2.1.0/go.mod h1:yrT5XbXSGX1VFSF31A3c1kCNB5bBZgk/uu5LET162qs= -github.com/pion/udp/v2 v2.0.1 h1:xP0z6WNux1zWEjhC7onRA3EwwSliXqu1ElUZAQhUP54= github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8= -github.com/pion/webrtc/v3 v3.1.59 h1:B3YFo8q6dwBYKA2LUjWRChP59Qtt+xvv1Ul7UPDp6Zc= -github.com/pion/webrtc/v3 v3.1.59/go.mod h1:rJGgStRoFyFOWJULHLayaimsG+jIEoenhJ5MB5gIFqw= +github.com/pion/webrtc/v3 v3.2.5 h1:WA38+a1T3/EP55k5IYQFLH3ORaNpRTcElW6UL1CwNeA= +github.com/pion/webrtc/v3 v3.2.5/go.mod h1:8+GhDtUqfKmnZkj+aT2kjvV9B2/nhSTqINEXbVQEGSo= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= +github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= +github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= +github.com/prometheus/common v0.43.0/go.mod h1:NCvr5cQIh3Y/gy73/RdVtC9r8xxrxwJnB+2lB3BxrFc= github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= -github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= +github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= +github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -270,8 +273,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -294,9 +298,9 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -331,6 +335,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -371,8 +376,10 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -393,6 +400,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -443,13 +451,18 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -461,8 +474,9 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -515,6 +529,7 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/plugins/dependency_test.go b/internal/plugins/dependency_test.go index 7075450f..11ae279e 100644 --- a/internal/plugins/dependency_test.go +++ b/internal/plugins/dependency_test.go @@ -1,10 +1,9 @@ package plugins import ( + "reflect" "testing" - "github.com/stretchr/testify/assert" - "github.com/demodesk/neko/pkg/types" ) @@ -591,7 +590,9 @@ func Test_deps_addPlugin(t *testing.T) { } } - assert.Equal(t, tt.want, d.deps) + if !reflect.DeepEqual(d.deps, tt.want) { + t.Errorf("deps = %v, want %v", d.deps, tt.want) + } }) } } From 6b3bc1733438ebb24237b91b612f62f100227d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 21 May 2023 13:19:23 +0200 Subject: [PATCH 845/876] update README.md. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 290d3623..2426f48d 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ Notable differences to the [m1k1o/neko](https://github.com/m1k1o/neko) are: - Go plugin support. - Multiple encoding qualities simulcast. + - Bandwidth estimation and adaptive quality. +- Custom screen size (with automatic sync). - Single cursor for host - cursor image proxying. - Custom cursor style/badge for participants. - Inactive cursors (participants that are not hosting). @@ -24,13 +26,13 @@ Notable differences to the [m1k1o/neko](https://github.com/m1k1o/neko) are: - Access control (view, interactivity, clipboard). - Posibility to add external members providers. - Persistent login (using cookies). - - Split members and sessions. - Drag and drop passthrough. - File upload passthrough (experimental). - Microphone passthrough. - Webcam passthrough (experimental). - Bi-directional text/html clipboard. - Keyboard layouts/variants. +- Metrics and REST API. ## Docs From e83c447e5252a675ec97c0dccaf1b5915b77be4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 6 Jun 2023 21:49:57 +0200 Subject: [PATCH 846/876] fix control give API. --- internal/api/room/handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index e3c9428e..ba33d915 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -95,7 +95,7 @@ func (h *RoomHandler) Route(r types.Router) { r.Post("/release", h.controlRelease) r.With(auth.AdminsOnly).Post("/take", h.controlTake) - r.With(auth.AdminsOnly).Post("/give", h.controlGive) + r.With(auth.AdminsOnly).Post("/give/{sessionId}", h.controlGive) r.With(auth.AdminsOnly).Post("/reset", h.controlReset) }) From cf17f4f5039f60d30aeca81df062a7e8a402bd14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 7 Jun 2023 17:41:16 +0200 Subject: [PATCH 847/876] add estimator comments to config. --- dev/runtime/config.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dev/runtime/config.yml b/dev/runtime/config.yml index c08f1621..235287a3 100644 --- a/dev/runtime/config.yml +++ b/dev/runtime/config.yml @@ -127,3 +127,15 @@ webrtc: - urls: [ stun:stun.l.google.com:19305 ] #username: foo #credential: bar + # estimator: + # enabled: true + # passive: false + # debug: true + # initial_bitrate: 1000000 + # read_interval: 1s + # stable_duration: 10s + # unstable_duration: 5s + # stalled_duration: 20s + # downgrade_backoff: 10s + # upgrade_backoff: 30s + # diff_threshold: 0.5 From e3e9d1606d388d1f23ca8fc19e76f3909935439b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 26 Jun 2023 21:27:14 +0200 Subject: [PATCH 848/876] Refactor signaling for video and audio (#51) * add audio and signal request. * disable audio by default. * fix SignalProvide. * disable estimator when track disabled. --- internal/webrtc/manager.go | 7 +- internal/webrtc/peer.go | 229 +++++++++++++++++--------- internal/webrtc/track.go | 1 + internal/websocket/handler/handler.go | 7 +- internal/websocket/handler/signal.go | 61 ++++--- pkg/types/capture.go | 6 +- pkg/types/event/events.go | 1 + pkg/types/message/messages.go | 17 +- pkg/types/webrtc.go | 30 +++- 9 files changed, 253 insertions(+), 106 deletions(-) diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index e98f0b8e..5412c9e7 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -312,6 +312,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess return nil, nil, err } + // we disable audio by default manually + audioTrack.SetPaused(true) + // set stream for audio track _, err = audioTrack.SetStream(audio) if err != nil { @@ -355,7 +358,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess CollapseValues: true, }), // stream selectors - videoSelector: manager.capture.Video(), + video: video, + audio: audio, // tracks & channels audioTrack: audioTrack, videoTrack: videoTrack, @@ -364,6 +368,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess // config iceTrickle: manager.config.ICETrickle, estimatorConfig: manager.config.Estimator, + audioDisabled: true, // we disable audio by default manually } connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 5d0ae2a9..6abd4952 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -15,7 +15,6 @@ import ( "github.com/demodesk/neko/internal/webrtc/payload" "github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" "github.com/demodesk/neko/pkg/utils" ) @@ -29,7 +28,8 @@ type WebRTCPeerCtx struct { estimator cc.BandwidthEstimator estimateTrend *utils.TrendDetector // stream selectors - videoSelector types.StreamSelectorManager + video types.StreamSelectorManager + audio types.StreamSinkManager // tracks & channels audioTrack *Track videoTrack *Track @@ -38,7 +38,10 @@ type WebRTCPeerCtx struct { // config iceTrickle bool estimatorConfig config.WebRTCEstimator + paused bool videoAuto bool + videoDisabled bool + audioDisabled bool } // @@ -158,8 +161,8 @@ func (peer *WebRTCPeerCtx) estimatorReader() { break } - // if estimation is disabled, do nothing - if !peer.videoAuto || conf.Passive { + // if estimation or video is disabled, do nothing + if !peer.videoAuto || peer.videoDisabled || peer.paused || conf.Passive { continue } @@ -236,9 +239,11 @@ func (peer *WebRTCPeerCtx) estimatorReader() { continue } - err := peer.SetVideo(types.StreamSelector{ - ID: streamId, - Type: types.StreamSelectorTypeLower, + err := peer.SetVideo(types.PeerVideoRequest{ + Selector: &types.StreamSelector{ + ID: streamId, + Type: types.StreamSelectorTypeLower, + }, }) if err != nil && err != types.ErrWebRTCStreamNotFound { peer.logger.Warn().Err(err).Msg("failed to downgrade video stream") @@ -287,9 +292,11 @@ func (peer *WebRTCPeerCtx) estimatorReader() { continue } - err := peer.SetVideo(types.StreamSelector{ - ID: streamId, - Type: types.StreamSelectorTypeHigher, + err := peer.SetVideo(types.PeerVideoRequest{ + Selector: &types.StreamSelector{ + ID: streamId, + Type: types.StreamSelectorTypeHigher, + }, }) if err != nil && err != types.ErrWebRTCStreamNotFound { peer.logger.Warn().Err(err).Msg("failed to upgrade video stream") @@ -304,65 +311,16 @@ func (peer *WebRTCPeerCtx) estimatorReader() { } } -// -// video -// - -func (peer *WebRTCPeerCtx) SetVideo(selector types.StreamSelector) error { - peer.mu.Lock() - defer peer.mu.Unlock() - - // get requested video stream from selector - stream, ok := peer.videoSelector.GetStream(selector) - if !ok { - return types.ErrWebRTCStreamNotFound - } - - // set video stream to track - changed, err := peer.videoTrack.SetStream(stream) - if err != nil { - return err - } - - // if video stream was already set, do nothing - if !changed { - return nil - } - - videoID := stream.ID() - peer.metrics.SetVideoID(videoID) - - peer.logger.Info().Str("video_id", videoID).Msg("set video") - - go peer.session.Send( - event.SIGNAL_VIDEO, - message.SignalVideo{ - Video: videoID, - Auto: peer.videoAuto, - }) - - return nil -} - -func (peer *WebRTCPeerCtx) VideoID() (string, bool) { - peer.mu.Lock() - defer peer.mu.Unlock() - - stream, ok := peer.videoTrack.Stream() - if !ok { - return "", false - } - - return stream.ID(), true -} - func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { peer.mu.Lock() defer peer.mu.Unlock() + peer.videoTrack.SetPaused(isPaused || peer.videoDisabled) + peer.audioTrack.SetPaused(isPaused || peer.audioDisabled) + peer.logger.Info().Bool("is_paused", isPaused).Msg("set paused") - peer.videoTrack.SetPaused(isPaused) - peer.audioTrack.SetPaused(isPaused) + peer.paused = isPaused + return nil } @@ -370,28 +328,149 @@ func (peer *WebRTCPeerCtx) Paused() bool { peer.mu.Lock() defer peer.mu.Unlock() - return peer.videoTrack.Paused() || peer.audioTrack.Paused() + return peer.paused } -func (peer *WebRTCPeerCtx) SetVideoAuto(videoAuto bool) { +// +// video +// + +func (peer *WebRTCPeerCtx) SetVideo(r types.PeerVideoRequest) error { peer.mu.Lock() defer peer.mu.Unlock() - // if estimator is enabled and is not passive, enable video auto bitrate - if peer.estimator != nil && !peer.estimatorConfig.Passive { - peer.logger.Info().Bool("video_auto", videoAuto).Msg("set video auto") - peer.videoAuto = videoAuto - } else { - peer.logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") - peer.videoAuto = false // ensure video auto is disabled + modified := false + + // video disabled + if r.Disabled != nil { + disabled := *r.Disabled + + // update only if changed + if peer.videoDisabled != disabled { + peer.videoDisabled = disabled + peer.videoTrack.SetPaused(disabled || peer.paused) + + peer.logger.Info().Bool("disabled", disabled).Msg("set video disabled") + modified = true + } + } + + // video selector + if r.Selector != nil { + selector := *r.Selector + + // get requested video stream from selector + stream, ok := peer.video.GetStream(selector) + if !ok { + return types.ErrWebRTCStreamNotFound + } + + // set video stream to track + changed, err := peer.videoTrack.SetStream(stream) + if err != nil { + return err + } + + // update only if stream changed + if changed { + videoID := stream.ID() + peer.metrics.SetVideoID(videoID) + + peer.logger.Info().Str("video_id", videoID).Msg("set video") + modified = true + } + } + + // video auto + if r.Auto != nil { + videoAuto := *r.Auto + + if peer.estimator == nil || peer.estimatorConfig.Passive { + peer.logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto") + videoAuto = false // ensure video auto is disabled + } + + // update only if video auto changed + if peer.videoAuto != videoAuto { + peer.videoAuto = videoAuto + + peer.logger.Info().Bool("video_auto", videoAuto).Msg("set video auto") + modified = true + } + } + + // send video signal if modified + if modified { + go func() { + // in goroutine because of mutex and we don't want to block + peer.session.Send(event.SIGNAL_VIDEO, peer.Video()) + }() + } + + return nil +} + +func (peer *WebRTCPeerCtx) Video() types.PeerVideo { + peer.mu.Lock() + defer peer.mu.Unlock() + + // get current video stream ID + ID := "" + stream, ok := peer.videoTrack.Stream() + if ok { + ID = stream.ID() + } + + return types.PeerVideo{ + Disabled: peer.videoDisabled, + ID: ID, + Video: ID, // TODO: Remove, used for backward compatibility + Auto: peer.videoAuto, } } -func (peer *WebRTCPeerCtx) VideoAuto() bool { +// +// audio +// + +func (peer *WebRTCPeerCtx) SetAudio(r types.PeerAudioRequest) error { peer.mu.Lock() defer peer.mu.Unlock() - return peer.videoAuto + modified := false + + // audio disabled + if r.Disabled != nil { + disabled := *r.Disabled + + // update only if changed + if peer.audioDisabled != disabled { + peer.audioDisabled = disabled + peer.audioTrack.SetPaused(disabled || peer.paused) + + peer.logger.Info().Bool("disabled", disabled).Msg("set audio disabled") + modified = true + } + } + + // send video signal if modified + if modified { + go func() { + // in goroutine because of mutex and we don't want to block + peer.session.Send(event.SIGNAL_AUDIO, peer.Audio()) + }() + } + + return nil +} + +func (peer *WebRTCPeerCtx) Audio() types.PeerAudio { + peer.mu.Lock() + defer peer.mu.Unlock() + + return types.PeerAudio{ + Disabled: peer.audioDisabled, + } } // diff --git a/internal/webrtc/track.go b/internal/webrtc/track.go index f18122e2..907d6ad5 100644 --- a/internal/webrtc/track.go +++ b/internal/webrtc/track.go @@ -177,6 +177,7 @@ func (t *Track) SetPaused(paused bool) { // if there is no state change or no stream, do nothing if t.paused == paused || t.stream == nil { + t.paused = paused return } diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index c128c064..d42863a9 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -45,7 +45,7 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM // Signal Events case event.SIGNAL_REQUEST: - payload := &message.SignalVideo{} + payload := &message.SignalRequest{} err = utils.Unmarshal(payload, data.Payload, func() error { return h.signalRequest(session, payload) }) @@ -71,6 +71,11 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM err = utils.Unmarshal(payload, data.Payload, func() error { return h.signalVideo(session, payload) }) + case event.SIGNAL_AUDIO: + payload := &message.SignalAudio{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.signalAudio(session, payload) + }) // Control Events case event.CONTROL_RELEASE: diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 0fe6918a..e0e5fb88 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -9,17 +9,11 @@ import ( "github.com/pion/webrtc/v3" ) -func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error { +func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalRequest) error { if !session.Profile().CanWatch { return errors.New("not allowed to watch") } - // use default first video, if not provided - if payload.Video == "" { - videos := h.capture.Video().IDs() - payload.Video = videos[0] - } - offer, peer, err := h.webrtc.CreatePeer(session) if err != nil { return err @@ -30,14 +24,38 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag peer.SetPaused(true) } - // set video auto state - peer.SetVideoAuto(payload.Auto) + video := payload.Video + + // use default first video, if not provided + if video.Selector == nil { + videos := h.capture.Video().IDs() + video.Selector = &types.StreamSelector{ + ID: videos[0], + Type: types.StreamSelectorTypeExact, + } + } + + // TODO: Remove, used for compatibility with old clients. + if video.Auto == nil { + video.Auto = &payload.Auto + } // set video stream - err = peer.SetVideo(types.StreamSelector{ - ID: payload.Video, - Type: types.StreamSelectorTypeNearest, - }) + err = peer.SetVideo(video) + if err != nil { + return err + } + + audio := payload.Audio + + // enable by default if not requested otherwise + if audio.Disabled == nil { + disabled := false + audio.Disabled = &disabled + } + + // set audio stream + err = peer.SetAudio(audio) if err != nil { return err } @@ -47,6 +65,9 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag message.SignalProvide{ SDP: offer.SDP, ICEServers: h.webrtc.ICEServers(), + + Video: peer.Video(), + Audio: peer.Audio(), }) return nil @@ -128,14 +149,14 @@ func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message. return errors.New("webRTC peer does not exist") } - peer.SetVideoAuto(payload.Auto) + return peer.SetVideo(payload.PeerVideoRequest) +} - if payload.Video != "" { - return peer.SetVideo(types.StreamSelector{ - ID: payload.Video, - Type: types.StreamSelectorTypeNearest, - }) +func (h *MessageHandlerCtx) signalAudio(session types.Session, payload *message.SignalAudio) error { + peer := session.GetWebRTCPeer() + if peer == nil { + return errors.New("webRTC peer does not exist") } - return nil + return peer.SetAudio(payload.PeerAudioRequest) } diff --git a/pkg/types/capture.go b/pkg/types/capture.go index 140cde44..4fbc68da 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -94,11 +94,11 @@ func (s StreamSelectorType) MarshalText() ([]byte, error) { type StreamSelector struct { // type of stream selector - Type StreamSelectorType + Type StreamSelectorType `json:"type"` // select stream by its ID - ID string + ID string `json:"id"` // select stream by its bitrate - Bitrate uint64 + Bitrate uint64 `json:"bitrate"` } type StreamSelectorManager interface { diff --git a/pkg/types/event/events.go b/pkg/types/event/events.go index 5a3f37dc..55e34f41 100644 --- a/pkg/types/event/events.go +++ b/pkg/types/event/events.go @@ -17,6 +17,7 @@ const ( SIGNAL_PROVIDE = "signal/provide" SIGNAL_CANDIDATE = "signal/candidate" SIGNAL_VIDEO = "signal/video" + SIGNAL_AUDIO = "signal/audio" SIGNAL_CLOSE = "signal/close" ) diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index 3b536b1e..1bded7b4 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -45,9 +45,19 @@ type SystemDisconnect struct { // Signal ///////////////////////////// +type SignalRequest struct { + Video types.PeerVideoRequest `json:"video"` + Audio types.PeerAudioRequest `json:"audio"` + + Auto bool `json:"auto"` // TODO: Remove this +} + type SignalProvide struct { SDP string `json:"sdp"` ICEServers []types.ICEServer `json:"iceservers"` + + Video types.PeerVideo `json:"video"` + Audio types.PeerAudio `json:"audio"` } type SignalCandidate struct { @@ -59,8 +69,11 @@ type SignalDescription struct { } type SignalVideo struct { - Video string `json:"video"` - Auto bool `json:"auto"` + types.PeerVideoRequest +} + +type SignalAudio struct { + types.PeerAudioRequest } ///////////////////////////// diff --git a/pkg/types/webrtc.go b/pkg/types/webrtc.go index 0b6f026c..5469a3b1 100644 --- a/pkg/types/webrtc.go +++ b/pkg/types/webrtc.go @@ -18,18 +18,40 @@ type ICEServer struct { Credential string `mapstructure:"credential" json:"credential,omitempty"` } +type PeerVideo struct { + Disabled bool `json:"disabled"` + ID string `json:"id"` + Video string `json:"video"` // TODO: Remove this, used for compatibility with old clients. + Auto bool `json:"auto"` +} + +type PeerVideoRequest struct { + Disabled *bool `json:"disabled,omitempty"` + Selector *StreamSelector `json:"selector,omitempty"` + Auto *bool `json:"auto,omitempty"` +} + +type PeerAudio struct { + Disabled bool `json:"disabled"` +} + +type PeerAudioRequest struct { + Disabled *bool `json:"disabled,omitempty"` +} + type WebRTCPeer interface { CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) CreateAnswer() (*webrtc.SessionDescription, error) SetRemoteDescription(webrtc.SessionDescription) error SetCandidate(webrtc.ICECandidateInit) error - SetVideo(StreamSelector) error - VideoID() (string, bool) SetPaused(isPaused bool) error Paused() bool - SetVideoAuto(auto bool) - VideoAuto() bool + + SetVideo(PeerVideoRequest) error + Video() PeerVideo + SetAudio(PeerAudioRequest) error + Audio() PeerAudio SendCursorPosition(x, y int) error SendCursorImage(cur *CursorImage, img []byte) error From ecc68dd64452303902922668414410215d9c208d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 8 Jul 2023 16:14:11 +0200 Subject: [PATCH 849/876] fix devcontainer. --- .devcontainer/Dockerfile | 49 ++++++++++++++++++++++++++++++++++------ Dockerfile | 6 ++--- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0b844def..38dd492b 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,3 +1,33 @@ +# +# Stage 0: Build xserver-xorg-video-dummy 0.3.8-2 with RandR support. +# +FROM debian:bullseye-slim as xserver-xorg-video-dummy + +WORKDIR /usr/local/src + +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + cp /etc/apt/sources.list /etc/apt/sources.list~; \ + sed -Ei 's/^deb /deb-src /' /etc/apt/sources.list; \ + cat /etc/apt/sources.list~ >> /etc/apt/sources.list; \ + apt-get update; \ + apt-get install -y dpkg-dev git; \ + apt-get build-dep -y xserver-xorg-video-dummy; \ + git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +COPY runtime/xdummy-randr.patch /tmp/xdummy-randr.patch + +RUN set -eux; \ + cd xserver-xorg-video-dummy; \ + patch -p1 < /tmp/xdummy-randr.patch; \ + bash ./autogen.sh; \ + make; \ + make install; + # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.166.0/containers/go/.devcontainer/base.Dockerfile # [Choice] Go version: 1, 1.16, 1.15 @@ -13,7 +43,11 @@ RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/l RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ + # install libxcvt-dev (not available in debian:bullseye) + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt-dev_0.1.2-1_amd64.deb; \ + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ + apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb ./libxcvt-dev_0.1.2-1_amd64.deb; # runtime dependencies RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ @@ -25,13 +59,14 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ # needed for profile upload preStop hook zip curl \ # - # file chooser handler, clipboard - xdotool xclip \ + # file chooser handler, clipboard, drop + xdotool xclip libgtk-3-0 \ # # gst gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ gstreamer1.0-pulseaudio; + # libxcvt already installed # dev runtime dependencies RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ @@ -55,10 +90,6 @@ RUN set -eux; \ echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME; \ chmod 0440 /etc/sudoers.d/$USERNAME; \ # - # setup pulseaudio - mkdir -p /home/$USERNAME/.config/pulse/; \ - echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \ - # # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 mkdir /tmp/.X11-unix; \ chmod 1777 /tmp/.X11-unix; \ @@ -81,6 +112,9 @@ RUN set -eux; \ # Indian fonts fonts-indic; +# replace version +COPY --from=xserver-xorg-video-dummy /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so + # copy runtime files COPY runtime/dbus /usr/bin/dbus COPY runtime/default.pa /etc/pulse/default.pa @@ -103,5 +137,6 @@ RUN chmod +x /usr/bin/dbus;\ # set default envs ENV USER=$USERNAME ENV DISPLAY=:99.0 +ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket ENV NEKO_SERVER_BIND=:3000 ENV NEKO_WEBRTC_EPR=3001-3004 diff --git a/Dockerfile b/Dockerfile index f1ea73a4..1c8db9a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN set -eux; \ sed -Ei 's/^deb /deb-src /' /etc/apt/sources.list; \ cat /etc/apt/sources.list~ >> /etc/apt/sources.list; \ apt-get update; \ - apt-get install -y dpkg-dev git; \ + apt-get install -y dpkg-dev git; \ apt-get build-dep -y xserver-xorg-video-dummy; \ git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ # @@ -24,8 +24,8 @@ COPY runtime/xdummy-randr.patch /tmp/xdummy-randr.patch RUN set -eux; \ cd xserver-xorg-video-dummy; \ patch -p1 < /tmp/xdummy-randr.patch; \ - bash ./autogen.sh; \ - make; \ + bash ./autogen.sh; \ + make; \ make install; # From 4cb1b3e925dd5ed1b4299a2d247248893938ff77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 16 Jul 2023 16:49:51 +0200 Subject: [PATCH 850/876] upgrade go dependencies. (#52) --- go.mod | 33 +++++++++++++++++---------------- go.sum | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 0290919c..dd1379a8 100644 --- a/go.mod +++ b/go.mod @@ -8,15 +8,15 @@ require ( github.com/go-chi/cors v1.2.1 github.com/gorilla/websocket v1.5.0 github.com/kataras/go-events v0.0.3 - github.com/pion/ice/v2 v2.3.4 + github.com/pion/ice/v2 v2.3.9 github.com/pion/interceptor v0.1.17 github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.10 - github.com/pion/webrtc/v3 v3.2.5 - github.com/prometheus/client_golang v1.15.1 + github.com/pion/webrtc/v3 v3.2.12 + github.com/prometheus/client_golang v1.16.0 github.com/rs/zerolog v1.29.1 github.com/spf13/cobra v1.7.0 - github.com/spf13/viper v1.15.0 + github.com/spf13/viper v1.16.0 ) require ( @@ -30,10 +30,10 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pion/datachannel v1.5.5 // indirect github.com/pion/dtls/v2 v2.2.7 // indirect github.com/pion/mdns v0.0.7 // indirect @@ -42,25 +42,26 @@ require ( github.com/pion/sctp v1.8.7 // indirect github.com/pion/sdp/v3 v3.0.6 // indirect github.com/pion/srtp/v2 v2.0.15 // indirect - github.com/pion/stun v0.5.2 // indirect + github.com/pion/stun v0.6.1 // indirect github.com/pion/transport/v2 v2.2.1 // indirect - github.com/pion/turn/v2 v2.1.0 // indirect + github.com/pion/turn/v2 v2.1.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.43.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect + github.com/prometheus/common v0.44.0 // indirect + github.com/prometheus/procfs v0.11.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/spf13/afero v1.9.5 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/testify v1.8.3 // indirect + github.com/stretchr/objx v0.5.0 // indirect + github.com/stretchr/testify v1.8.4 // indirect github.com/subosito/gotenv v1.4.2 // indirect - golang.org/x/crypto v0.9.0 // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect - google.golang.org/protobuf v1.30.0 // indirect + golang.org/x/crypto v0.11.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index bf74375e..f90a8cf1 100644 --- a/go.sum +++ b/go.sum @@ -172,6 +172,8 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= @@ -187,6 +189,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= +github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY= @@ -194,6 +198,8 @@ github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8= github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= github.com/pion/ice/v2 v2.3.4 h1:tjYjTLpWyZzUjpDnzk6T1y3oQyhyY2DiM2t095iDhyQ= github.com/pion/ice/v2 v2.3.4/go.mod h1:jVbxqPWQDK5+/V/YqpinUcP0YtDGYqd24n2lusVdX80= +github.com/pion/ice/v2 v2.3.9 h1:7yZpHf3PhPxJGT4JkMj1Y8Rl5cQ6fB709iz99aeMd/U= +github.com/pion/ice/v2 v2.3.9/go.mod h1:lT3kv5uUIlHfXHU/ZRD7uKD/ufM202+eTa3C/umgGf4= github.com/pion/interceptor v0.1.17 h1:prJtgwFh/gB8zMqGZoOgJPHivOwVAp61i2aG61Du/1w= github.com/pion/interceptor v0.1.17/go.mod h1:SY8kpmfVBvrbUzvj2bsXz7OJt5JvmVNZ+4Kjq7FcwrI= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= @@ -216,6 +222,8 @@ github.com/pion/srtp/v2 v2.0.15/go.mod h1:b/pQOlDrbB0HEH5EUAQXzSYxikFbNcNuKmF8tM github.com/pion/stun v0.4.0/go.mod h1:QPsh1/SbXASntw3zkkrIk3ZJVKz4saBY2G7S10P3wCw= github.com/pion/stun v0.5.2 h1:J/8glQnDV91dfk2+ZnGN0o9bUJgABhTNljwfQWByoXE= github.com/pion/stun v0.5.2/go.mod h1:TNo1HjyjaFVpMZsvowqPeV8TfwRytympQC0//neaksA= +github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4= +github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8= github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40= github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI= github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc= @@ -226,22 +234,32 @@ github.com/pion/transport/v2 v2.2.1 h1:7qYnCBlpgSJNYMbLCKuSY9KbQdBFoETvPNETv0y4N github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g= github.com/pion/turn/v2 v2.1.0 h1:5wGHSgGhJhP/RpabkUb/T9PdsAjkGLS6toYz5HNzoSI= github.com/pion/turn/v2 v2.1.0/go.mod h1:yrT5XbXSGX1VFSF31A3c1kCNB5bBZgk/uu5LET162qs= +github.com/pion/turn/v2 v2.1.2 h1:wj0cAoGKltaZ790XEGW9HwoUewqjliwmhtxCuB2ApyM= +github.com/pion/turn/v2 v2.1.2/go.mod h1:1kjnPkBcex3dhCU2Am+AAmxDcGhLX3WnMfmkNpvSTQU= github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8= github.com/pion/webrtc/v3 v3.2.5 h1:WA38+a1T3/EP55k5IYQFLH3ORaNpRTcElW6UL1CwNeA= github.com/pion/webrtc/v3 v3.2.5/go.mod h1:8+GhDtUqfKmnZkj+aT2kjvV9B2/nhSTqINEXbVQEGSo= +github.com/pion/webrtc/v3 v3.2.12 h1:pVqz5NdtTqyhKIhMcXR8bPp709kCf9blyAhDjoVRLvA= +github.com/pion/webrtc/v3 v3.2.12/go.mod h1:/Oz6K95CGWaN+3No+Z0NYvgOPOr3aY8UyTlMm/dec3A= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= +github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= github.com/prometheus/common v0.43.0/go.mod h1:NCvr5cQIh3Y/gy73/RdVtC9r8xxrxwJnB+2lB3BxrFc= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk= +github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= @@ -263,8 +281,11 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -276,6 +297,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -301,6 +324,9 @@ golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -380,6 +406,9 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -455,6 +484,9 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -463,6 +495,7 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -477,6 +510,9 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -626,6 +662,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From ea5517b270da2c95d32926a3a1ab4b4e885fd351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 17 Aug 2023 16:14:59 +0200 Subject: [PATCH 851/876] Xorg input driver (#53) * add xf86 input driver. * cleanup. * rewrite to unix socket PoC. * add input rebuild. * lint & docs. * add input driver struct. * comments, lint, socket name from config. * add touch events to webrtc. * switch to uint32. * misc update logging & linting, * fix screen size * set touchscreen as core pointer. * add touch to ws control. * SendCoreEvents. * extract to own xinput folder. * add debounce. * switch pressure to uint8. * check buffer size. * send touch events with system init. --- Dockerfile | 46 +- Dockerfile.nvidia | 46 +- dev/rebuild.input | 32 ++ internal/config/desktop.go | 41 +- internal/desktop/manager.go | 59 +- internal/desktop/xinput.go | 36 ++ internal/desktop/xorg.go | 15 +- internal/webrtc/handler.go | 33 ++ internal/webrtc/payload/receive.go | 11 + internal/websocket/handler/control.go | 21 + internal/websocket/handler/handler.go | 16 + internal/websocket/handler/system.go | 1 + pkg/types/desktop.go | 11 + pkg/types/event/events.go | 4 + pkg/types/message/messages.go | 7 + pkg/xinput/dummy.go | 31 ++ pkg/xinput/types.go | 61 +++ pkg/xinput/xinput.go | 122 +++++ pkg/xorg/xorg.go | 16 +- runtime/xorg.conf | 8 + xorg/xf86-input-neko/.gitignore | 67 +++ xorg/xf86-input-neko/80-neko.conf | 9 + xorg/xf86-input-neko/COPYING | 27 + xorg/xf86-input-neko/Dockerfile | 22 + xorg/xf86-input-neko/Makefile.am | 30 ++ xorg/xf86-input-neko/README.md | 19 + xorg/xf86-input-neko/autogen-clean.sh | 8 + xorg/xf86-input-neko/autogen.sh | 22 + xorg/xf86-input-neko/configure.ac | 109 ++++ xorg/xf86-input-neko/m4/.gitkeep | 0 xorg/xf86-input-neko/release.sh | 121 +++++ xorg/xf86-input-neko/src/Makefile.am | 31 ++ xorg/xf86-input-neko/src/neko.c | 502 ++++++++++++++++++ xorg/xf86-input-neko/xorg-neko.pc.in | 5 + .../xf86-video-dummy}/xdummy-randr.patch | 0 35 files changed, 1507 insertions(+), 82 deletions(-) create mode 100755 dev/rebuild.input create mode 100644 internal/desktop/xinput.go create mode 100644 pkg/xinput/dummy.go create mode 100644 pkg/xinput/types.go create mode 100644 pkg/xinput/xinput.go create mode 100644 xorg/xf86-input-neko/.gitignore create mode 100644 xorg/xf86-input-neko/80-neko.conf create mode 100644 xorg/xf86-input-neko/COPYING create mode 100644 xorg/xf86-input-neko/Dockerfile create mode 100644 xorg/xf86-input-neko/Makefile.am create mode 100644 xorg/xf86-input-neko/README.md create mode 100755 xorg/xf86-input-neko/autogen-clean.sh create mode 100755 xorg/xf86-input-neko/autogen.sh create mode 100644 xorg/xf86-input-neko/configure.ac create mode 100644 xorg/xf86-input-neko/m4/.gitkeep create mode 100755 xorg/xf86-input-neko/release.sh create mode 100644 xorg/xf86-input-neko/src/Makefile.am create mode 100644 xorg/xf86-input-neko/src/neko.c create mode 100644 xorg/xf86-input-neko/xorg-neko.pc.in rename {runtime => xorg/xf86-video-dummy}/xdummy-randr.patch (100%) diff --git a/Dockerfile b/Dockerfile index 1c8db9a6..f40e5e87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,31 +1,36 @@ # -# Stage 0: Build xserver-xorg-video-dummy 0.3.8-2 with RandR support. +# Stage 0: Build xorg dependencies. # -FROM debian:bullseye-slim as xserver-xorg-video-dummy - -WORKDIR /usr/local/src +FROM debian:bullseye-slim as xorg-deps ENV DEBIAN_FRONTEND=noninteractive + RUN set -eux; \ - cp /etc/apt/sources.list /etc/apt/sources.list~; \ - sed -Ei 's/^deb /deb-src /' /etc/apt/sources.list; \ - cat /etc/apt/sources.list~ >> /etc/apt/sources.list; \ apt-get update; \ - apt-get install -y dpkg-dev git; \ - apt-get build-dep -y xserver-xorg-video-dummy; \ - git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* + apt-get install -y \ + git gcc pkgconf autoconf automake libtool make xorg-dev xutils-dev \ + && rm -rf /var/lib/apt/lists/*; -COPY runtime/xdummy-randr.patch /tmp/xdummy-randr.patch +WORKDIR /xorg +COPY xorg/ /xorg/ + +# build xserver-xorg-video-dummy 0.3.8-2 with RandR support. RUN set -eux; \ + cd xf86-video-dummy; \ + git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ cd xserver-xorg-video-dummy; \ - patch -p1 < /tmp/xdummy-randr.patch; \ - bash ./autogen.sh; \ - make; \ + patch -p1 < ../xdummy-randr.patch; \ + ./autogen.sh; \ + make -j$(nproc); \ + make install; + +# build custom input driver +RUN set -eux; \ + cd xf86-input-neko; \ + ./autogen.sh --prefix=/usr; \ + ./configure; \ + make -j$(nproc); \ make install; # @@ -129,8 +134,9 @@ RUN set -eux; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* -# replace version -COPY --from=xserver-xorg-video-dummy /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so +# copy dependencies from previous stage +COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so +COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so # # copy runtime configs diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index 1bccff48..fe977365 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -52,33 +52,38 @@ RUN set -eux; \ meson install -C build; # -# Stage 0: Build xserver-xorg-video-dummy 0.3.8-2 with RandR support. +# Stage 0: Build xorg dependencies. # -FROM debian:bullseye-slim as xserver-xorg-video-dummy - -WORKDIR /usr/local/src +FROM debian:bullseye-slim as xorg-deps ENV DEBIAN_FRONTEND=noninteractive + RUN set -eux; \ - cp /etc/apt/sources.list /etc/apt/sources.list~; \ - sed -Ei 's/^deb /deb-src /' /etc/apt/sources.list; \ - cat /etc/apt/sources.list~ >> /etc/apt/sources.list; \ apt-get update; \ - apt-get install -y dpkg-dev git; \ - apt-get build-dep -y xserver-xorg-video-dummy; \ - git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* + apt-get install -y \ + git gcc pkgconf autoconf automake libtool make xorg-dev xutils-dev \ + && rm -rf /var/lib/apt/lists/*; -COPY runtime/xdummy-randr.patch /tmp/xdummy-randr.patch +WORKDIR /xorg +COPY xorg/ /xorg/ + +# build xserver-xorg-video-dummy 0.3.8-2 with RandR support. RUN set -eux; \ + cd xf86-video-dummy; \ + git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ cd xserver-xorg-video-dummy; \ - patch -p1 < /tmp/xdummy-randr.patch; \ - bash ./autogen.sh; \ - make; \ + patch -p1 < ../xdummy-randr.patch; \ + ./autogen.sh; \ + make -j$(nproc); \ + make install; + +# build custom input driver +RUN set -eux; \ + cd xf86-input-neko; \ + ./autogen.sh --prefix=/usr; \ + ./configure; \ + make -j$(nproc); \ make install; # @@ -236,8 +241,9 @@ RUN set -eux; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* -# replace version -COPY --from=xserver-xorg-video-dummy /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so +# copy dependencies from previous stage +COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so +COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so # # configure EGL and Vulkan manually diff --git a/dev/rebuild.input b/dev/rebuild.input new file mode 100755 index 00000000..7f10523d --- /dev/null +++ b/dev/rebuild.input @@ -0,0 +1,32 @@ +#!/bin/bash +cd "$(dirname "$0")" +cd ../xorg/xf86-input-neko + +# +# aborting if any command returns a non-zero value +set -e + +# +# check if docker image exists +if [ -z "$(docker images -q xf86-input-neko)" ]; then + echo "Docker image not found, building it" + docker build -t xf86-input-neko . +fi + +# +# if there is no ./configure script, run autogen.sh and configure +if [ ! -f ./configure ]; then + docker run -v $PWD/:/app --rm xf86-input-neko bash -c './autogen.sh && ./configure' +fi + +# +# make install +docker run -v $PWD/:/app --rm xf86-input-neko bash -c 'make && make install DESTDIR=/app/build' + +# +# replace input driver in container +docker cp "${PWD}/build/usr/local/lib/xorg/modules/input/neko_drv.so" neko_server_dev:/usr/lib/xorg/modules/input/neko_drv.so + +# +# restart server +docker exec neko_server_dev supervisorctl -c /etc/neko/supervisord.conf restart x-server diff --git a/internal/config/desktop.go b/internal/config/desktop.go index 4a21674d..a18d2c12 100644 --- a/internal/config/desktop.go +++ b/internal/config/desktop.go @@ -7,16 +7,19 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/demodesk/neko/pkg/types" ) type Desktop struct { Display string - Unminimize bool + ScreenSize types.ScreenSize - ScreenWidth int - ScreenHeight int - ScreenRate int16 + UseInputDriver bool + InputSocket string + + Unminimize bool } func (Desktop) Init(cmd *cobra.Command) error { @@ -25,6 +28,16 @@ func (Desktop) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("desktop.input.enabled", true, "whether custom xf86 input driver should be used to handle touchscreen") + if err := viper.BindPFlag("desktop.input.enabled", cmd.PersistentFlags().Lookup("desktop.input.enabled")); err != nil { + return err + } + + cmd.PersistentFlags().String("desktop.input.socket", "/tmp/xf86-input-neko.sock", "socket path for custom xf86 input driver connection") + if err := viper.BindPFlag("desktop.input.socket", cmd.PersistentFlags().Lookup("desktop.input.socket")); err != nil { + return err + } + cmd.PersistentFlags().Bool("desktop.unminimize", true, "automatically unminimize window when it is minimized") if err := viper.BindPFlag("desktop.unminimize", cmd.PersistentFlags().Lookup("desktop.unminimize")); err != nil { return err @@ -37,11 +50,11 @@ func (s *Desktop) Set() { // Display is provided by env variable s.Display = os.Getenv("DISPLAY") - s.Unminimize = viper.GetBool("desktop.unminimize") - - s.ScreenWidth = 1280 - s.ScreenHeight = 720 - s.ScreenRate = 30 + s.ScreenSize = types.ScreenSize{ + Width: 1280, + Height: 720, + Rate: 30, + } r := regexp.MustCompile(`([0-9]{1,4})x([0-9]{1,4})@([0-9]{1,3})`) res := r.FindStringSubmatch(viper.GetString("desktop.screen")) @@ -52,9 +65,13 @@ func (s *Desktop) Set() { rate, err3 := strconv.ParseInt(res[3], 10, 64) if err1 == nil && err2 == nil && err3 == nil { - s.ScreenWidth = int(width) - s.ScreenHeight = int(height) - s.ScreenRate = int16(rate) + s.ScreenSize.Width = int(width) + s.ScreenSize.Height = int(height) + s.ScreenSize.Rate = int16(rate) } } + + s.UseInputDriver = viper.GetBool("desktop.input.enabled") + s.InputSocket = viper.GetString("desktop.input.socket") + s.Unminimize = viper.GetBool("desktop.unminimize") } diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index dff9b9f6..2f981618 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -1,7 +1,6 @@ package desktop import ( - "fmt" "sync" "time" @@ -10,26 +9,39 @@ import ( "github.com/rs/zerolog/log" "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/xevent" + "github.com/demodesk/neko/pkg/xinput" "github.com/demodesk/neko/pkg/xorg" ) var mu = sync.Mutex{} type DesktopManagerCtx struct { - logger zerolog.Logger - wg sync.WaitGroup - shutdown chan struct{} - emmiter events.EventEmmiter - config *config.Desktop + logger zerolog.Logger + wg sync.WaitGroup + shutdown chan struct{} + emmiter events.EventEmmiter + config *config.Desktop + screenSize types.ScreenSize // cached screen size + input xinput.Driver } func New(config *config.Desktop) *DesktopManagerCtx { + var input xinput.Driver + if config.UseInputDriver { + input = xinput.NewDriver(config.InputSocket) + } else { + input = xinput.NewDummy() + } + return &DesktopManagerCtx{ - logger: log.With().Str("module", "desktop").Logger(), - shutdown: make(chan struct{}), - emmiter: events.New(), - config: config, + logger: log.With().Str("module", "desktop").Logger(), + shutdown: make(chan struct{}), + emmiter: events.New(), + config: config, + screenSize: config.ScreenSize, + input: input, } } @@ -40,10 +52,24 @@ func (manager *DesktopManagerCtx) Start() { xorg.GetScreenConfigurations() - width, height, rate, err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) - manager.logger.Err(err). - Str("screen_size", fmt.Sprintf("%dx%d@%d", width, height, rate)). - Msgf("setting initial screen size") + screenSize, err := xorg.ChangeScreenSize(manager.config.ScreenSize) + if err != nil { + manager.logger.Err(err). + Str("screen_size", screenSize.String()). + Msgf("unable to set initial screen size") + } else { + // cache screen size + manager.screenSize = screenSize + manager.logger.Info(). + Str("screen_size", screenSize.String()). + Msgf("setting initial screen size") + } + + err = manager.input.Connect() + if err != nil { + // TODO: fail silently to dummy driver? + manager.logger.Panic().Err(err).Msg("unable to connect to input driver") + } xevent.Unminimize = manager.config.Unminimize go xevent.EventLoop(manager.config.Display) @@ -68,12 +94,15 @@ func (manager *DesktopManagerCtx) Start() { ticker := time.NewTicker(1 * time.Second) defer ticker.Stop() + const debounceDuration = 10 * time.Second + for { select { case <-manager.shutdown: return case <-ticker.C: - xorg.CheckKeys(time.Second * 10) + xorg.CheckKeys(debounceDuration) + manager.input.Debounce(debounceDuration) } } }() diff --git a/internal/desktop/xinput.go b/internal/desktop/xinput.go new file mode 100644 index 00000000..69f78c60 --- /dev/null +++ b/internal/desktop/xinput.go @@ -0,0 +1,36 @@ +package desktop + +import "github.com/demodesk/neko/pkg/xinput" + +func (manager *DesktopManagerCtx) inputRelToAbs(x, y int) (int, int) { + return (x * xinput.AbsX) / manager.screenSize.Width, (y * xinput.AbsY) / manager.screenSize.Height +} + +func (manager *DesktopManagerCtx) HasTouchSupport() bool { + // we assume now, that if the input driver is enabled, we have touch support + return manager.config.UseInputDriver +} + +func (manager *DesktopManagerCtx) TouchBegin(touchId uint32, x, y int, pressure uint8) error { + mu.Lock() + defer mu.Unlock() + + x, y = manager.inputRelToAbs(x, y) + return manager.input.TouchBegin(touchId, x, y, pressure) +} + +func (manager *DesktopManagerCtx) TouchUpdate(touchId uint32, x, y int, pressure uint8) error { + mu.Lock() + defer mu.Unlock() + + x, y = manager.inputRelToAbs(x, y) + return manager.input.TouchUpdate(touchId, x, y, pressure) +} + +func (manager *DesktopManagerCtx) TouchEnd(touchId uint32, x, y int, pressure uint8) error { + mu.Lock() + defer mu.Unlock() + + x, y = manager.inputRelToAbs(x, y) + return manager.input.TouchEnd(touchId, x, y, pressure) +} diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 917f467d..867a775f 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -85,7 +85,7 @@ func (manager *DesktopManagerCtx) ScreenConfigurations() []types.ScreenSize { return configs } -func (manager *DesktopManagerCtx) SetScreenSize(size types.ScreenSize) (types.ScreenSize, error) { +func (manager *DesktopManagerCtx) SetScreenSize(screenSize types.ScreenSize) (types.ScreenSize, error) { mu.Lock() manager.emmiter.Emit("before_screen_size_change") @@ -94,12 +94,13 @@ func (manager *DesktopManagerCtx) SetScreenSize(size types.ScreenSize) (types.Sc mu.Unlock() }() - w, h, r, err := xorg.ChangeScreenSize(size.Width, size.Height, size.Rate) - return types.ScreenSize{ - Width: w, - Height: h, - Rate: r, - }, err + screenSize, err := xorg.ChangeScreenSize(screenSize) + if err == nil { + // cache the new screen size + manager.screenSize = screenSize + } + + return screenSize, err } func (manager *DesktopManagerCtx) GetScreenSize() types.ScreenSize { diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 7d828f2a..00f0fcd9 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -151,6 +151,39 @@ func (manager *WebRTCManagerCtx) handle( } else { logger.Trace().Uint32("key", payload.Key).Msg("button up") } + case payload.OP_TOUCH_BEGIN: + payload := &payload.Touch{} + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { + return err + } + + if err := manager.desktop.TouchBegin(payload.TouchId, int(payload.X), int(payload.Y), payload.Pressure); err != nil { + logger.Warn().Err(err).Uint32("touchId", payload.TouchId).Msg("touch begin failed") + } else { + logger.Trace().Uint32("touchId", payload.TouchId).Msg("touch begin") + } + case payload.OP_TOUCH_UPDATE: + payload := &payload.Touch{} + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { + return err + } + + if err := manager.desktop.TouchUpdate(payload.TouchId, int(payload.X), int(payload.Y), payload.Pressure); err != nil { + logger.Warn().Err(err).Uint32("touchId", payload.TouchId).Msg("touch update failed") + } else { + logger.Trace().Uint32("touchId", payload.TouchId).Msg("touch update") + } + case payload.OP_TOUCH_END: + payload := &payload.Touch{} + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { + return err + } + + if err := manager.desktop.TouchEnd(payload.TouchId, int(payload.X), int(payload.Y), payload.Pressure); err != nil { + logger.Warn().Err(err).Uint32("touchId", payload.TouchId).Msg("touch end failed") + } else { + logger.Trace().Uint32("touchId", payload.TouchId).Msg("touch end") + } } return nil diff --git a/internal/webrtc/payload/receive.go b/internal/webrtc/payload/receive.go index 68ef8f77..37383d7e 100644 --- a/internal/webrtc/payload/receive.go +++ b/internal/webrtc/payload/receive.go @@ -10,6 +10,10 @@ const ( OP_BTN_DOWN = 0x05 OP_BTN_UP = 0x06 OP_PING = 0x07 + // touch events + OP_TOUCH_BEGIN = 0x08 + OP_TOUCH_UPDATE = 0x09 + OP_TOUCH_END = 0x0a ) type Move struct { @@ -35,3 +39,10 @@ type Ping struct { func (p Ping) ClientTs() uint64 { return (uint64(p.ClientTs1) * uint64(math.MaxUint32)) + uint64(p.ClientTs2) } + +type Touch struct { + TouchId uint32 + X int32 + Y int32 + Pressure uint8 +} diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 2eec4a3b..456d166b 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -155,6 +155,27 @@ func (h *MessageHandlerCtx) controlKeyUp(session types.Session, payload *message return h.desktop.KeyUp(payload.Keysym) } +func (h *MessageHandlerCtx) controlTouchBegin(session types.Session, payload *message.ControlTouch) error { + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err + } + return h.desktop.TouchBegin(payload.TouchId, payload.X, payload.Y, payload.Pressure) +} + +func (h *MessageHandlerCtx) controlTouchUpdate(session types.Session, payload *message.ControlTouch) error { + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err + } + return h.desktop.TouchUpdate(payload.TouchId, payload.X, payload.Y, payload.Pressure) +} + +func (h *MessageHandlerCtx) controlTouchEnd(session types.Session, payload *message.ControlTouch) error { + if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { + return err + } + return h.desktop.TouchEnd(payload.TouchId, payload.X, payload.Y, payload.Pressure) +} + func (h *MessageHandlerCtx) controlCut(session types.Session) error { if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index d42863a9..8e8a8566 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -122,6 +122,22 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM err = utils.Unmarshal(payload, data.Payload, func() error { return h.controlKeyUp(session, payload) }) + // touch + case event.CONTROL_TOUCHBEGIN: + payload := &message.ControlTouch{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlTouchBegin(session, payload) + }) + case event.CONTROL_TOUCHUPDATE: + payload := &message.ControlTouch{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlTouchUpdate(session, payload) + }) + case event.CONTROL_TOUCHEND: + payload := &message.ControlTouch{} + err = utils.Unmarshal(payload, data.Payload, func() error { + return h.controlTouchEnd(session, payload) + }) // actions case event.CONTROL_CUT: err = h.controlCut(session) diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 09318909..adf375d2 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -47,6 +47,7 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { ScreenSize: screenSize, Sessions: sessions, Settings: h.sessions.Settings(), + TouchEvents: h.desktop.HasTouchSupport(), ScreencastEnabled: h.capture.Screencast().Enabled(), WebRTC: message.SystemWebRTC{ Videos: h.capture.Video().IDs(), diff --git a/pkg/types/desktop.go b/pkg/types/desktop.go index 24e694b0..16e36468 100644 --- a/pkg/types/desktop.go +++ b/pkg/types/desktop.go @@ -1,6 +1,7 @@ package types import ( + "fmt" "image" ) @@ -19,6 +20,10 @@ type ScreenSize struct { Rate int16 } +func (s ScreenSize) String() string { + return fmt.Sprintf("%dx%d@%d", s.Width, s.Height, s.Rate) +} + type KeyboardModifiers struct { NumLock *bool CapsLock *bool @@ -68,6 +73,12 @@ type DesktopManager interface { OnFileChooserDialogClosed(listener func()) OnEventError(listener func(error_code uint8, message string, request_code uint8, minor_code uint8)) + // input driver + HasTouchSupport() bool + TouchBegin(touchId uint32, x, y int, pressure uint8) error + TouchUpdate(touchId uint32, x, y int, pressure uint8) error + TouchEnd(touchId uint32, x, y int, pressure uint8) error + // clipboard ClipboardGetText() (*ClipboardText, error) ClipboardSetText(data ClipboardText) error diff --git a/pkg/types/event/events.go b/pkg/types/event/events.go index 55e34f41..32857b9e 100644 --- a/pkg/types/event/events.go +++ b/pkg/types/event/events.go @@ -43,6 +43,10 @@ const ( CONTROL_KEYPRESS = "control/keypress" CONTROL_KEYDOWN = "control/keydown" CONTROL_KEYUP = "control/keyup" + // touch + CONTROL_TOUCHBEGIN = "control/touchbegin" + CONTROL_TOUCHUPDATE = "control/touchupdate" + CONTROL_TOUCHEND = "control/touchend" // actions CONTROL_CUT = "control/cut" CONTROL_COPY = "control/copy" diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index 1bded7b4..b3bea68b 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -20,6 +20,7 @@ type SystemInit struct { ScreenSize ScreenSize `json:"screen_size"` Sessions map[string]SessionData `json:"sessions"` Settings types.Settings `json:"settings"` + TouchEvents bool `json:"touch_events"` ScreencastEnabled bool `json:"screencast_enabled"` WebRTC SystemWebRTC `json:"webrtc"` } @@ -129,6 +130,12 @@ type ControlKey struct { Keysym uint32 `json:"keysym"` } +type ControlTouch struct { + TouchId uint32 `json:"touch_id"` + *ControlPos + Pressure uint8 `json:"pressure"` +} + ///////////////////////////// // Screen ///////////////////////////// diff --git a/pkg/xinput/dummy.go b/pkg/xinput/dummy.go new file mode 100644 index 00000000..a2d5c344 --- /dev/null +++ b/pkg/xinput/dummy.go @@ -0,0 +1,31 @@ +package xinput + +import "time" + +type dummy struct{} + +func NewDummy() Driver { + return &dummy{} +} + +func (d *dummy) Connect() error { + return nil +} + +func (d *dummy) Close() error { + return nil +} + +func (d *dummy) Debounce(duration time.Duration) {} + +func (d *dummy) TouchBegin(touchId uint32, x, y int, pressure uint8) error { + return nil +} + +func (d *dummy) TouchUpdate(touchId uint32, x, y int, pressure uint8) error { + return nil +} + +func (d *dummy) TouchEnd(touchId uint32, x, y int, pressure uint8) error { + return nil +} diff --git a/pkg/xinput/types.go b/pkg/xinput/types.go new file mode 100644 index 00000000..7f94044d --- /dev/null +++ b/pkg/xinput/types.go @@ -0,0 +1,61 @@ +package xinput + +import "time" + +const ( + // absolute coordinates used in driver + AbsX = 0xffff + AbsY = 0xffff +) + +const ( + XI_TouchBegin = 18 + XI_TouchUpdate = 19 + XI_TouchEnd = 20 +) + +type Message struct { + _type uint16 + touchId uint32 + x int32 // can be negative? + y int32 // can be negative? + pressure uint8 +} + +func (msg *Message) Unpack(buffer []byte) { + msg._type = uint16(buffer[0]) + msg.touchId = uint32(buffer[1]) | (uint32(buffer[2]) << 8) + msg.x = int32(buffer[3]) | (int32(buffer[4]) << 8) | (int32(buffer[5]) << 16) | (int32(buffer[6]) << 24) + msg.y = int32(buffer[7]) | (int32(buffer[8]) << 8) | (int32(buffer[9]) << 16) | (int32(buffer[10]) << 24) + msg.pressure = uint8(buffer[11]) +} + +func (msg *Message) Pack() []byte { + var buffer [12]byte + + buffer[0] = byte(msg._type) + buffer[1] = byte(msg.touchId) + buffer[2] = byte(msg.touchId >> 8) + buffer[3] = byte(msg.x) + buffer[4] = byte(msg.x >> 8) + buffer[5] = byte(msg.x >> 16) + buffer[6] = byte(msg.x >> 24) + buffer[7] = byte(msg.y) + buffer[8] = byte(msg.y >> 8) + buffer[9] = byte(msg.y >> 16) + buffer[10] = byte(msg.y >> 24) + buffer[11] = byte(msg.pressure) + + return buffer[:] +} + +type Driver interface { + Connect() error + Close() error + // release touches, that were not updated for duration + Debounce(duration time.Duration) + // touch events + TouchBegin(touchId uint32, x, y int, pressure uint8) error + TouchUpdate(touchId uint32, x, y int, pressure uint8) error + TouchEnd(touchId uint32, x, y int, pressure uint8) error +} diff --git a/pkg/xinput/xinput.go b/pkg/xinput/xinput.go new file mode 100644 index 00000000..a6ce1033 --- /dev/null +++ b/pkg/xinput/xinput.go @@ -0,0 +1,122 @@ +/* custom xf86 input driver communication protocol */ +package xinput + +import ( + "fmt" + "net" + "sync" + "time" +) + +type driver struct { + mu sync.Mutex + socket string + conn net.Conn + + debounceTouchIds map[uint32]time.Time +} + +func NewDriver(socket string) Driver { + return &driver{ + socket: socket, + + debounceTouchIds: make(map[uint32]time.Time), + } +} + +func (d *driver) Connect() error { + c, err := net.Dial("unix", d.socket) + if err != nil { + return err + } + d.conn = c + return nil +} + +func (d *driver) Close() error { + return d.conn.Close() +} + +func (d *driver) Debounce(duration time.Duration) { + d.mu.Lock() + defer d.mu.Unlock() + + t := time.Now() + for touchId, start := range d.debounceTouchIds { + if t.Sub(start) < duration { + continue + } + + msg := Message{ + _type: XI_TouchEnd, + touchId: touchId, + x: -1, + y: -1, + } + _, _ = d.conn.Write(msg.Pack()) + delete(d.debounceTouchIds, touchId) + } +} + +func (d *driver) TouchBegin(touchId uint32, x, y int, pressure uint8) error { + d.mu.Lock() + defer d.mu.Unlock() + + if _, ok := d.debounceTouchIds[touchId]; ok { + return fmt.Errorf("debounced touch id %v", touchId) + } + + d.debounceTouchIds[touchId] = time.Now() + + msg := Message{ + _type: XI_TouchBegin, + touchId: touchId, + x: int32(x), + y: int32(y), + pressure: pressure, + } + _, err := d.conn.Write(msg.Pack()) + return err +} + +func (d *driver) TouchUpdate(touchId uint32, x, y int, pressure uint8) error { + d.mu.Lock() + defer d.mu.Unlock() + + if _, ok := d.debounceTouchIds[touchId]; !ok { + return fmt.Errorf("unknown touch id %v", touchId) + } + + d.debounceTouchIds[touchId] = time.Now() + + msg := Message{ + _type: XI_TouchUpdate, + touchId: touchId, + x: int32(x), + y: int32(y), + pressure: pressure, + } + _, err := d.conn.Write(msg.Pack()) + return err +} + +func (d *driver) TouchEnd(touchId uint32, x, y int, pressure uint8) error { + d.mu.Lock() + defer d.mu.Unlock() + + if _, ok := d.debounceTouchIds[touchId]; !ok { + return fmt.Errorf("unknown touch id %v", touchId) + } + + delete(d.debounceTouchIds, touchId) + + msg := Message{ + _type: XI_TouchEnd, + touchId: touchId, + x: int32(x), + y: int32(y), + pressure: pressure, + } + _, err := d.conn.Write(msg.Pack()) + return err +} diff --git a/pkg/xorg/xorg.go b/pkg/xorg/xorg.go index 2be47a66..b9846974 100644 --- a/pkg/xorg/xorg.go +++ b/pkg/xorg/xorg.go @@ -185,20 +185,20 @@ func CheckKeys(duration time.Duration) { } // set screen configuration, create new one if not exists -func ChangeScreenSize(width int, height int, rate int16) (int, int, int16, error) { +func ChangeScreenSize(s types.ScreenSize) (types.ScreenSize, error) { mu.Lock() defer mu.Unlock() // round width to 8, because of Xorg - width = width - (width % 8) + s.Width = s.Width - (s.Width % 8) // if rate is 0, set it to 60 - if rate == 0 { - rate = 60 + if s.Rate == 0 { + s.Rate = 60 } // convert variables to C types - c_width, c_height, c_rate := C.int(width), C.int(height), C.short(rate) + c_width, c_height, c_rate := C.int(s.Width), C.int(s.Height), C.short(s.Rate) // if screen configuration already exists, just set it status := C.XSetScreenConfiguration(c_width, c_height, c_rate) @@ -214,15 +214,15 @@ func ChangeScreenSize(width int, height int, rate int16) (int, int, int16, error // if screen configuration was not set successfully, return error if status != C.RRSetConfigSuccess { - err = fmt.Errorf("unknown screen configuration %dx%d@%d", width, height, rate) + err = fmt.Errorf("unknown screen configuration %s", s.String()) } // if specified rate is not supported a BadValue error is returned if status == C.BadValue { - err = fmt.Errorf("unsupported screen rate %d", rate) + err = fmt.Errorf("unsupported screen rate %d", s.Rate) } - return width, height, rate, err + return s, err } func GetScreenSize() types.ScreenSize { diff --git a/runtime/xorg.conf b/runtime/xorg.conf index 188d5a9e..ed0e8488 100644 --- a/runtime/xorg.conf +++ b/runtime/xorg.conf @@ -23,6 +23,13 @@ Section "InputDevice" Driver "void" EndSection +Section "InputDevice" + Identifier "dummy_touchscreen" + Option "SendCoreEvents" "On" + Option "SocketName" "/tmp/xf86-input-neko.sock" + Driver "neko" +EndSection + Section "Device" Identifier "dummy_videocard" Driver "dummy" @@ -107,4 +114,5 @@ Section "ServerLayout" Screen "dummy_screen" InputDevice "dummy_mouse" InputDevice "dummy_keyboard" + InputDevice "dummy_touchscreen" "CorePointer" EndSection diff --git a/xorg/xf86-input-neko/.gitignore b/xorg/xf86-input-neko/.gitignore new file mode 100644 index 00000000..2cb08241 --- /dev/null +++ b/xorg/xf86-input-neko/.gitignore @@ -0,0 +1,67 @@ +# Object files +*.o +*.ko +*.obj +*.elf + +# Precompiled Headers +*.gch +*.pch + +# Libraries +*.lib +*.a +*.la +*.lo + +# Shared objects (inc. Windows DLLs) +*.dll +*.so +*.so.* +*.dylib + +# Executables +*.exe +*.out +*.app +*.i*86 +*.x86_64 +*.hex + +# Debug files +*.dSYM/ +*.su + +# generated files +aclocal.m4 +config.h.in +config.guess +configure +config.sub +depcomp +install-sh +ltmain.sh +Makefile +Makefile.in +src/Makefile +src/Makefile.in +missing +autom4te.cache/ +compile +config.h +config.h.in~ +config.log +config.status +libtool +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 +src/.deps/ +stamp-h1 +src/.libs/ +*.pc + +# build folder +build/ diff --git a/xorg/xf86-input-neko/80-neko.conf b/xorg/xf86-input-neko/80-neko.conf new file mode 100644 index 00000000..29a315bf --- /dev/null +++ b/xorg/xf86-input-neko/80-neko.conf @@ -0,0 +1,9 @@ +# +# Create new Xorg input device for Neko +# + +Section "InputDevice" + Identifier "dummy_touchscreen" + Option "SocketName" "/tmp/xf86-input-neko.sock" + Driver "neko" +EndSection diff --git a/xorg/xf86-input-neko/COPYING b/xorg/xf86-input-neko/COPYING new file mode 100644 index 00000000..668f45b2 --- /dev/null +++ b/xorg/xf86-input-neko/COPYING @@ -0,0 +1,27 @@ +The MIT License + +Copyright 1999 Frederic Lepied, France +Copyright 2005 Adam Jackson +Copyright 2005 Sun Microsystems, Inc. +Copyright 2006 Sascha Hauer, Pengutronix +Copyright 2007 Clement Chauplannaz, Thales e-Transactions +Copyright 2017 Martin Kepplinger +Copyright 2023 Miroslav Sedivy + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/xorg/xf86-input-neko/Dockerfile b/xorg/xf86-input-neko/Dockerfile new file mode 100644 index 00000000..4eb666e0 --- /dev/null +++ b/xorg/xf86-input-neko/Dockerfile @@ -0,0 +1,22 @@ +FROM debian:bullseye-slim + +ENV DEBIAN_FRONTEND=noninteractive + +RUN set -eux; \ + apt-get update; \ + apt-get install -y \ + gcc pkgconf autoconf automake libtool make xorg-dev xutils-dev \ + && rm -rf /var/lib/apt/lists/*; + +WORKDIR /app + +COPY ./ /app/ + +RUN set -eux; \ + ./autogen.sh --prefix=/usr; \ + ./configure; \ + make -j$(nproc); \ + make install; + +# docker build -t xf86-input-neko . +# docker run -v $PWD/build:/app/build --rm xf86-input-neko make install DESTDIR=/app/build diff --git a/xorg/xf86-input-neko/Makefile.am b/xorg/xf86-input-neko/Makefile.am new file mode 100644 index 00000000..215bddac --- /dev/null +++ b/xorg/xf86-input-neko/Makefile.am @@ -0,0 +1,30 @@ +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +AUTOMAKE_OPTIONS = foreign +SUBDIRS = src +ACLOCAL_AMFLAGS = -I m4 + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xorg-neko.pc + +dist_xorgconf_DATA = 80-neko.conf + +EXTRA_DIST = README.md diff --git a/xorg/xf86-input-neko/README.md b/xorg/xf86-input-neko/README.md new file mode 100644 index 00000000..1deace7b --- /dev/null +++ b/xorg/xf86-input-neko/README.md @@ -0,0 +1,19 @@ +# xf86-input-neko +[X.org](https://x.org/) [neko](http://github.com/demodesk/neko) input driver + +### how to use +xf86-input-neko assumes you have only one virtual touchscreen device available, see +`80-neko.conf`. If there are multiple in your system, please specify one config +section for each. +xf86-input-neko aims to make [neko](http://github.com/demodesk/neko) easy to use and doesn't +offer special configuration options. + +* `./configure --prefix=/usr` +* `make` +* `sudo make install` + +Done. + +To _uninstall_, again go inside the extracted directory, and do + + sudo make uninstall diff --git a/xorg/xf86-input-neko/autogen-clean.sh b/xorg/xf86-input-neko/autogen-clean.sh new file mode 100755 index 00000000..12588880 --- /dev/null +++ b/xorg/xf86-input-neko/autogen-clean.sh @@ -0,0 +1,8 @@ +#!/bin/sh +if [ -f Makefile ]; then + echo "Making make distclean..." + make distclean +fi +echo "Removing autogenned files..." +rm -f config.guess config.sub configure install-sh missing mkinstalldirs Makefile.in ltmain.sh stamp-h.in */Makefile.in ltconfig stamp-h config.h.in* aclocal.m4 compile depcomp +echo "Done." diff --git a/xorg/xf86-input-neko/autogen.sh b/xorg/xf86-input-neko/autogen.sh new file mode 100755 index 00000000..4d7b2f31 --- /dev/null +++ b/xorg/xf86-input-neko/autogen.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +autoreconf -f -i -I $(pwd)/m4 +exit $? + +echo -n "Libtoolize..." +libtoolize --force --copy +echo "Done." +echo -n "Aclocal..." +aclocal +echo "Done." +echo -n "Autoheader..." +autoheader +echo "Done." +echo -n "Automake..." +automake --add-missing --copy +echo "Done." +echo -n "Autoconf..." +autoconf +echo "Done." +#./configure $* +echo "Now you can do ./configure, make, make install." diff --git a/xorg/xf86-input-neko/configure.ac b/xorg/xf86-input-neko/configure.ac new file mode 100644 index 00000000..98e9aeeb --- /dev/null +++ b/xorg/xf86-input-neko/configure.ac @@ -0,0 +1,109 @@ +# Copyright 2005 Adam Jackson. +# Copyright 2017 Martin Kepplinger. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Process this file with autoconf to produce a configure script + +AC_PREREQ(2.59) +AC_INIT([xf86-input-neko],[0.0.1],[https://github.com/demodesk/neko/issues],[xf86-input-neko],[https://github.com/demodesk/neko]) + +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_AUX_DIR(.) +AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE([dist-bzip2 dist-xz]) + +DRIVER_NAME=neko +AC_SUBST([DRIVER_NAME]) + +AC_CONFIG_HEADERS(config.h) + +# Checks for programs. +AC_DISABLE_STATIC +AC_PROG_LIBTOOL +AC_PROG_CC + +# Initialize libtool +LT_INIT + +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([you must install xorg-macros before running autoconf/autogen. + Hint: either install from source, git://anongit.freedesktop.org/xorg/util/macros or, + depending on you distribution, try package 'xutils-dev' or 'xorg-x11-util-macros'])]) +XORG_DEFAULT_OPTIONS + +AH_TOP([#include "xorg-server.h"]) + +#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers]) +# +#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput], +# [Build XInput support (default: yes)]), +# [XINPUT=$enableval],[XINPUT=yes]) +#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes") +#if test "x$XINPUT" = "xyes" ; then +# AC_DEFINE(XINPUT,1,[Enable XInput support]) +#fi +# +#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb], +# [Build XKB support (default: yes)]), +# [XKB=$enableval],[XKB=yes]) +#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes") +#if test "x$XKB" = "xyes" ; then +# AC_DEFINE(XKB,1,[Enable XKB support]) +#fi + +AC_ARG_WITH(xorg-module-dir, + AS_HELP_STRING(--with-xorg-module-dir=DIR,Default xorg module directory [[default=$libdir/xorg/modules]]), + [moduledir="$withval"], + [moduledir="$libdir/xorg/modules"]) +inputdir=${moduledir}/input +AC_SUBST(inputdir) + +AC_ARG_WITH(xorg-conf-dir, + AC_HELP_STRING([--with-xorg-conf-dir=DIR], + [Default xorg.conf.d directory [[default=${prefix}/share/X11/xorg.conf.d/]]]), + [xorgconfdir="$withval"], + [xorgconfdir='${prefix}/share/X11/xorg.conf.d']) +AC_SUBST(xorgconfdir) + +# Checks for extensions +XORG_DRIVER_CHECK_EXT(RANDR, randrproto) +XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) + +# Checks for pkg-config packages +PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) +sdkdir=$(pkg-config --variable=sdkdir xorg-server) + +CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' +CFLAGS="-O2 -Wall -W -fPIC $CFLAGS" +AC_SUBST([CFLAGS]) + +# Checks for libraries. +#AC_CHECK_LIB(ts, ts_open, [], [ +# echo "Error! You need to have libts." +# exit -1 +# ]) + +# Checks for header files. +AC_HEADER_STDC + +AC_CONFIG_FILES([Makefile + src/Makefile + xorg-neko.pc]) +AC_OUTPUT diff --git a/xorg/xf86-input-neko/m4/.gitkeep b/xorg/xf86-input-neko/m4/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/xorg/xf86-input-neko/release.sh b/xorg/xf86-input-neko/release.sh new file mode 100755 index 00000000..02830e0c --- /dev/null +++ b/xorg/xf86-input-neko/release.sh @@ -0,0 +1,121 @@ +#!/bin/bash +: 'Copyright (C) 2017, Martin Kepplinger + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.' + +# Script to build release-archives with. This requires a checkout from git. +# Before running it, change the version in configure.ac. Only do this. Do +# *not* commit this change. This script will do it. + +# WARNING: This script is very dangerous! It may delete any untracked files. + +have_version=0 + +usage() +{ + echo "Usage: $0 -v version" +} + +args=$(getopt -o v:s -- "$@") +if [ $? -ne 0 ] ; then + usage + exit 1 +fi +eval set -- "$args" +while [ $# -gt 0 ] +do + case "$1" in + -v) + version=$2 + have_version=1 + shift + ;; + --) + shift + break + ;; + *) + echo "Invalid option: $1" + usage + exit 1 + ;; + esac + shift +done + +# Do we have a desired version number? +if [ "$have_version" -gt 0 ] ; then + echo "trying to build version $version" +else + echo "please specify a version" + usage + exit 1 +fi + +# Version number sanity check +if grep ${version} configure.ac +then + echo "configurations seems ok" +else + echo "please check your configure.ac" + exit 1 +fi + +# Check that we are on master +branch=$(git rev-parse --abbrev-ref HEAD) +echo "we are on branch $branch" + +if [ ! "${branch}" = "master" ] ; then + echo "you don't seem to be on the master branch" + exit 1 +fi + +if git diff-index --quiet HEAD --; then + # no changes + echo "there are no uncommitted changes (version bump)" + exit 1 +fi +echo "======================================================" +echo " are you fine with the following version bump?" +echo "======================================================" +git diff +echo "======================================================" +read -p " Press enter to continue" +echo "======================================================" + +./autogen.sh && ./configure && make distcheck +./autogen-clean.sh +git clean -d -f + +git commit -a -m "xf86-input-neko ${version}" +git tag -s ${version} -m "xf86-input-neko ${version}" + +./autogen.sh && ./configure && make distcheck +sha256sum xf86-input-neko-${version}.tar.xz > xf86-input-neko-${version}.tar.xz.sha256 +sha256sum xf86-input-neko-${version}.tar.gz > xf86-input-neko-${version}.tar.gz.sha256 +sha256sum xf86-input-neko-${version}.tar.bz2 > xf86-input-neko-${version}.tar.bz2.sha256 + +sha512sum xf86-input-neko-${version}.tar.xz > xf86-input-neko-${version}.tar.xz.sha512 +sha512sum xf86-input-neko-${version}.tar.gz > xf86-input-neko-${version}.tar.gz.sha512 +sha512sum xf86-input-neko-${version}.tar.bz2 > xf86-input-neko-${version}.tar.bz2.sha512 + +gpg -b -a xf86-input-neko-${version}.tar.xz +gpg -b -a xf86-input-neko-${version}.tar.gz +gpg -b -a xf86-input-neko-${version}.tar.bz2 + diff --git a/xorg/xf86-input-neko/src/Makefile.am b/xorg/xf86-input-neko/src/Makefile.am new file mode 100644 index 00000000..2221bbcc --- /dev/null +++ b/xorg/xf86-input-neko/src/Makefile.am @@ -0,0 +1,31 @@ +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +# this is obnoxious: +# -module lets us name the module exactly how we want +# -avoid-version prevents gratuitous .0.0.0 version numbers on the end +# _ladir passes a dummy rpath to libtool so the thing will actually link +# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. +@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la +@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version +@DRIVER_NAME@_drv_ladir = @inputdir@ + +@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c diff --git a/xorg/xf86-input-neko/src/neko.c b/xorg/xf86-input-neko/src/neko.c new file mode 100644 index 00000000..3022d64b --- /dev/null +++ b/xorg/xf86-input-neko/src/neko.c @@ -0,0 +1,502 @@ +/* + * (c) 2017 Martin Kepplinger + * (c) 2007 Clement Chauplannaz, Thales e-Transactions + * (c) 2006 Sascha Hauer, Pengutronix + * (c) 2023 Miroslav Sedivy + * + * derived from the xf86-input-void driver + * Copyright 1999 by Frederic Lepied, France. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Frederic Lepied not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Frederic Lepied makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + * + * SPDX-License-Identifier: MIT + * License-Filename: COPYING + */ + +/* neko input driver */ +// https://www.x.org/releases/X11R7.7/doc/xorg-server/Xinput.html + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#define DEF_SOCKET_NAME "/tmp/xf86-input-neko.sock" +#define BUFFER_SIZE 12 + +#include +#include +#include +#include +#include +#include +#if !defined(DGUX) +#include +#endif +#include +#include +#include /* Needed for InitValuator/Proximity stuff */ +#include +#include +#include +#include + +#define MAXBUTTONS 11 /* > 10 */ +#define TOUCH_NUM_AXES 3 /* x, y, pressure */ +#define TOUCH_MAX_SLOTS 10 + +struct neko_message +{ + uint16_t type; + uint32_t touchId; + int32_t x; + int32_t y; + uint8_t pressure; +}; + +struct neko_priv +{ + pthread_t thread; + /* config */ + int height; + int width; + int pmax; + ValuatorMask *valuators; + uint16_t slots; + /* socket */ + struct sockaddr_un addr; + int listen_socket; + char *socket_name; +}; + +// from binary representation to struct +static void +UnpackNekoMessage(struct neko_message *msg, unsigned char *buffer) +{ + msg->type = buffer[0]; // TODO: use full 16bit type + msg->touchId = buffer[1] | (buffer[2] << 8); // TODO: use full 32bit touchId + msg->x = buffer[3] | (buffer[4] << 8) | (buffer[5] << 16) | (buffer[6] << 24); + msg->y = buffer[7] | (buffer[8] << 8) | (buffer[9] << 16) | (buffer[10] << 24); + msg->pressure = buffer[11]; +} + +static void +ReadInput(InputInfoPtr pInfo) +{ + struct neko_priv *priv = (struct neko_priv *) (pInfo->private); + struct neko_message msg; + int ret; + + int data_socket; + unsigned char buffer[BUFFER_SIZE]; + + for (;;) + { + /* Wait for incoming connection. */ + data_socket = accept(priv->listen_socket, NULL, NULL); + + /* Handle error conditions. */ + if (data_socket == -1) + { + xf86IDrvMsg(pInfo, X_ERROR, "unable to accept connection\n"); + break; + } + + xf86IDrvMsg(pInfo, X_INFO, "accepted connection\n"); + + for(;;) + { + /* Wait for next data packet. */ + ret = read(data_socket, buffer, BUFFER_SIZE); + + /* Handle error conditions. */ + if (ret == -1) + { + xf86IDrvMsg(pInfo, X_ERROR, "unable to read data\n"); + break; + } + + /* Connection closed by client. */ + if (ret == 0) + { + xf86IDrvMsg(pInfo, X_INFO, "connection closed\n"); + break; + } + + /* Ensure message is long enough. */ + if (ret != BUFFER_SIZE) + { + xf86IDrvMsg(pInfo, X_ERROR, "invalid message size\n"); + break; + } + + UnpackNekoMessage(&msg, buffer); + + ValuatorMask *m = priv->valuators; + valuator_mask_zero(m); + + // do not send valuators if x and y are -1 + if (msg.x != -1 && msg.y != -1) + { + valuator_mask_set_double(m, 0, msg.x); + valuator_mask_set_double(m, 1, msg.y); + valuator_mask_set_double(m, 2, msg.pressure); + } + + // TODO: extend to other types, such as keyboard and mouse + xf86PostTouchEvent(pInfo->dev, msg.touchId, msg.type, 0, m); + } + + /* Close socket. */ + close(data_socket); + + xf86IDrvMsg(pInfo, X_INFO, "closed connection\n"); + } +} + +static void +PointerCtrl(__attribute__ ((unused)) DeviceIntPtr device, + __attribute__ ((unused)) PtrCtrl *ctrl) +{ +} + +static int +DeviceControl(DeviceIntPtr device, int what) +{ + // device pInfo + InputInfoPtr pInfo = device->public.devicePrivate; + // custom private data + struct neko_priv *priv = pInfo->private; + + switch (what) { + case DEVICE_INIT: + device->public.on = FALSE; + + unsigned char map[MAXBUTTONS + 1]; + Atom labels[MAXBUTTONS]; + Atom axis_labels[TOUCH_NUM_AXES]; + + // init button map + memset(map, 0, sizeof(map)); + for (int i = 0; i < MAXBUTTONS; i++) + { + map[i + 1] = i + 1; + } + + // init labels + memset(labels, 0, ARRAY_SIZE(labels) * sizeof(Atom)); + labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); + labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); + labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); + labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP); + labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN); + labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT); + labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT); + labels[7] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_SIDE); + labels[8] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_EXTRA); + labels[9] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_FORWARD); + labels[10] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_BACK); + + // init axis labels + memset(axis_labels, 0, ARRAY_SIZE(axis_labels) * sizeof(Atom)); + axis_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_X); + axis_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_Y); + axis_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_PRESSURE); + + /* initialize mouse emulation valuators */ + if (InitPointerDeviceStruct((DevicePtr)device, + map, + MAXBUTTONS, labels, + PointerCtrl, + GetMotionHistorySize(), + TOUCH_NUM_AXES, axis_labels) == FALSE) + { + xf86IDrvMsg(pInfo, X_ERROR, + "unable to allocate PointerDeviceStruct\n"); + return !Success; + } + + /* + This function is provided to initialize an XAxisInfoRec, and should be + called for core and extension devices that have valuators. The space + for the XAxisInfoRec is allocated by the InitValuatorClassDeviceStruct + function, but is not initialized. + + InitValuatorAxisStruct should be called once for each axis of motion + reported by the device. Each invocation should be passed the axis + number (starting with 0), the minimum value for that axis, the maximum + value for that axis, and the resolution of the device in counts per meter. + If the device reports relative motion, 0 should be reported as the + minimum and maximum values. + + InitValuatorAxisStruct(dev, axnum, minval, maxval, resolution) + DeviceIntPtr dev; + int axnum; + int minval; + int maxval; + int resolution; + */ + xf86InitValuatorAxisStruct(device, 0, + XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_X), + 0, /* min val */ + priv->width - 1, /* max val */ + priv->width, /* resolution */ + 0, /* min_res */ + priv->width, /* max_res */ + Absolute); + + xf86InitValuatorAxisStruct(device, 1, + XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_Y), + 0, /* min val */ + priv->height - 1, /* max val */ + priv->height, /* resolution */ + 0, /* min_res */ + priv->height, /* max_res */ + Absolute); + + xf86InitValuatorAxisStruct(device, 2, + XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_PRESSURE), + 0, /* min val */ + priv->pmax, /* max val */ + priv->pmax + 1, /* resolution */ + 0, /* min_res */ + priv->pmax + 1, /* max_res */ + Absolute); + + /* + The mode field is either XIDirectTouch for direct−input touch devices + such as touchscreens or XIDependentTouch for indirect input devices such + as touchpads. For XIDirectTouch devices, touch events are sent to window + at the position the touch occured. For XIDependentTouch devices, touch + events are sent to the window at the position of the device's sprite. + + The num_touches field defines the maximum number of simultaneous touches + the device supports. A num_touches of 0 means the maximum number of + simultaneous touches is undefined or unspecified. This field should be + used as a guide only, devices will lie about their capabilities. + */ + if (InitTouchClassDeviceStruct(device, + priv->slots, + XIDirectTouch, + TOUCH_NUM_AXES) == FALSE) + { + xf86IDrvMsg(pInfo, X_ERROR, + "unable to allocate TouchClassDeviceStruct\n"); + return !Success; + } + + break; + + case DEVICE_ON: + xf86IDrvMsg(pInfo, X_INFO, "DEVICE ON\n"); + device->public.on = TRUE; + + if (priv->thread == 0) + { + /* start thread */ + pthread_create(&priv->thread, NULL, (void *)ReadInput, pInfo); + } + break; + + case DEVICE_OFF: + case DEVICE_CLOSE: + xf86IDrvMsg(pInfo, X_INFO, "DEVICE OFF\n"); + device->public.on = FALSE; + break; + } + + return Success; +} + +static int +PreInit(__attribute__ ((unused)) InputDriverPtr drv, + InputInfoPtr pInfo, + __attribute__ ((unused)) int flags) +{ + struct neko_priv *priv; + int ret; + + priv = calloc(1, sizeof (struct neko_priv)); + if (!priv) + { + xf86IDrvMsg(pInfo, X_ERROR, "%s: out of memory\n", __FUNCTION__); + return BadValue; + } + + pInfo->type_name = (char*)XI_TOUCHSCREEN; + pInfo->device_control = DeviceControl; + pInfo->read_input = NULL; + pInfo->control_proc = NULL; + pInfo->switch_mode = NULL; /* Only support Absolute mode */ + pInfo->private = priv; + pInfo->fd = -1; + + /* get socket name from config */ + priv->socket_name = xf86SetStrOption(pInfo->options, "SocketName", DEF_SOCKET_NAME); + + /* + * In case the program exited inadvertently on the last run, + * remove the socket. + */ + + unlink(priv->socket_name); + + /* Create local socket. */ + priv->listen_socket = socket(AF_UNIX, SOCK_STREAM, 0); + if (priv->listen_socket == -1) + { + xf86IDrvMsg(pInfo, X_ERROR, "unable to create socket\n"); + return BadValue; + } + + /* + * For portability clear the whole structure, since some + * implementations have additional (nonstandard) fields in + * the structure. + */ + + memset(&priv->addr, 0, sizeof(struct sockaddr_un)); + + /* Bind socket to socket name. */ + + priv->addr.sun_family = AF_UNIX; + strncpy(priv->addr.sun_path, priv->socket_name, sizeof(priv->addr.sun_path) - 1); + + ret = bind(priv->listen_socket, (const struct sockaddr *) &priv->addr, sizeof(struct sockaddr_un)); + if (ret == -1) + { + xf86IDrvMsg(pInfo, X_ERROR, "unable to bind socket\n"); + return BadValue; + } + + /* + * Prepare for accepting connections. The backlog size is set + * to 5. So while one request is being processed other requests + * can be waiting. + */ + + ret = listen(priv->listen_socket, 5); + if (ret == -1) + { + xf86IDrvMsg(pInfo, X_ERROR, "unable to listen on socket\n"); + return BadValue; + } + + /* process generic options */ + xf86CollectInputOptions(pInfo, NULL); + xf86ProcessCommonOptions(pInfo, pInfo->options); + + /* create valuators */ + priv->valuators = valuator_mask_new(TOUCH_NUM_AXES); + if (!priv->valuators) + { + xf86IDrvMsg(pInfo, X_ERROR, "%s: out of memory\n", __FUNCTION__); + return BadValue; + } + + priv->slots = TOUCH_MAX_SLOTS; + priv->width = 0xffff; + priv->height = 0xffff; + priv->pmax = 255; + priv->thread = 0; + + /* Return the configured device */ + return Success; +} + +static void +UnInit(__attribute__ ((unused)) InputDriverPtr drv, + InputInfoPtr pInfo, + __attribute__ ((unused)) int flags) +{ + struct neko_priv *priv = (struct neko_priv *)(pInfo->private); + + /* close socket */ + close(priv->listen_socket); + /* remove socket file */ + unlink(priv->socket_name); + + if (priv->thread) + { + /* cancel thread */ + pthread_cancel(priv->thread); + /* wait for thread to finish */ + pthread_join(priv->thread, NULL); + /* ensure thread is not cancelled again */ + priv->thread = 0; + } + + valuator_mask_free(&priv->valuators); + DeviceControl(pInfo->dev, DEVICE_OFF); + + free(pInfo->private); + pInfo->private = NULL; + xf86DeleteInput(pInfo, 0); +} + +/** + * X module information and plug / unplug routines + */ + +_X_EXPORT InputDriverRec NEKO = +{ + .driverVersion = 1, + .driverName = "neko", + .Identify = NULL, + .PreInit = PreInit, + .UnInit = UnInit, + .module = NULL +}; + +static pointer +Plug(pointer module, + __attribute__ ((unused)) pointer options, + __attribute__ ((unused)) int *errmaj, + __attribute__ ((unused)) int *errmin) +{ + xf86AddInputDriver(&NEKO, module, 0); + return module; +} + +static void +Unplug(__attribute__ ((unused)) pointer module) +{ +} + +static XF86ModuleVersionInfo versionRec = +{ + .modname = "neko", + .vendor = MODULEVENDORSTRING, + ._modinfo1_ = MODINFOSTRING1, + ._modinfo2_ = MODINFOSTRING2, + .xf86version = XORG_VERSION_CURRENT, + .majorversion = PACKAGE_VERSION_MAJOR, + .minorversion = PACKAGE_VERSION_MINOR, + .patchlevel = PACKAGE_VERSION_PATCHLEVEL, + .abiclass = ABI_CLASS_XINPUT, + .abiversion = ABI_XINPUT_VERSION, + .moduleclass = MOD_CLASS_XINPUT, + .checksum = {0, 0, 0, 0} /* signature, to be patched into the file by a tool */ +}; + +_X_EXPORT XF86ModuleData nekoModuleData = +{ + .vers = &versionRec, + .setup = Plug, + .teardown = Unplug +}; diff --git a/xorg/xf86-input-neko/xorg-neko.pc.in b/xorg/xf86-input-neko/xorg-neko.pc.in new file mode 100644 index 00000000..37dea7e3 --- /dev/null +++ b/xorg/xf86-input-neko/xorg-neko.pc.in @@ -0,0 +1,5 @@ +Name: xorg-neko +Description: X.Org neko input driver. +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} +Cflags: -I${includedir} diff --git a/runtime/xdummy-randr.patch b/xorg/xf86-video-dummy/xdummy-randr.patch similarity index 100% rename from runtime/xdummy-randr.patch rename to xorg/xf86-video-dummy/xdummy-randr.patch From 25a65863bb60d647273b0d86b40cbb60a6fe49d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 17 Aug 2023 17:00:09 +0200 Subject: [PATCH 852/876] fix devcontainer. --- .devcontainer/Dockerfile | 46 +++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 38dd492b..833def33 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,31 +1,36 @@ # -# Stage 0: Build xserver-xorg-video-dummy 0.3.8-2 with RandR support. +# Stage 0: Build xorg dependencies. # -FROM debian:bullseye-slim as xserver-xorg-video-dummy - -WORKDIR /usr/local/src +FROM debian:bullseye-slim as xorg-deps ENV DEBIAN_FRONTEND=noninteractive + RUN set -eux; \ - cp /etc/apt/sources.list /etc/apt/sources.list~; \ - sed -Ei 's/^deb /deb-src /' /etc/apt/sources.list; \ - cat /etc/apt/sources.list~ >> /etc/apt/sources.list; \ apt-get update; \ - apt-get install -y dpkg-dev git; \ - apt-get build-dep -y xserver-xorg-video-dummy; \ - git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* + apt-get install -y \ + git gcc pkgconf autoconf automake libtool make xorg-dev xutils-dev \ + && rm -rf /var/lib/apt/lists/*; -COPY runtime/xdummy-randr.patch /tmp/xdummy-randr.patch +WORKDIR /xorg +COPY xorg/ /xorg/ + +# build xserver-xorg-video-dummy 0.3.8-2 with RandR support. RUN set -eux; \ + cd xf86-video-dummy; \ + git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ cd xserver-xorg-video-dummy; \ - patch -p1 < /tmp/xdummy-randr.patch; \ - bash ./autogen.sh; \ - make; \ + patch -p1 < ../xdummy-randr.patch; \ + ./autogen.sh; \ + make -j$(nproc); \ + make install; + +# build custom input driver +RUN set -eux; \ + cd xf86-input-neko; \ + ./autogen.sh --prefix=/usr; \ + ./configure; \ + make -j$(nproc); \ make install; # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.166.0/containers/go/.devcontainer/base.Dockerfile @@ -112,8 +117,9 @@ RUN set -eux; \ # Indian fonts fonts-indic; -# replace version -COPY --from=xserver-xorg-video-dummy /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so +# copy dependencies from previous stage +COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so +COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so # copy runtime files COPY runtime/dbus /usr/bin/dbus From 05403cc0c6ed4e1acaed73ec645285a853e9f255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 5 Sep 2023 23:01:18 +0200 Subject: [PATCH 853/876] Upgrade to bookworm (#54) * upgrade to bookworm. * g_memdup is deprecated: Use g_memdup2 instead. * upgrade nvidia dockerfile. * revert devcontainer. --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 30 +++++++++++++----------- Dockerfile | 18 ++++----------- Dockerfile.nvidia | 22 ++++++------------ go.mod | 3 +-- go.sum | 41 +++++---------------------------- pkg/gst/gst.c | 2 +- xorg/xf86-input-neko/Dockerfile | 2 +- 8 files changed, 39 insertions(+), 81 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 833def33..7bb676fc 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -49,7 +49,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ - # install libxcvt-dev (not available in debian:bullseye) + # install libxcvt-dev (not available in base image) wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt-dev_0.1.2-1_amd64.deb; \ wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb ./libxcvt-dev_0.1.2-1_amd64.deb; diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d22d8ea6..a7bd5b1e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,19 +15,23 @@ }, "runArgs": [ "--cap-add=SYS_PTRACE", "--cap-add=SYS_ADMIN", "--shm-size=2G", "--security-opt", "seccomp=unconfined" ], - // Set *default* container specific settings.json values on container create. - "settings": { - "terminal.integrated.shell.linux": "/bin/bash", - "go.toolsManagement.checkForUpdates": "local", - "go.useLanguageServer": true, - "go.gopath": "/go", - "go.goroot": "/usr/local/go" - }, - - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "golang.Go" - ], + "customizations": { + "vscode": { + // Set *default* container specific settings.json values on container create. + "settings": { + "terminal.integrated.shell.linux": "/bin/bash", + "go.toolsManagement.checkForUpdates": "local", + "go.useLanguageServer": true, + "go.gopath": "/go", + "go.goroot": "/usr/local/go" + }, + + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "golang.Go" + ] + } + }, // Use 'forwardPorts' to make a list of ports inside the container available locally. "appPort": ["3000:3000", "3001:3001/udp", "3002:3002/udp", "3003:3003/udp", "3004:3004/udp"], diff --git a/Dockerfile b/Dockerfile index f40e5e87..1cc3995c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Stage 0: Build xorg dependencies. # -FROM debian:bullseye-slim as xorg-deps +FROM debian:bookworm-slim as xorg-deps ENV DEBIAN_FRONTEND=noninteractive @@ -36,7 +36,7 @@ RUN set -eux; \ # # Stage 1: Build. # -FROM golang:1.20-bullseye as build +FROM golang:1.21-bookworm as build WORKDIR /src # @@ -45,12 +45,8 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ + libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev libxcvt-dev \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ - # install libxcvt-dev (not available in debian:bullseye) - wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt-dev_0.1.2-1_amd64.deb; \ - wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ - apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb ./libxcvt-dev_0.1.2-1_amd64.deb; \ # # clean up apt-get clean -y; \ @@ -68,7 +64,7 @@ RUN ./build # # Stage 2: Runtime. # -FROM debian:bullseye-slim as runtime +FROM debian:bookworm-slim as runtime # # set custom user @@ -84,7 +80,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ wget ca-certificates supervisor \ pulseaudio dbus-x11 xserver-xorg-video-dummy \ - libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libxcvt0 \ # # needed for profile upload preStop hook zip curl \ @@ -96,10 +92,6 @@ RUN set -eux; \ gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ gstreamer1.0-pulseaudio; \ - # install libxcvt0 (not available in debian:bullseye) - wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ - apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb; \ - rm ./libxcvt0_0.1.2-1_amd64.deb; \ # # create a non-root user groupadd --gid $USER_GID $USERNAME; \ diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index fe977365..a6f26218 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -1,7 +1,7 @@ -ARG UBUNTU_RELEASE=20.04 -ARG CUDA_VERSION=11.4.3 +ARG UBUNTU_RELEASE=22.04 +ARG CUDA_VERSION=12.2.0 ARG VIRTUALGL_VERSION=3.1 -ARG GSTREAMER_VERSION=1.20 +ARG GSTREAMER_VERSION=1.22 # # Stage 0: Build gstreamer with nvidia plugins. @@ -54,7 +54,7 @@ RUN set -eux; \ # # Stage 0: Build xorg dependencies. # -FROM debian:bullseye-slim as xorg-deps +FROM debian:bookworm-slim as xorg-deps ENV DEBIAN_FRONTEND=noninteractive @@ -89,7 +89,7 @@ RUN set -eux; \ # # Stage 1: Build. # -FROM golang:1.20-bullseye as build +FROM golang:1.21-bookworm as build WORKDIR /src # @@ -98,12 +98,8 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ + libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev libxcvt-dev \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ - # install libxcvt-dev (not available in debian:bullseye) - wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt-dev_0.1.2-1_amd64.deb; \ - wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ - apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb ./libxcvt-dev_0.1.2-1_amd64.deb; \ # # clean up apt-get clean -y; \ @@ -192,7 +188,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ wget ca-certificates \ pulseaudio dbus-x11 xserver-xorg-video-dummy \ - libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 libx264-155 \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libx264-163 libxcvt0 \ libgtk-3-bin software-properties-common cabextract aptitude vim curl \ # # needed for profile upload preStop hook @@ -200,10 +196,6 @@ RUN set -eux; \ # # file chooser handler, clipboard, drop xdotool xclip libgtk-3-0; \ - # install libxcvt0 (not available in debian:bullseye) - wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ - apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb; \ - rm ./libxcvt0_0.1.2-1_amd64.deb; \ # install never version for supervisor that supports -s flag apt-get install -y --no-install-recommends pip; \ pip install supervisor --upgrade; \ diff --git a/go.mod b/go.mod index dd1379a8..98fedb76 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/demodesk/neko -go 1.20 +go 1.21 require ( github.com/PaesslerAG/gval v1.2.2 @@ -54,7 +54,6 @@ require ( github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/objx v0.5.0 // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/subosito/gotenv v1.4.2 // indirect golang.org/x/crypto v0.11.0 // indirect diff --git a/go.sum b/go.sum index f90a8cf1..da79a782 100644 --- a/go.sum +++ b/go.sum @@ -66,6 +66,7 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -121,6 +122,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -160,9 +162,11 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= @@ -170,8 +174,6 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= @@ -187,17 +189,12 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= -github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= -github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY= github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8= github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= -github.com/pion/ice/v2 v2.3.4 h1:tjYjTLpWyZzUjpDnzk6T1y3oQyhyY2DiM2t095iDhyQ= -github.com/pion/ice/v2 v2.3.4/go.mod h1:jVbxqPWQDK5+/V/YqpinUcP0YtDGYqd24n2lusVdX80= github.com/pion/ice/v2 v2.3.9 h1:7yZpHf3PhPxJGT4JkMj1Y8Rl5cQ6fB709iz99aeMd/U= github.com/pion/ice/v2 v2.3.9/go.mod h1:lT3kv5uUIlHfXHU/ZRD7uKD/ufM202+eTa3C/umgGf4= github.com/pion/interceptor v0.1.17 h1:prJtgwFh/gB8zMqGZoOgJPHivOwVAp61i2aG61Du/1w= @@ -219,49 +216,35 @@ github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw= github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= github.com/pion/srtp/v2 v2.0.15 h1:+tqRtXGsGwHC0G0IUIAzRmdkHvriF79IHVfZGfHrQoA= github.com/pion/srtp/v2 v2.0.15/go.mod h1:b/pQOlDrbB0HEH5EUAQXzSYxikFbNcNuKmF8tM0hCtw= -github.com/pion/stun v0.4.0/go.mod h1:QPsh1/SbXASntw3zkkrIk3ZJVKz4saBY2G7S10P3wCw= -github.com/pion/stun v0.5.2 h1:J/8glQnDV91dfk2+ZnGN0o9bUJgABhTNljwfQWByoXE= -github.com/pion/stun v0.5.2/go.mod h1:TNo1HjyjaFVpMZsvowqPeV8TfwRytympQC0//neaksA= github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4= github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8= github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40= github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI= github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc= -github.com/pion/transport/v2 v2.0.2/go.mod h1:vrz6bUbFr/cjdwbnxq8OdDDzHf7JJfGsIRkxfpZoTA0= github.com/pion/transport/v2 v2.1.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ= github.com/pion/transport/v2 v2.2.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ= github.com/pion/transport/v2 v2.2.1 h1:7qYnCBlpgSJNYMbLCKuSY9KbQdBFoETvPNETv0y4N7c= github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g= -github.com/pion/turn/v2 v2.1.0 h1:5wGHSgGhJhP/RpabkUb/T9PdsAjkGLS6toYz5HNzoSI= -github.com/pion/turn/v2 v2.1.0/go.mod h1:yrT5XbXSGX1VFSF31A3c1kCNB5bBZgk/uu5LET162qs= github.com/pion/turn/v2 v2.1.2 h1:wj0cAoGKltaZ790XEGW9HwoUewqjliwmhtxCuB2ApyM= github.com/pion/turn/v2 v2.1.2/go.mod h1:1kjnPkBcex3dhCU2Am+AAmxDcGhLX3WnMfmkNpvSTQU= -github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8= -github.com/pion/webrtc/v3 v3.2.5 h1:WA38+a1T3/EP55k5IYQFLH3ORaNpRTcElW6UL1CwNeA= -github.com/pion/webrtc/v3 v3.2.5/go.mod h1:8+GhDtUqfKmnZkj+aT2kjvV9B2/nhSTqINEXbVQEGSo= github.com/pion/webrtc/v3 v3.2.12 h1:pVqz5NdtTqyhKIhMcXR8bPp709kCf9blyAhDjoVRLvA= github.com/pion/webrtc/v3 v3.2.12/go.mod h1:/Oz6K95CGWaN+3No+Z0NYvgOPOr3aY8UyTlMm/dec3A= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= -github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= -github.com/prometheus/common v0.43.0/go.mod h1:NCvr5cQIh3Y/gy73/RdVtC9r8xxrxwJnB+2lB3BxrFc= github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk= github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= @@ -279,13 +262,10 @@ github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmq github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= -github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -295,7 +275,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= @@ -320,10 +299,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= @@ -401,10 +377,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= @@ -482,7 +456,6 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= @@ -508,7 +481,6 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= @@ -660,14 +632,13 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= diff --git a/pkg/gst/gst.c b/pkg/gst/gst.c index 020eb92f..f1258a8b 100644 --- a/pkg/gst/gst.c +++ b/pkg/gst/gst.c @@ -151,7 +151,7 @@ void gstreamer_pipeline_destory(GstPipelineCtx *ctx) { void gstreamer_pipeline_push(GstPipelineCtx *ctx, void *buffer, int bufferLen) { if (ctx->appsrc != NULL) { - gpointer p = g_memdup(buffer, bufferLen); + gpointer p = g_memdup2(buffer, bufferLen); GstBuffer *buffer = gst_buffer_new_wrapped(p, bufferLen); gst_app_src_push_buffer(GST_APP_SRC(ctx->appsrc), buffer); } diff --git a/xorg/xf86-input-neko/Dockerfile b/xorg/xf86-input-neko/Dockerfile index 4eb666e0..ae6b332a 100644 --- a/xorg/xf86-input-neko/Dockerfile +++ b/xorg/xf86-input-neko/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim ENV DEBIAN_FRONTEND=noninteractive From 5ceef394ca278bdda1c74f93294ff06bab547b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 6 Sep 2023 19:12:41 +0200 Subject: [PATCH 854/876] maintain backward compatibility with g_memdup. --- pkg/gst/gst.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkg/gst/gst.h b/pkg/gst/gst.h index 1d6a1527..bdbd0347 100644 --- a/pkg/gst/gst.h +++ b/pkg/gst/gst.h @@ -5,6 +5,17 @@ #include #include +#define GLIB_CHECK_VERSION(major,minor,micro) \ + (GLIB_MAJOR_VERSION > (major) || \ + (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION > (minor)) || \ + (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION == (minor) && \ + GLIB_MICRO_VERSION >= (micro))) + +// g_memdup2 was added in glib 2.67.4, maintain compatibility with older versions +#if !GLIB_CHECK_VERSION(2, 67, 4) +#define g_memdup2 g_memdup +#endif + typedef struct GstPipelineCtx { int pipelineId; GstElement *pipeline; From d82b640ecc31a5fd59256168ee6514659508955d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 7 Sep 2023 14:27:24 +0200 Subject: [PATCH 855/876] xf86-input-neko: do not turn off device on uninit. --- xorg/xf86-input-neko/src/neko.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg/xf86-input-neko/src/neko.c b/xorg/xf86-input-neko/src/neko.c index 3022d64b..62fff484 100644 --- a/xorg/xf86-input-neko/src/neko.c +++ b/xorg/xf86-input-neko/src/neko.c @@ -441,8 +441,8 @@ UnInit(__attribute__ ((unused)) InputDriverPtr drv, priv->thread = 0; } + /* free valuators */ valuator_mask_free(&priv->valuators); - DeviceControl(pInfo->dev, DEVICE_OFF); free(pInfo->private); pInfo->private = NULL; From 6f61e0262ad5222743e4aa3a4e971cf8fd2cc123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 7 Sep 2023 16:06:20 +0200 Subject: [PATCH 856/876] xf86-input-neko: extract init touch to own func. --- xorg/xf86-input-neko/src/neko.c | 244 +++++++++++++++++--------------- 1 file changed, 130 insertions(+), 114 deletions(-) diff --git a/xorg/xf86-input-neko/src/neko.c b/xorg/xf86-input-neko/src/neko.c index 62fff484..3d8f88d6 100644 --- a/xorg/xf86-input-neko/src/neko.c +++ b/xorg/xf86-input-neko/src/neko.c @@ -56,9 +56,8 @@ #include #include -#define MAXBUTTONS 11 /* > 10 */ -#define TOUCH_NUM_AXES 3 /* x, y, pressure */ -#define TOUCH_MAX_SLOTS 10 +#define MAX_USED_VALUATORS 3 /* x, y, pressure */ +#define TOUCH_MAX_SLOTS 10 /* max number of simultaneous touches */ struct neko_message { @@ -175,6 +174,131 @@ PointerCtrl(__attribute__ ((unused)) DeviceIntPtr device, { } +static int +InitTouch(InputInfoPtr pInfo) +{ + // custom private data + struct neko_priv *priv = pInfo->private; + + const int nbtns = 11; + const int naxes = 3; + + unsigned char map[nbtns + 1]; + Atom btn_labels[nbtns]; + Atom axis_labels[naxes]; + + // init button map + memset(map, 0, sizeof(map)); + for (int i = 0; i < nbtns; i++) + { + map[i + 1] = i + 1; + } + + // init btn_labels + memset(btn_labels, 0, ARRAY_SIZE(btn_labels) * sizeof(Atom)); + btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); + btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); + btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); + btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP); + btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN); + btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT); + btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT); + btn_labels[7] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_SIDE); + btn_labels[8] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_EXTRA); + btn_labels[9] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_FORWARD); + btn_labels[10] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_BACK); + + // init axis labels + memset(axis_labels, 0, ARRAY_SIZE(axis_labels) * sizeof(Atom)); + axis_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_X); + axis_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_Y); + axis_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_PRESSURE); + + /* initialize mouse emulation valuators */ + if (InitPointerDeviceStruct((DevicePtr)pInfo->dev, + map, + nbtns, btn_labels, + PointerCtrl, + GetMotionHistorySize(), + naxes, axis_labels) == FALSE) + { + xf86IDrvMsg(pInfo, X_ERROR, + "unable to allocate PointerDeviceStruct\n"); + return !Success; + } + + /* + This function is provided to initialize an XAxisInfoRec, and should be + called for core and extension devices that have valuators. The space + for the XAxisInfoRec is allocated by the InitValuatorClassDeviceStruct + function, but is not initialized. + + InitValuatorAxisStruct should be called once for each axis of motion + reported by the device. Each invocation should be passed the axis + number (starting with 0), the minimum value for that axis, the maximum + value for that axis, and the resolution of the device in counts per meter. + If the device reports relative motion, 0 should be reported as the + minimum and maximum values. + + InitValuatorAxisStruct(dev, axnum, minval, maxval, resolution) + DeviceIntPtr dev; + int axnum; + int minval; + int maxval; + int resolution; + */ + xf86InitValuatorAxisStruct(pInfo->dev, 0, + XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_X), + 0, /* min val */ + priv->width - 1, /* max val */ + priv->width, /* resolution */ + 0, /* min_res */ + priv->width, /* max_res */ + Absolute); + + xf86InitValuatorAxisStruct(pInfo->dev, 1, + XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_Y), + 0, /* min val */ + priv->height - 1, /* max val */ + priv->height, /* resolution */ + 0, /* min_res */ + priv->height, /* max_res */ + Absolute); + + xf86InitValuatorAxisStruct(pInfo->dev, 2, + XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_PRESSURE), + 0, /* min val */ + priv->pmax, /* max val */ + priv->pmax + 1, /* resolution */ + 0, /* min_res */ + priv->pmax + 1, /* max_res */ + Absolute); + + /* + The mode field is either XIDirectTouch for direct−input touch devices + such as touchscreens or XIDependentTouch for indirect input devices such + as touchpads. For XIDirectTouch devices, touch events are sent to window + at the position the touch occured. For XIDependentTouch devices, touch + events are sent to the window at the position of the device's sprite. + + The num_touches field defines the maximum number of simultaneous touches + the device supports. A num_touches of 0 means the maximum number of + simultaneous touches is undefined or unspecified. This field should be + used as a guide only, devices will lie about their capabilities. + */ + if (InitTouchClassDeviceStruct(pInfo->dev, + priv->slots, + XIDirectTouch, + naxes) == FALSE) + { + xf86IDrvMsg(pInfo, X_ERROR, + "unable to allocate TouchClassDeviceStruct\n"); + return !Success; + } + + return Success; +} + static int DeviceControl(DeviceIntPtr device, int what) { @@ -187,119 +311,11 @@ DeviceControl(DeviceIntPtr device, int what) case DEVICE_INIT: device->public.on = FALSE; - unsigned char map[MAXBUTTONS + 1]; - Atom labels[MAXBUTTONS]; - Atom axis_labels[TOUCH_NUM_AXES]; - - // init button map - memset(map, 0, sizeof(map)); - for (int i = 0; i < MAXBUTTONS; i++) + if (InitTouch(pInfo) != Success) { - map[i + 1] = i + 1; - } - - // init labels - memset(labels, 0, ARRAY_SIZE(labels) * sizeof(Atom)); - labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); - labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); - labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); - labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP); - labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN); - labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT); - labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT); - labels[7] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_SIDE); - labels[8] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_EXTRA); - labels[9] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_FORWARD); - labels[10] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_BACK); - - // init axis labels - memset(axis_labels, 0, ARRAY_SIZE(axis_labels) * sizeof(Atom)); - axis_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_X); - axis_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_Y); - axis_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_PRESSURE); - - /* initialize mouse emulation valuators */ - if (InitPointerDeviceStruct((DevicePtr)device, - map, - MAXBUTTONS, labels, - PointerCtrl, - GetMotionHistorySize(), - TOUCH_NUM_AXES, axis_labels) == FALSE) - { - xf86IDrvMsg(pInfo, X_ERROR, - "unable to allocate PointerDeviceStruct\n"); + xf86IDrvMsg(pInfo, X_ERROR, "unable to init touch\n"); return !Success; } - - /* - This function is provided to initialize an XAxisInfoRec, and should be - called for core and extension devices that have valuators. The space - for the XAxisInfoRec is allocated by the InitValuatorClassDeviceStruct - function, but is not initialized. - - InitValuatorAxisStruct should be called once for each axis of motion - reported by the device. Each invocation should be passed the axis - number (starting with 0), the minimum value for that axis, the maximum - value for that axis, and the resolution of the device in counts per meter. - If the device reports relative motion, 0 should be reported as the - minimum and maximum values. - - InitValuatorAxisStruct(dev, axnum, minval, maxval, resolution) - DeviceIntPtr dev; - int axnum; - int minval; - int maxval; - int resolution; - */ - xf86InitValuatorAxisStruct(device, 0, - XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_X), - 0, /* min val */ - priv->width - 1, /* max val */ - priv->width, /* resolution */ - 0, /* min_res */ - priv->width, /* max_res */ - Absolute); - - xf86InitValuatorAxisStruct(device, 1, - XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_Y), - 0, /* min val */ - priv->height - 1, /* max val */ - priv->height, /* resolution */ - 0, /* min_res */ - priv->height, /* max_res */ - Absolute); - - xf86InitValuatorAxisStruct(device, 2, - XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_PRESSURE), - 0, /* min val */ - priv->pmax, /* max val */ - priv->pmax + 1, /* resolution */ - 0, /* min_res */ - priv->pmax + 1, /* max_res */ - Absolute); - - /* - The mode field is either XIDirectTouch for direct−input touch devices - such as touchscreens or XIDependentTouch for indirect input devices such - as touchpads. For XIDirectTouch devices, touch events are sent to window - at the position the touch occured. For XIDependentTouch devices, touch - events are sent to the window at the position of the device's sprite. - - The num_touches field defines the maximum number of simultaneous touches - the device supports. A num_touches of 0 means the maximum number of - simultaneous touches is undefined or unspecified. This field should be - used as a guide only, devices will lie about their capabilities. - */ - if (InitTouchClassDeviceStruct(device, - priv->slots, - XIDirectTouch, - TOUCH_NUM_AXES) == FALSE) - { - xf86IDrvMsg(pInfo, X_ERROR, - "unable to allocate TouchClassDeviceStruct\n"); - return !Success; - } - break; case DEVICE_ON: @@ -402,7 +418,7 @@ PreInit(__attribute__ ((unused)) InputDriverPtr drv, xf86ProcessCommonOptions(pInfo, pInfo->options); /* create valuators */ - priv->valuators = valuator_mask_new(TOUCH_NUM_AXES); + priv->valuators = valuator_mask_new(MAX_USED_VALUATORS); if (!priv->valuators) { xf86IDrvMsg(pInfo, X_ERROR, "%s: out of memory\n", __FUNCTION__); From 5f321b52e569d26be9b3b8ef745706ab02f5e35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 9 Sep 2023 15:25:12 +0200 Subject: [PATCH 857/876] cleanup nvidia dockerfile. --- Dockerfile.nvidia | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index a6f26218..2a395544 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -22,6 +22,8 @@ RUN set -eux; \ # Install build deps autopoint autoconf automake autotools-dev libtool gettext bison flex gtk-doc-tools \ # Install libraries + librtmp-dev \ + libvo-aacenc-dev \ libtool-bin \ libgtk2.0-dev \ libgl1-mesa-dev \ @@ -42,8 +44,8 @@ RUN set -eux; \ RUN set -eux; \ git clone --depth 1 --branch $GSTREAMER_VERSION https://gitlab.freedesktop.org/gstreamer/gstreamer.git /gstreamer/src; \ cd /gstreamer/src; \ - mkdir -p /opt/gstreamer; \ - meson --prefix /opt/gstreamer \ + mkdir -p /usr/share/gstreamer; \ + meson --prefix /usr/share/gstreamer \ -Dgpl=enabled \ -Dugly=enabled \ -Dgst-plugins-ugly:x264=enabled \ @@ -186,9 +188,9 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - wget ca-certificates \ + wget ca-certificates supervisor \ pulseaudio dbus-x11 xserver-xorg-video-dummy \ - libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libx264-163 libxcvt0 \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libx264-163 libvo-aacenc0 librtmp1 libxcvt0 \ libgtk-3-bin software-properties-common cabextract aptitude vim curl \ # # needed for profile upload preStop hook @@ -196,9 +198,6 @@ RUN set -eux; \ # # file chooser handler, clipboard, drop xdotool xclip libgtk-3-0; \ - # install never version for supervisor that supports -s flag - apt-get install -y --no-install-recommends pip; \ - pip install supervisor --upgrade; \ # # create a non-root user groupadd --gid $USER_GID $USERNAME; \ @@ -302,13 +301,13 @@ ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/ # # set gstreamer envs -ENV PATH="/opt/gstreamer/bin:${PATH}" -ENV LD_LIBRARY_PATH="/opt/gstreamer/lib/x86_64-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" -ENV PKG_CONFIG_PATH="/opt/gstreamer/lib/x86_64-linux-gnu/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}" +ENV PATH="/usr/share/gstreamer/bin:${PATH}" +ENV LD_LIBRARY_PATH="/usr/share/gstreamer/lib/x86_64-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" +ENV PKG_CONFIG_PATH="/usr/share/gstreamer/lib/x86_64-linux-gnu/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}" # # copy gstreamer from previous stage -COPY --from=gstreamer /opt/gstreamer /opt/gstreamer +COPY --from=gstreamer /usr/share/gstreamer /usr/share/gstreamer # # copy plugins from previous stage @@ -325,4 +324,4 @@ HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ # # run neko -CMD ["/usr/local/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"] +CMD ["/usr/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"] From a392163819101f22673035b1cdd00f89199919ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 10 Sep 2023 19:38:07 +0200 Subject: [PATCH 858/876] fix runtime dockerfile. --- dev/build | 2 +- dev/runtime/Dockerfile | 16 ++++++++++++++-- dev/runtime/Dockerfile.nvidia | 20 -------------------- dev/start | 1 + 4 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 dev/runtime/Dockerfile.nvidia diff --git a/dev/build b/dev/build index f3ae34cd..50d9876b 100755 --- a/dev/build +++ b/dev/build @@ -20,4 +20,4 @@ fi docker build -t neko_server_build --target build --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" -f ../$DOCKERFILE .. docker build -t neko_server_runtime --target runtime --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" -f ../$DOCKERFILE .. -docker build -t neko_server_app --build-arg "BASE_IMAGE=neko_server_runtime" -f ./runtime/$DOCKERFILE ./runtime +docker build -t neko_server_app --build-arg "BASE_IMAGE=neko_server_runtime" -f ./runtime/Dockerfile ./runtime diff --git a/dev/runtime/Dockerfile b/dev/runtime/Dockerfile index e1d401b1..0eab10e8 100644 --- a/dev/runtime/Dockerfile +++ b/dev/runtime/Dockerfile @@ -1,16 +1,28 @@ ARG BASE_IMAGE=neko_server_runtime:latest FROM $BASE_IMAGE +ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US" + # -# install xfce +# install xfce and firefox RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends xfce4 xfce4-terminal firefox-esr sudo; \ + apt-get install -y --no-install-recommends \ + xfce4 xfce4-terminal sudo \ + xz-utils bzip2 libgtk-3-0 libdbus-glib-1-2; \ + # + # fetch latest firefox release + wget -O /tmp/firefox-setup.tar.bz2 "${SRC_URL}"; \ + mkdir /usr/lib/firefox; \ + tar -xjf /tmp/firefox-setup.tar.bz2 -C /usr/lib; \ + rm -f /tmp/firefox-setup.tar.bz2; \ + ln -s /usr/lib/firefox/firefox /usr/bin/firefox; \ # # add user to sudoers usermod -aG sudo neko; \ echo "neko:neko" | chpasswd; \ echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \ # clean up + apt-get --purge autoremove -y xz-utils bzip2; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* diff --git a/dev/runtime/Dockerfile.nvidia b/dev/runtime/Dockerfile.nvidia deleted file mode 100644 index e01cbc6d..00000000 --- a/dev/runtime/Dockerfile.nvidia +++ /dev/null @@ -1,20 +0,0 @@ -ARG BASE_IMAGE=neko_server_runtime:latest -FROM $BASE_IMAGE - -# -# install xfce -RUN set -eux; apt-get update; \ - # nvidia docker does not have firefox only firefox-esr - apt-get install -y --no-install-recommends xfce4 xfce4-terminal firefox sudo; \ - # - # add user to sudoers - usermod -aG sudo neko; \ - echo "neko:neko" | chpasswd; \ - echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \ - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# copy configuation files -COPY supervisord.conf /etc/neko/supervisord/xfce.conf diff --git a/dev/start b/dev/start index ad65b3cd..514bd2f2 100755 --- a/dev/start +++ b/dev/start @@ -55,5 +55,6 @@ docker run --rm -it \ -v "${PWD}/runtime/$CONFIG:/etc/neko/neko.yml" \ -e "NEKO_DEBUG=1" \ --shm-size=2G \ + --security-opt seccomp=unconfined \ $EXTRAOPTS \ neko_server_app:latest; From 4da7869e70dba619a537488178fba410eccbaafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 11 Sep 2023 16:34:57 +0200 Subject: [PATCH 859/876] Add Xorg modifiers (#57) * implement additional modifiers to xorg. * xorg modifiers to API. * update modifiers api & add ws. * scroll pos rename to delta and add ctrl key. --- internal/api/room/keyboard.go | 27 ++++----------- internal/desktop/xorg.go | 48 +++++++++++++++++++++----- internal/webrtc/handler.go | 33 +++++++++++++----- internal/webrtc/payload/receive.go | 9 ++++- internal/websocket/handler/control.go | 10 ++++-- internal/websocket/handler/handler.go | 2 +- internal/websocket/handler/keyboard.go | 11 ++---- openapi.yaml | 14 +++++++- pkg/types/desktop.go | 16 ++++++--- pkg/types/message/messages.go | 16 ++++++--- pkg/xorg/xorg.c | 42 +++++++++++----------- pkg/xorg/xorg.go | 21 ++++++++--- pkg/xorg/xorg.h | 6 ++-- 13 files changed, 166 insertions(+), 89 deletions(-) diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index ab15c2bd..a8115c08 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -8,13 +8,11 @@ import ( ) type KeyboardMapData struct { - Layout string `json:"layout"` - Variant string `json:"variant"` + types.KeyboardMap } type KeyboardModifiersData struct { - NumLock *bool `json:"numlock"` - CapsLock *bool `json:"capslock"` + types.KeyboardModifiers } func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) error { @@ -23,11 +21,7 @@ func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) err return err } - err := h.desktop.SetKeyboardMap(types.KeyboardMap{ - Layout: data.Layout, - Variant: data.Variant, - }) - + err := h.desktop.SetKeyboardMap(data.KeyboardMap) if err != nil { return utils.HttpInternalServerError().WithInternalErr(err) } @@ -37,14 +31,12 @@ func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) err func (h *RoomHandler) keyboardMapGet(w http.ResponseWriter, r *http.Request) error { data, err := h.desktop.GetKeyboardMap() - if err != nil { return utils.HttpInternalServerError().WithInternalErr(err) } return utils.HttpSuccess(w, KeyboardMapData{ - Layout: data.Layout, - Variant: data.Variant, + KeyboardMap: *data, }) } @@ -54,19 +46,12 @@ func (h *RoomHandler) keyboardModifiersSet(w http.ResponseWriter, r *http.Reques return err } - h.desktop.SetKeyboardModifiers(types.KeyboardModifiers{ - NumLock: data.NumLock, - CapsLock: data.CapsLock, - }) - + h.desktop.SetKeyboardModifiers(data.KeyboardModifiers) return utils.HttpSuccess(w) } func (h *RoomHandler) keyboardModifiersGet(w http.ResponseWriter, r *http.Request) error { - data := h.desktop.GetKeyboardModifiers() - return utils.HttpSuccess(w, KeyboardModifiersData{ - NumLock: data.NumLock, - CapsLock: data.CapsLock, + KeyboardModifiers: h.desktop.GetKeyboardModifiers(), }) } diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 867a775f..c0feb5dc 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -18,8 +18,8 @@ func (manager *DesktopManagerCtx) GetCursorPosition() (int, int) { return xorg.GetCursorPosition() } -func (manager *DesktopManagerCtx) Scroll(x, y int) { - xorg.Scroll(x, y) +func (manager *DesktopManagerCtx) Scroll(deltaX, deltaY int, controlKey bool) { + xorg.Scroll(deltaX, deltaY, controlKey) } func (manager *DesktopManagerCtx) ButtonDown(code uint32) error { @@ -140,24 +140,56 @@ func (manager *DesktopManagerCtx) GetKeyboardMap() (*types.KeyboardMap, error) { } func (manager *DesktopManagerCtx) SetKeyboardModifiers(mod types.KeyboardModifiers) { - if mod.NumLock != nil { - xorg.SetKeyboardModifier(xorg.KbdModNumLock, *mod.NumLock) + if mod.Shift != nil { + xorg.SetKeyboardModifier(xorg.KbdModShift, *mod.Shift) } if mod.CapsLock != nil { xorg.SetKeyboardModifier(xorg.KbdModCapsLock, *mod.CapsLock) } + + if mod.Control != nil { + xorg.SetKeyboardModifier(xorg.KbdModControl, *mod.Control) + } + + if mod.Alt != nil { + xorg.SetKeyboardModifier(xorg.KbdModAlt, *mod.Alt) + } + + if mod.NumLock != nil { + xorg.SetKeyboardModifier(xorg.KbdModNumLock, *mod.NumLock) + } + + if mod.Meta != nil { + xorg.SetKeyboardModifier(xorg.KbdModMeta, *mod.Meta) + } + + if mod.Super != nil { + xorg.SetKeyboardModifier(xorg.KbdModSuper, *mod.Super) + } + + if mod.AltGr != nil { + xorg.SetKeyboardModifier(xorg.KbdModAltGr, *mod.AltGr) + } } func (manager *DesktopManagerCtx) GetKeyboardModifiers() types.KeyboardModifiers { modifiers := xorg.GetKeyboardModifiers() - NumLock := (modifiers & xorg.KbdModNumLock) != 0 - CapsLock := (modifiers & xorg.KbdModCapsLock) != 0 + isset := func(mod xorg.KbdMod) *bool { + x := modifiers&mod != 0 + return &x + } return types.KeyboardModifiers{ - NumLock: &NumLock, - CapsLock: &CapsLock, + Shift: isset(xorg.KbdModShift), + CapsLock: isset(xorg.KbdModCapsLock), + Control: isset(xorg.KbdModControl), + Alt: isset(xorg.KbdModAlt), + NumLock: isset(xorg.KbdModNumLock), + Meta: isset(xorg.KbdModMeta), + Super: isset(xorg.KbdModSuper), + AltGr: isset(xorg.KbdModAltGr), } } diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 00f0fcd9..4222cc18 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -97,16 +97,31 @@ func (manager *WebRTCManagerCtx) handle( switch header.Event { case payload.OP_SCROLL: - payload := &payload.Scroll{} - if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { - return err - } + // TODO: remove this once the client is fixed + if header.Length == 4 { + payload := &payload.Scroll_Old{} + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { + return err + } - manager.desktop.Scroll(int(payload.X), int(payload.Y)) - logger.Trace(). - Int16("x", payload.X). - Int16("y", payload.Y). - Msg("scroll") + manager.desktop.Scroll(int(payload.X), int(payload.Y), false) + logger.Trace(). + Int16("x", payload.X). + Int16("y", payload.Y). + Msg("scroll") + } else { + payload := &payload.Scroll{} + if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { + return err + } + + manager.desktop.Scroll(int(payload.DeltaX), int(payload.DeltaY), payload.ControlKey) + logger.Trace(). + Int16("deltaX", payload.DeltaX). + Int16("deltaY", payload.DeltaY). + Bool("controlKey", payload.ControlKey). + Msg("scroll") + } case payload.OP_KEY_DOWN: payload := &payload.Key{} if err := binary.Read(buffer, binary.BigEndian, payload); err != nil { diff --git a/internal/webrtc/payload/receive.go b/internal/webrtc/payload/receive.go index 37383d7e..ee5deda9 100644 --- a/internal/webrtc/payload/receive.go +++ b/internal/webrtc/payload/receive.go @@ -21,11 +21,18 @@ type Move struct { Y uint16 } -type Scroll struct { +// TODO: remove this once the client is fixed +type Scroll_Old struct { X int16 Y int16 } +type Scroll struct { + DeltaX int16 + DeltaY int16 + ControlKey bool +} + type Key struct { Key uint32 } diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 456d166b..e92add15 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -74,12 +74,18 @@ func (h *MessageHandlerCtx) controlMove(session types.Session, payload *message. return nil } -func (h *MessageHandlerCtx) controlScroll(session types.Session, payload *message.ControlPos) error { +func (h *MessageHandlerCtx) controlScroll(session types.Session, payload *message.ControlScroll) error { if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { return err } - h.desktop.Scroll(payload.X, payload.Y) + // TOOD: remove this once the client is fixed + if payload.DeltaX == 0 && payload.DeltaY == 0 { + payload.DeltaX = payload.X + payload.DeltaY = payload.Y + } + + h.desktop.Scroll(payload.DeltaX, payload.DeltaY, payload.ControlKey) return nil } diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 8e8a8566..43ea2a17 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -88,7 +88,7 @@ func (h *MessageHandlerCtx) Message(session types.Session, data types.WebSocketM return h.controlMove(session, payload) }) case event.CONTROL_SCROLL: - payload := &message.ControlPos{} + payload := &message.ControlScroll{} err = utils.Unmarshal(payload, data.Payload, func() error { return h.controlScroll(session, payload) }) diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 02f7ff57..1e1d6ad3 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -12,10 +12,7 @@ func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message. return errors.New("is not the host") } - return h.desktop.SetKeyboardMap(types.KeyboardMap{ - Layout: payload.Layout, - Variant: payload.Variant, - }) + return h.desktop.SetKeyboardMap(payload.KeyboardMap) } func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *message.KeyboardModifiers) error { @@ -23,10 +20,6 @@ func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *me return errors.New("is not the host") } - h.desktop.SetKeyboardModifiers(types.KeyboardModifiers{ - NumLock: payload.NumLock, - CapsLock: payload.CapsLock, - }) - + h.desktop.SetKeyboardModifiers(payload.KeyboardModifiers) return nil } diff --git a/openapi.yaml b/openapi.yaml index db9fa981..6b6d37de 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -1087,10 +1087,22 @@ components: KeyboardModifiers: type: object properties: - numlock: + shift: type: boolean capslock: type: boolean + control: + type: boolean + alt: + type: boolean + numlock: + type: boolean + meta: + type: boolean + super: + type: boolean + altgr: + type: boolean ControlStatus: type: object diff --git a/pkg/types/desktop.go b/pkg/types/desktop.go index 16e36468..73f37d39 100644 --- a/pkg/types/desktop.go +++ b/pkg/types/desktop.go @@ -25,13 +25,19 @@ func (s ScreenSize) String() string { } type KeyboardModifiers struct { - NumLock *bool - CapsLock *bool + Shift *bool `json:"shift"` + CapsLock *bool `json:"capslock"` + Control *bool `json:"control"` + Alt *bool `json:"alt"` + NumLock *bool `json:"numlock"` + Meta *bool `json:"meta"` + Super *bool `json:"super"` + AltGr *bool `json:"altgr"` } type KeyboardMap struct { - Layout string - Variant string + Layout string `json:"layout"` + Variant string `json:"variant"` } type ClipboardText struct { @@ -48,7 +54,7 @@ type DesktopManager interface { // xorg Move(x, y int) GetCursorPosition() (int, int) - Scroll(x, y int) + Scroll(deltaX, deltaY int, controlKey bool) ButtonDown(code uint32) error KeyDown(code uint32) error ButtonUp(code uint32) error diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index b3bea68b..c2121dee 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -115,6 +115,16 @@ type ControlHost struct { HostID string `json:"host_id,omitempty"` } +type ControlScroll struct { + // TOOD: remove this once the client is fixed + X int `json:"x"` + Y int `json:"y"` + + DeltaX int `json:"delta_x"` + DeltaY int `json:"delta_y"` + ControlKey bool `json:"control_key"` +} + type ControlPos struct { X int `json:"x"` Y int `json:"y"` @@ -159,13 +169,11 @@ type ClipboardData struct { ///////////////////////////// type KeyboardMap struct { - Layout string `json:"layout"` - Variant string `json:"variant"` + types.KeyboardMap } type KeyboardModifiers struct { - CapsLock *bool `json:"capslock"` - NumLock *bool `json:"numlock"` + types.KeyboardModifiers } ///////////////////////////// diff --git a/pkg/xorg/xorg.c b/pkg/xorg/xorg.c index cd39fc12..d94b7118 100644 --- a/pkg/xorg/xorg.c +++ b/pkg/xorg/xorg.c @@ -30,33 +30,33 @@ void XCursorPosition(int *x, int *y) { XQueryPointer(display, root, &root, &window, x, y, &i, &i, &mask); } -void XScroll(int x, int y) { - int ydir = 4; /* Button 4 is up, 5 is down. */ - int xdir = 6; - +void XScroll(int deltaX, int deltaY) { Display *display = getXDisplay(); - if (y < 0) { - ydir = 5; + int ydir; + if (deltaY > 0) { + ydir = 4; // button 4 is up + } else { + ydir = 5; // button 5 is down } - if (x < 0) { - xdir = 7; + int xdir; + if (deltaX > 0) { + xdir = 6; // button 6 is right + } else { + xdir = 7; // button 7 is left } - int xi; - int yi; - - for (xi = 0; xi < abs(x); xi++) { - XTestFakeButtonEvent(display, xdir, 1, CurrentTime); - XTestFakeButtonEvent(display, xdir, 0, CurrentTime); - } - - for (yi = 0; yi < abs(y); yi++) { + for (int i = 0; i < abs(deltaY); i++) { XTestFakeButtonEvent(display, ydir, 1, CurrentTime); XTestFakeButtonEvent(display, ydir, 0, CurrentTime); } + for (int i = 0; i < abs(deltaX); i++) { + XTestFakeButtonEvent(display, xdir, 1, CurrentTime); + XTestFakeButtonEvent(display, xdir, 0, CurrentTime); + } + XSync(display, 0); } @@ -368,17 +368,19 @@ XRRModeInfo XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh) { return modeinfo; } -void XSetKeyboardModifier(int mod, int on) { +void XSetKeyboardModifier(unsigned char mod, int on) { Display *display = getXDisplay(); XkbLockModifiers(display, XkbUseCoreKbd, mod, on ? mod : 0); XFlush(display); } -char XGetKeyboardModifiers() { +unsigned char XGetKeyboardModifiers() { XkbStateRec xkbState; Display *display = getXDisplay(); XkbGetState(display, XkbUseCoreKbd, &xkbState); - return xkbState.locked_mods; + // XkbStateFieldFromRec() doesn't work properly because + // state.lookup_mods isn't properly updated, so we do this manually + return XkbBuildCoreState(XkbStateMods(&xkbState), xkbState.group); } XFixesCursorImage *XGetCursorImage(void) { diff --git a/pkg/xorg/xorg.go b/pkg/xorg/xorg.go index b9846974..41a9b42c 100644 --- a/pkg/xorg/xorg.go +++ b/pkg/xorg/xorg.go @@ -23,8 +23,14 @@ import ( type KbdMod uint8 const ( - KbdModCapsLock KbdMod = 2 - KbdModNumLock KbdMod = 16 + KbdModShift KbdMod = C.ShiftMask + KbdModCapsLock KbdMod = C.LockMask + KbdModControl KbdMod = C.ControlMask + KbdModAlt KbdMod = C.Mod1Mask + KbdModNumLock KbdMod = C.Mod2Mask + KbdModMeta KbdMod = C.Mod3Mask + KbdModSuper KbdMod = C.Mod4Mask + KbdModAltGr KbdMod = C.Mod5Mask ) type ScreenConfiguration struct { @@ -82,11 +88,16 @@ func GetCursorPosition() (int, int) { return int(x), int(y) } -func Scroll(x, y int) { +func Scroll(deltaX, deltaY int, controlKey bool) { mu.Lock() defer mu.Unlock() - C.XScroll(C.int(x), C.int(y)) + if controlKey { + C.XSetKeyboardModifier(C.uchar(C.ControlMask), 1) + defer C.XSetKeyboardModifier(C.uchar(C.ControlMask), 0) + } + + C.XScroll(C.int(deltaX), C.int(deltaY)) } func ButtonDown(code uint32) error { @@ -248,7 +259,7 @@ func SetKeyboardModifier(mod KbdMod, active bool) { num = C.int(1) } - C.XSetKeyboardModifier(C.int(mod), num) + C.XSetKeyboardModifier(C.uchar(mod), num) } func GetKeyboardModifiers() KbdMod { diff --git a/pkg/xorg/xorg.h b/pkg/xorg/xorg.h index 4bca692c..23bca9a9 100644 --- a/pkg/xorg/xorg.h +++ b/pkg/xorg/xorg.h @@ -22,7 +22,7 @@ void XDisplayClose(void); void XMove(int x, int y); void XCursorPosition(int *x, int *y); -void XScroll(int x, int y); +void XScroll(int deltaX, int deltaY); void XButton(unsigned int button, int down); typedef struct xkeyentry_t { @@ -42,8 +42,8 @@ void XGetScreenConfigurations(); void XCreateScreenMode(int width, int height, short rate); XRRModeInfo XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh); -void XSetKeyboardModifier(int mod, int on); -char XGetKeyboardModifiers(); +void XSetKeyboardModifier(unsigned char mod, int on); +unsigned char XGetKeyboardModifiers(); XFixesCursorImage *XGetCursorImage(void); char *XGetScreenshot(int *w, int *h); From d09e421a51906ac482a9b7e7b5b74b6676abf2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 11 Sep 2023 16:49:45 +0200 Subject: [PATCH 860/876] Remove dbus (#55) * remove dbus. * xfce needs dbus installed. --- .devcontainer/Dockerfile | 6 ++---- Dockerfile | 3 +-- Dockerfile.nvidia | 3 +-- dev/runtime/Dockerfile | 2 +- runtime/dbus | 11 ----------- runtime/supervisord.conf | 10 ---------- 6 files changed, 5 insertions(+), 30 deletions(-) delete mode 100755 runtime/dbus diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 7bb676fc..d69c04b5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -58,7 +58,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ wget ca-certificates supervisor \ - pulseaudio dbus-x11 xserver-xorg-video-dummy \ + pulseaudio xserver-xorg-video-dummy \ libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ # # needed for profile upload preStop hook @@ -122,7 +122,6 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/ COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so # copy runtime files -COPY runtime/dbus /usr/bin/dbus COPY runtime/default.pa /etc/pulse/default.pa COPY runtime/supervisord.conf /etc/neko/supervisord.conf COPY runtime/xorg.conf /etc/neko/xorg.conf @@ -133,8 +132,7 @@ COPY dev/runtime/config.yml /etc/neko/neko.yml COPY dev/runtime/supervisord.conf /etc/neko/supervisord/dev.conf # customized scripts -RUN chmod +x /usr/bin/dbus;\ - echo '#!/bin/sh\nsleep infinity' > /usr/bin/neko; \ +RUN echo '#!/bin/sh\nsleep infinity' > /usr/bin/neko; \ chmod +x /usr/bin/neko; \ echo '#!/bin/sh\nsudo sh -c "export USER='$USERNAME'\nexport HOME=/home/'$USERNAME'\n/usr/bin/supervisord -c /etc/neko/supervisord.conf"' > /usr/bin/deps; \ chmod +x /usr/bin/deps; \ diff --git a/Dockerfile b/Dockerfile index 1cc3995c..d1f0d0ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,7 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ wget ca-certificates supervisor \ - pulseaudio dbus-x11 xserver-xorg-video-dummy \ + pulseaudio xserver-xorg-video-dummy \ libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libxcvt0 \ # # needed for profile upload preStop hook @@ -133,7 +133,6 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xor # # copy runtime configs COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources -COPY runtime/dbus /usr/bin/dbus COPY runtime/default.pa /etc/pulse/default.pa COPY runtime/supervisord.conf /etc/neko/supervisord.conf COPY runtime/xorg.conf /etc/neko/xorg.conf diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index 2a395544..947e4ed5 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -189,7 +189,7 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ wget ca-certificates supervisor \ - pulseaudio dbus-x11 xserver-xorg-video-dummy \ + pulseaudio xserver-xorg-video-dummy \ libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libx264-163 libvo-aacenc0 librtmp1 libxcvt0 \ libgtk-3-bin software-properties-common cabextract aptitude vim curl \ # @@ -279,7 +279,6 @@ RUN set -eux; \ # # copy runtime configs COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources -COPY runtime/dbus /usr/bin/dbus COPY runtime/default.pa /etc/pulse/default.pa COPY runtime/supervisord.conf /etc/neko/supervisord.conf COPY runtime/xorg.conf /etc/neko/xorg.conf diff --git a/dev/runtime/Dockerfile b/dev/runtime/Dockerfile index 0eab10e8..c6c3b99b 100644 --- a/dev/runtime/Dockerfile +++ b/dev/runtime/Dockerfile @@ -7,7 +7,7 @@ ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lan # install xfce and firefox RUN set -eux; apt-get update; \ apt-get install -y --no-install-recommends \ - xfce4 xfce4-terminal sudo \ + dbus-x11 xfce4 xfce4-terminal sudo \ xz-utils bzip2 libgtk-3-0 libdbus-glib-1-2; \ # # fetch latest firefox release diff --git a/runtime/dbus b/runtime/dbus deleted file mode 100755 index bf0d4375..00000000 --- a/runtime/dbus +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if [ ! -d /var/run/dbus ]; then - mkdir -p /var/run/dbus -fi - -if [ -f /var/run/dbus/pid ]; then - rm -f /var/run/dbus/pid -fi - -/usr/bin/dbus-daemon --nofork --print-pid --config-file=/usr/share/dbus-1/system.conf diff --git a/runtime/supervisord.conf b/runtime/supervisord.conf index 6ba51b81..d7c2ec20 100644 --- a/runtime/supervisord.conf +++ b/runtime/supervisord.conf @@ -8,16 +8,6 @@ logfile_maxbytes=0 [include] files=/etc/neko/supervisord/*.conf -[program:dbus] -environment=HOME="/root",USER="root" -command=/usr/bin/dbus -autorestart=true -priority=100 -user=root -stdout_logfile=/dev/stderr -stdout_logfile_maxbytes=0 -redirect_stderr=true - [program:x-server] environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" command=/usr/bin/X %(ENV_DISPLAY)s -config /etc/neko/xorg.conf -noreset -nolisten tcp From 8753e7b69a692b9602a8c761c2c6d90e47c070d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 25 Sep 2023 18:28:05 +0200 Subject: [PATCH 861/876] members: add multiuser profile. --- dev/runtime/config.yml | 2 ++ internal/config/member.go | 51 +++++++++++++++++++++++++++ internal/member/multiuser/provider.go | 34 ++++++------------ internal/member/multiuser/types.go | 4 +++ 4 files changed, 67 insertions(+), 24 deletions(-) diff --git a/dev/runtime/config.yml b/dev/runtime/config.yml index 235287a3..866cd941 100644 --- a/dev/runtime/config.yml +++ b/dev/runtime/config.yml @@ -99,6 +99,8 @@ member: # multiuser: # admin_password: "admin" # user_password: "neko" + # admin_profile: # optional + # user_profile: # optional # provider: "noauth" session: diff --git a/internal/config/member.go b/internal/config/member.go index ee27efb4..634ea2bd 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -8,6 +8,7 @@ import ( "github.com/demodesk/neko/internal/member/file" "github.com/demodesk/neko/internal/member/multiuser" "github.com/demodesk/neko/internal/member/object" + "github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/utils" ) @@ -49,6 +50,16 @@ func (Member) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().String("member.multiuser.user_profile", "{}", "member multiuser provider: user profile in JSON format") + if err := viper.BindPFlag("member.multiuser.user_profile", cmd.PersistentFlags().Lookup("member.multiuser.user_profile")); err != nil { + return err + } + + cmd.PersistentFlags().String("member.multiuser.admin_profile", "{}", "member multiuser provider: admin profile in JSON format") + if err := viper.BindPFlag("member.multiuser.admin_profile", cmd.PersistentFlags().Lookup("member.multiuser.admin_profile")); err != nil { + return err + } + return nil } @@ -68,4 +79,44 @@ func (s *Member) Set() { // multiuser provider s.Multiuser.UserPassword = viper.GetString("member.multiuser.user_password") s.Multiuser.AdminPassword = viper.GetString("member.multiuser.admin_password") + + // default user profile + s.Multiuser.UserProfile = types.MemberProfile{ + IsAdmin: false, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanShareMedia: true, + CanAccessClipboard: true, + SendsInactiveCursor: true, + CanSeeInactiveCursors: false, + } + + // override user profile + if err := viper.UnmarshalKey("member.multiuser.user_profile", &s.Multiuser.UserProfile, viper.DecodeHook( + utils.JsonStringAutoDecode(s.Multiuser.UserProfile), + )); err != nil { + log.Warn().Err(err).Msgf("unable to parse member multiuser user profile") + } + + // default admin profile + s.Multiuser.AdminProfile = types.MemberProfile{ + IsAdmin: true, + CanLogin: true, + CanConnect: true, + CanWatch: true, + CanHost: true, + CanShareMedia: true, + CanAccessClipboard: true, + SendsInactiveCursor: true, + CanSeeInactiveCursors: true, + } + + // override admin profile + if err := viper.UnmarshalKey("member.multiuser.admin_profile", &s.Multiuser.AdminProfile, viper.DecodeHook( + utils.JsonStringAutoDecode(s.Multiuser.AdminProfile), + )); err != nil { + log.Warn().Err(err).Msgf("unable to parse member multiuser admin profile") + } } diff --git a/internal/member/multiuser/provider.go b/internal/member/multiuser/provider.go index 915a19fe..aeb55f17 100644 --- a/internal/member/multiuser/provider.go +++ b/internal/member/multiuser/provider.go @@ -38,34 +38,20 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string // if logged in as administrator if provider.config.AdminPassword == password { - return id, types.MemberProfile{ - Name: username, - IsAdmin: true, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanShareMedia: true, - CanAccessClipboard: true, - SendsInactiveCursor: true, - CanSeeInactiveCursors: true, - }, nil + profile := provider.config.AdminProfile + if profile.Name == "" { + profile.Name = username + } + return id, profile, nil } // if logged in as user if provider.config.UserPassword == password { - return id, types.MemberProfile{ - Name: username, - IsAdmin: false, - CanLogin: true, - CanConnect: true, - CanWatch: true, - CanHost: true, - CanShareMedia: true, - CanAccessClipboard: true, - SendsInactiveCursor: true, - CanSeeInactiveCursors: false, - }, nil + profile := provider.config.UserProfile + if profile.Name == "" { + profile.Name = username + } + return id, profile, nil } return "", types.MemberProfile{}, types.ErrMemberInvalidPassword diff --git a/internal/member/multiuser/types.go b/internal/member/multiuser/types.go index 4d6103d9..dfdedfb3 100644 --- a/internal/member/multiuser/types.go +++ b/internal/member/multiuser/types.go @@ -1,6 +1,10 @@ package multiuser +import "github.com/demodesk/neko/pkg/types" + type Config struct { AdminPassword string UserPassword string + AdminProfile types.MemberProfile + UserProfile types.MemberProfile } From 801b5b198fa650775834ce68f5ac7a0395dd1322 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:16:47 +0100 Subject: [PATCH 862/876] Bump golang.org/x/net from 0.12.0 to 0.17.0 (#58) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.12.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.12.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 98fedb76..b3ff66cc 100644 --- a/go.mod +++ b/go.mod @@ -56,10 +56,10 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/subosito/gotenv v1.4.2 // indirect - golang.org/x/crypto v0.11.0 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index da79a782..52c59690 100644 --- a/go.sum +++ b/go.sum @@ -301,8 +301,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -381,8 +381,8 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -458,8 +458,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -483,8 +483,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From cd9d31a627b1a74141a82d26fe37fa60f78cde21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 6 Nov 2023 15:07:46 +0100 Subject: [PATCH 863/876] upgrade go deps. --- go.mod | 64 ++++++++++++++++++++++----------------- go.sum | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index b3ff66cc..d82c858e 100644 --- a/go.mod +++ b/go.mod @@ -4,62 +4,70 @@ go 1.21 require ( github.com/PaesslerAG/gval v1.2.2 - github.com/go-chi/chi v1.5.4 + github.com/go-chi/chi v1.5.5 github.com/go-chi/cors v1.2.1 - github.com/gorilla/websocket v1.5.0 + github.com/gorilla/websocket v1.5.1 github.com/kataras/go-events v0.0.3 - github.com/pion/ice/v2 v2.3.9 - github.com/pion/interceptor v0.1.17 + github.com/pion/ice/v2 v2.3.11 + github.com/pion/interceptor v0.1.25 github.com/pion/logging v0.2.2 github.com/pion/rtcp v1.2.10 - github.com/pion/webrtc/v3 v3.2.12 - github.com/prometheus/client_golang v1.16.0 - github.com/rs/zerolog v1.29.1 - github.com/spf13/cobra v1.7.0 - github.com/spf13/viper v1.16.0 + github.com/pion/webrtc/v3 v3.2.21 + github.com/prometheus/client_golang v1.17.0 + github.com/rs/zerolog v1.31.0 + github.com/spf13/cobra v1.8.0 + github.com/spf13/viper v1.17.0 ) require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.4.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/pelletier/go-toml/v2 v2.0.8 // indirect + github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/pion/datachannel v1.5.5 // indirect github.com/pion/dtls/v2 v2.2.7 // indirect - github.com/pion/mdns v0.0.7 // indirect + github.com/pion/mdns v0.0.9 // indirect github.com/pion/randutil v0.1.0 // indirect - github.com/pion/rtp v1.7.13 // indirect - github.com/pion/sctp v1.8.7 // indirect + github.com/pion/rtp v1.8.2 // indirect + github.com/pion/sctp v1.8.9 // indirect github.com/pion/sdp/v3 v3.0.6 // indirect - github.com/pion/srtp/v2 v2.0.15 // indirect + github.com/pion/srtp/v2 v2.0.17 // indirect github.com/pion/stun v0.6.1 // indirect - github.com/pion/transport/v2 v2.2.1 // indirect - github.com/pion/turn/v2 v2.1.2 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.44.0 // indirect - github.com/prometheus/procfs v0.11.0 // indirect + github.com/pion/transport/v2 v2.2.4 // indirect + github.com/pion/turn/v2 v2.1.4 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/common v0.45.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect + github.com/sagikazarmark/locafero v0.3.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/spf13/afero v1.9.5 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.10.0 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/objx v0.5.0 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/subosito/gotenv v1.4.2 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.14.0 // indirect + golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/sys v0.14.0 // indirect + golang.org/x/text v0.14.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 52c59690..f36bf30c 100644 --- a/go.sum +++ b/go.sum @@ -56,9 +56,12 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -71,8 +74,12 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= +github.com/go-chi/chi v1.5.5 h1:vOB/HbEMt9QqBqErz07QehcOKHaWFtuj87tTDVz2qXE= +github.com/go-chi/chi v1.5.5/go.mod h1:C9JqLr3tIYjDOZpzn+BCuxY8z8vmca43EeMgyZt7irw= github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4= github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -140,11 +147,16 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -176,8 +188,12 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= @@ -191,31 +207,49 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= +github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= +github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8= github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= github.com/pion/ice/v2 v2.3.9 h1:7yZpHf3PhPxJGT4JkMj1Y8Rl5cQ6fB709iz99aeMd/U= github.com/pion/ice/v2 v2.3.9/go.mod h1:lT3kv5uUIlHfXHU/ZRD7uKD/ufM202+eTa3C/umgGf4= +github.com/pion/ice/v2 v2.3.11 h1:rZjVmUwyT55cmN8ySMpL7rsS8KYsJERsrxJLLxpKhdw= +github.com/pion/ice/v2 v2.3.11/go.mod h1:hPcLC3kxMa+JGRzMHqQzjoSj3xtE9F+eoncmXLlCL4E= github.com/pion/interceptor v0.1.17 h1:prJtgwFh/gB8zMqGZoOgJPHivOwVAp61i2aG61Du/1w= github.com/pion/interceptor v0.1.17/go.mod h1:SY8kpmfVBvrbUzvj2bsXz7OJt5JvmVNZ+4Kjq7FcwrI= +github.com/pion/interceptor v0.1.18/go.mod h1:tpvvF4cPM6NGxFA1DUMbhabzQBxdWMATDGEUYOR9x6I= +github.com/pion/interceptor v0.1.25 h1:pwY9r7P6ToQ3+IF0bajN0xmk/fNw/suTgaTdlwTDmhc= +github.com/pion/interceptor v0.1.25/go.mod h1:wkbPYAak5zKsfpVDYMtEfWEy8D4zL+rpxCxPImLOg3Y= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.7 h1:P0UB4Sr6xDWEox0kTVxF0LmQihtCbSAdW0H2nEgkA3U= github.com/pion/mdns v0.0.7/go.mod h1:4iP2UbeFhLI/vWju/bw6ZfwjJzk0z8DNValjGxR/dD8= +github.com/pion/mdns v0.0.8/go.mod h1:hYE72WX8WDveIhg7fmXgMKivD3Puklk0Ymzog0lSyaI= +github.com/pion/mdns v0.0.9 h1:7Ue5KZsqq8EuqStnpPWV33vYYEH0+skdDN5L7EiEsI4= +github.com/pion/mdns v0.0.9/go.mod h1:2JA5exfxwzXiCihmxpTKgFUpiQws2MnipoPK09vecIc= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc= github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I= github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.8.1/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= +github.com/pion/rtp v1.8.2 h1:oKMM0K1/QYQ5b5qH+ikqDSZRipP5mIxPJcgcvw5sH0w= +github.com/pion/rtp v1.8.2/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= github.com/pion/sctp v1.8.7 h1:JnABvFakZueGAn4KU/4PSKg+GWbF6QWbKTWZOSGJjXw= github.com/pion/sctp v1.8.7/go.mod h1:g1Ul+ARqZq5JEmoFy87Q/4CePtKnTJ1QCL9dBBdN6AU= +github.com/pion/sctp v1.8.8/go.mod h1:igF9nZBrjh5AtmKc7U30jXltsFHicFCXSmWA2GWRaWs= +github.com/pion/sctp v1.8.9 h1:TP5ZVxV5J7rz7uZmbyvnUvsn7EJ2x/5q9uhsTtXbI3g= +github.com/pion/sctp v1.8.9/go.mod h1:cMLT45jqw3+jiJCrtHVwfQLnfR0MGZ4rgOJwUOIqLkI= github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw= github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= github.com/pion/srtp/v2 v2.0.15 h1:+tqRtXGsGwHC0G0IUIAzRmdkHvriF79IHVfZGfHrQoA= github.com/pion/srtp/v2 v2.0.15/go.mod h1:b/pQOlDrbB0HEH5EUAQXzSYxikFbNcNuKmF8tM0hCtw= +github.com/pion/srtp/v2 v2.0.17 h1:ECuOk+7uIpY6HUlTb0nXhfvu4REG2hjtC4ronYFCZE4= +github.com/pion/srtp/v2 v2.0.17/go.mod h1:y5WSHcJY4YfNB/5r7ca5YjHeIr1H3LM1rKArGGs8jMc= github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4= github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8= github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40= @@ -225,47 +259,83 @@ github.com/pion/transport/v2 v2.1.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlD github.com/pion/transport/v2 v2.2.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ= github.com/pion/transport/v2 v2.2.1 h1:7qYnCBlpgSJNYMbLCKuSY9KbQdBFoETvPNETv0y4N7c= github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g= +github.com/pion/transport/v2 v2.2.2/go.mod h1:OJg3ojoBJopjEeECq2yJdXH9YVrUJ1uQ++NjXLOUorc= +github.com/pion/transport/v2 v2.2.3/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= +github.com/pion/transport/v2 v2.2.4 h1:41JJK6DZQYSeVLxILA2+F4ZkKb4Xd/tFJZRFZQ9QAlo= +github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= +github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0= github.com/pion/turn/v2 v2.1.2 h1:wj0cAoGKltaZ790XEGW9HwoUewqjliwmhtxCuB2ApyM= github.com/pion/turn/v2 v2.1.2/go.mod h1:1kjnPkBcex3dhCU2Am+AAmxDcGhLX3WnMfmkNpvSTQU= +github.com/pion/turn/v2 v2.1.3/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY= +github.com/pion/turn/v2 v2.1.4 h1:2xn8rduI5W6sCZQkEnIUDAkrBQNl2eYIBCHMZ3QMmP8= +github.com/pion/turn/v2 v2.1.4/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY= github.com/pion/webrtc/v3 v3.2.12 h1:pVqz5NdtTqyhKIhMcXR8bPp709kCf9blyAhDjoVRLvA= github.com/pion/webrtc/v3 v3.2.12/go.mod h1:/Oz6K95CGWaN+3No+Z0NYvgOPOr3aY8UyTlMm/dec3A= +github.com/pion/webrtc/v3 v3.2.21 h1:c8fy5JcqJkAQBwwy3Sk9huQLTBUSqaggyRlv9Lnh2zY= +github.com/pion/webrtc/v3 v3.2.21/go.mod h1:vVURQTBOG5BpWKOJz3nlr23NfTDeyKVmubRNqzQp+Tg= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= +github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= +github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= +github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= +github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk= github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= +github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= +github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ= +github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI= +github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -280,6 +350,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -291,6 +363,10 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -301,6 +377,9 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -313,6 +392,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -381,6 +462,9 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= +golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -458,8 +542,13 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -469,6 +558,9 @@ golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -483,8 +575,12 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 501280f8aa2e8f6e107e0e7ab4c828f10e4af09b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 19 Nov 2023 14:35:19 +0100 Subject: [PATCH 864/876] server proxy, router opts and optional CORS. --- internal/config/server.go | 19 ++++++++++- internal/http/manager.go | 36 +++++++++++--------- internal/http/router.go | 71 ++++++++++++++++++++++++++++++--------- pkg/types/http.go | 2 -- 4 files changed, 95 insertions(+), 33 deletions(-) diff --git a/internal/config/server.go b/internal/config/server.go index 44ba64ca..9ed30859 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -13,6 +13,7 @@ type Server struct { Cert string Key string Bind string + Proxy bool Static string PathPrefix string PProf bool @@ -36,6 +37,11 @@ func (Server) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("server.proxy", false, "trust reverse proxy headers") + if err := viper.BindPFlag("server.proxy", cmd.PersistentFlags().Lookup("server.proxy")); err != nil { + return err + } + cmd.PersistentFlags().String("server.static", "", "path to neko client files to serve") if err := viper.BindPFlag("server.static", cmd.PersistentFlags().Lookup("server.static")); err != nil { return err @@ -56,7 +62,7 @@ func (Server) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().StringSlice("server.cors", []string{"*"}, "list of allowed origins for CORS") + cmd.PersistentFlags().StringSlice("server.cors", []string{}, "list of allowed origins for CORS, if empty CORS is disabled, if '*' is present all origins are allowed") if err := viper.BindPFlag("server.cors", cmd.PersistentFlags().Lookup("server.cors")); err != nil { return err } @@ -68,6 +74,7 @@ func (s *Server) Set() { s.Cert = viper.GetString("server.cert") s.Key = viper.GetString("server.key") s.Bind = viper.GetString("server.bind") + s.Proxy = viper.GetBool("server.proxy") s.Static = viper.GetString("server.static") s.PathPrefix = path.Join("/", path.Clean(viper.GetString("server.path_prefix"))) s.PProf = viper.GetBool("server.pprof") @@ -80,7 +87,17 @@ func (s *Server) Set() { } } +func (s *Server) HasCors() bool { + return len(s.CORS) > 0 +} + func (s *Server) AllowOrigin(origin string) bool { + // if CORS is disabled, allow all origins + if len(s.CORS) == 0 { + return true + } + + // if CORS is enabled, allow only origins in the list in, _ := utils.ArrayIn(origin, s.CORS) return in || s.CORS[0] == "*" } diff --git a/internal/http/manager.go b/internal/http/manager.go index eb986f93..4a753314 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -5,7 +5,6 @@ import ( "net/http" "os" - "github.com/go-chi/cors" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -24,24 +23,31 @@ type HttpManagerCtx struct { func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, config *config.Server) *HttpManagerCtx { logger := log.With().Str("module", "http").Logger() - router := newRouter(logger) - router.UseBypass(cors.Handler(cors.Options{ - AllowOriginFunc: func(r *http.Request, origin string) bool { - return config.AllowOrigin(origin) - }, - AllowedMethods: []string{"GET", "POST", "DELETE", "OPTIONS"}, - AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"}, - ExposedHeaders: []string{"Link"}, - AllowCredentials: true, - MaxAge: 300, // Maximum value not ignored by any of major browsers - })) + opts := []RouterOption{ + WithRequestID(), // create a request id for each request + } + + // use real ip if behind proxy + // before logger so it can log the real ip + if config.Proxy { + opts = append(opts, WithRealIP()) + } + + opts = append(opts, + WithLogger(logger), + WithRecoverer(), // recover from panics without crashing server + ) + + if config.HasCors() { + opts = append(opts, WithCORS(config.AllowOrigin)) + } if config.PathPrefix != "/" { - router.UseBypass(func(h http.Handler) http.Handler { - return http.StripPrefix(config.PathPrefix, h) - }) + opts = append(opts, WithPathPrefix(config.PathPrefix)) } + router := newRouter(opts...) + router.Route("/api", ApiManager.Route) router.Get("/api/ws", WebSocketManager.Upgrade(func(r *http.Request) bool { diff --git a/internal/http/router.go b/internal/http/router.go index ab7bd535..02196252 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -5,6 +5,7 @@ import ( "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" + "github.com/go-chi/cors" "github.com/rs/zerolog" "github.com/demodesk/neko/pkg/auth" @@ -12,16 +13,65 @@ import ( "github.com/demodesk/neko/pkg/utils" ) +type RouterOption func(*router) + +func WithRequestID() RouterOption { + return func(r *router) { + r.chi.Use(middleware.RequestID) + } +} + +func WithLogger(logger zerolog.Logger) RouterOption { + return func(r *router) { + r.chi.Use(middleware.RequestLogger(&logFormatter{logger})) + } +} + +func WithRecoverer() RouterOption { + return func(r *router) { + r.chi.Use(middleware.Recoverer) + } +} + +func WithCORS(allowOrigin func(origin string) bool) RouterOption { + return func(r *router) { + r.chi.Use(cors.Handler(cors.Options{ + AllowOriginFunc: func(r *http.Request, origin string) bool { + return allowOrigin(origin) + }, + AllowedMethods: []string{"GET", "POST", "DELETE", "OPTIONS"}, + AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"}, + ExposedHeaders: []string{"Link"}, + AllowCredentials: true, + MaxAge: 300, // Maximum value not ignored by any of major browsers + })) + } +} + +func WithPathPrefix(prefix string) RouterOption { + return func(r *router) { + r.chi.Use(func(h http.Handler) http.Handler { + return http.StripPrefix(prefix, h) + }) + } +} + +func WithRealIP() RouterOption { + return func(r *router) { + r.chi.Use(middleware.RealIP) + } +} + type router struct { chi chi.Router } -func newRouter(logger zerolog.Logger) *router { - r := chi.NewRouter() - r.Use(middleware.RequestID) // Create a request ID for each request - r.Use(middleware.RequestLogger(&logFormatter{logger})) - r.Use(middleware.Recoverer) // Recover from panics without crashing server - return &router{r} +func newRouter(opts ...RouterOption) types.Router { + r := &router{chi.NewRouter()} + for _, opt := range opts { + opt(r) + } + return r } func (r *router) Group(fn func(types.Router)) { @@ -61,19 +111,10 @@ func (r *router) With(fn types.MiddlewareHandler) types.Router { return &router{c} } -func (r *router) WithBypass(fn func(next http.Handler) http.Handler) types.Router { - c := r.chi.With(fn) - return &router{c} -} - func (r *router) Use(fn types.MiddlewareHandler) { r.chi.Use(middlewareHandler(fn)) } -func (r *router) UseBypass(fn func(next http.Handler) http.Handler) { - r.chi.Use(fn) -} - func (r *router) ServeHTTP(w http.ResponseWriter, req *http.Request) { r.chi.ServeHTTP(w, req) } diff --git a/pkg/types/http.go b/pkg/types/http.go index c178b447..0eced458 100644 --- a/pkg/types/http.go +++ b/pkg/types/http.go @@ -17,9 +17,7 @@ type Router interface { Patch(pattern string, fn RouterHandler) Delete(pattern string, fn RouterHandler) With(fn MiddlewareHandler) Router - WithBypass(fn func(next http.Handler) http.Handler) Router Use(fn MiddlewareHandler) - UseBypass(fn func(next http.Handler) http.Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) } From 9d1ea871285cef65c4ab4a8d0cd3b76b2b0d1b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 19 Nov 2023 15:19:47 +0100 Subject: [PATCH 865/876] members bulk delete. (#59) --- internal/api/members/bluk.go | 27 +++++++++++++++++++++++++++ internal/api/members/handler.go | 1 + openapi.yaml | 28 ++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/internal/api/members/bluk.go b/internal/api/members/bluk.go index a7a4552e..ead74b88 100644 --- a/internal/api/members/bluk.go +++ b/internal/api/members/bluk.go @@ -55,3 +55,30 @@ func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Reques return utils.HttpSuccess(w) } + +type MemberBulkDeletePayload struct { + IDs []string `json:"ids"` +} + +func (h *MembersHandler) membersBulkDelete(w http.ResponseWriter, r *http.Request) error { + bytes, err := io.ReadAll(r.Body) + if err != nil { + return utils.HttpBadRequest("unable to read post body").WithInternalErr(err) + } + + data := &MemberBulkDeletePayload{} + if err := json.Unmarshal(bytes, &data); err != nil { + return utils.HttpBadRequest("unable to unmarshal payload").WithInternalErr(err) + } + + for _, memberId := range data.IDs { + if err := h.members.Delete(memberId); err != nil { + return utils.HttpInternalServerError(). + WithInternalErr(err). + WithInternalMsg("unable to delete member"). + Msgf("failed to delete member %s", memberId) + } + } + + return utils.HttpSuccess(w) +} diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 45d022a5..79d469f5 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -47,6 +47,7 @@ func (h *MembersHandler) Route(r types.Router) { func (h *MembersHandler) RouteBulk(r types.Router) { r.With(auth.AdminsOnly).Group(func(r types.Router) { r.Post("/update", h.membersBulkUpdate) + r.Post("/delete", h.membersBulkDelete) }) } diff --git a/openapi.yaml b/openapi.yaml index 6b6d37de..2fa9e787 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -929,6 +929,27 @@ paths: schema: $ref: '#/components/schemas/MemberBulkUpdate' required: true + /api/members_bulk/delete: + post: + tags: + - members + summary: bulk delete members + operationId: membersBulkDelete + responses: + '204': + description: OK + '401': + $ref: '#/components/responses/Unauthorized' + '403': + $ref: '#/components/responses/Forbidden' + '404': + $ref: '#/components/responses/NotFound' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/MemberBulkDelete' + required: true components: securitySchemes: @@ -1186,6 +1207,13 @@ components: profile: $ref: '#/components/schemas/MemberProfile' + MemberBulkDelete: + properties: + ids: + type: array + items: + type: string + security: - BearerAuth: [] - CookieAuth: [] From d9bcde3331db1b709e7a88843f0297e8c4fa1d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 19 Nov 2023 15:31:18 +0100 Subject: [PATCH 866/876] sha256 hash password. (#60) --- internal/config/member.go | 6 ++++++ internal/member/file/provider.go | 21 +++++++++++++++------ internal/member/file/types.go | 1 + 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/internal/config/member.go b/internal/config/member.go index 634ea2bd..1cccde36 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -33,6 +33,11 @@ func (Member) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("member.file.hash", true, "member file provider: whether to hash passwords using sha256 (recommended)") + if err := viper.BindPFlag("member.file.hash", cmd.PersistentFlags().Lookup("member.file.hash")); err != nil { + return err + } + // object provider cmd.PersistentFlags().String("member.object.users", "[]", "member object provider: users in JSON format") if err := viper.BindPFlag("member.object.users", cmd.PersistentFlags().Lookup("member.object.users")); err != nil { @@ -68,6 +73,7 @@ func (s *Member) Set() { // file provider s.File.Path = viper.GetString("member.file.path") + s.File.Hash = viper.GetBool("member.file.hash") // object provider if err := viper.UnmarshalKey("member.object.users", &s.Object.Users, viper.DecodeHook( diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index 04acd191..ed5c1e71 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -1,6 +1,7 @@ package file import ( + "crypto/sha256" "encoding/json" "io" "os" @@ -18,6 +19,17 @@ type MemberProviderCtx struct { config Config } +func (provider *MemberProviderCtx) hash(password string) string { + // if hash is disabled, return password as plain text + if !provider.config.Hash { + return password + } + + sha256 := sha256.New() + sha256.Write([]byte(password)) + return string(sha256.Sum(nil)) +} + func (provider *MemberProviderCtx) Connect() error { return nil } @@ -35,8 +47,7 @@ func (provider *MemberProviderCtx) Authenticate(username string, password string return "", types.MemberProfile{}, err } - // TODO: Use hash function. - if entry.Password != password { + if entry.Password != provider.hash(password) { return "", types.MemberProfile{}, types.ErrMemberInvalidPassword } @@ -58,8 +69,7 @@ func (provider *MemberProviderCtx) Insert(username string, password string, prof } entries[id] = MemberEntry{ - // TODO: Use hash function. - Password: password, + Password: provider.hash(password), Profile: profile, } @@ -94,8 +104,7 @@ func (provider *MemberProviderCtx) UpdatePassword(id string, password string) er return types.ErrMemberDoesNotExist } - // TODO: Use hash function. - entry.Password = password + entry.Password = provider.hash(password) entries[id] = entry return provider.serialize(entries) diff --git a/internal/member/file/types.go b/internal/member/file/types.go index 739e0814..5dcb42df 100644 --- a/internal/member/file/types.go +++ b/internal/member/file/types.go @@ -11,4 +11,5 @@ type MemberEntry struct { type Config struct { Path string + Hash bool } From b40c0778c882a2c7cd2c7858ebfa3bba51ae9813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 24 Nov 2023 10:39:09 +0100 Subject: [PATCH 867/876] file chooser dialog diabled by default. --- internal/api/room/upload.go | 8 ++++++++ internal/config/desktop.go | 9 ++++++++- internal/desktop/filechooserdialog.go | 4 ++++ internal/desktop/manager.go | 8 ++++++-- internal/websocket/manager.go | 4 +++- pkg/types/desktop.go | 1 + pkg/xevent/xevent.go | 13 +++++++------ 7 files changed, 37 insertions(+), 10 deletions(-) diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 046c6d94..bc25ef3d 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -87,6 +87,10 @@ func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) error { } func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) error { + if !h.desktop.IsFileChooserDialogEnabled() { + return utils.HttpBadRequest("file chooser dialog is disabled") + } + err := r.ParseMultipartForm(maxUploadSize) if err != nil { return utils.HttpBadRequest("failed to parse multipart form").WithInternalErr(err) @@ -150,6 +154,10 @@ func (h *RoomHandler) uploadDialogPost(w http.ResponseWriter, r *http.Request) e } func (h *RoomHandler) uploadDialogClose(w http.ResponseWriter, r *http.Request) error { + if !h.desktop.IsFileChooserDialogEnabled() { + return utils.HttpBadRequest("file chooser dialog is disabled") + } + if !h.desktop.IsFileChooserDialogOpened() { return utils.HttpUnprocessableEntity("file chooser dialog is not open") } diff --git a/internal/config/desktop.go b/internal/config/desktop.go index a18d2c12..10bcec95 100644 --- a/internal/config/desktop.go +++ b/internal/config/desktop.go @@ -19,7 +19,8 @@ type Desktop struct { UseInputDriver bool InputSocket string - Unminimize bool + Unminimize bool + FileChooserDialog bool } func (Desktop) Init(cmd *cobra.Command) error { @@ -43,6 +44,11 @@ func (Desktop) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("desktop.file_chooser_dialog", false, "whether to handle file chooser dialog externally") + if err := viper.BindPFlag("desktop.file_chooser_dialog", cmd.PersistentFlags().Lookup("desktop.file_chooser_dialog")); err != nil { + return err + } + return nil } @@ -74,4 +80,5 @@ func (s *Desktop) Set() { s.UseInputDriver = viper.GetBool("desktop.input.enabled") s.InputSocket = viper.GetString("desktop.input.socket") s.Unminimize = viper.GetBool("desktop.unminimize") + s.FileChooserDialog = viper.GetBool("desktop.file_chooser_dialog") } diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index e5db4af6..32e9f7d5 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -84,6 +84,10 @@ func (manager *DesktopManagerCtx) CloseFileChooserDialog() { } } +func (manager *DesktopManagerCtx) IsFileChooserDialogEnabled() bool { + return manager.config.FileChooserDialog +} + func (manager *DesktopManagerCtx) IsFileChooserDialogOpened() bool { mu.Lock() defer mu.Unlock() diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 2f981618..dad4dd2d 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -71,11 +71,15 @@ func (manager *DesktopManagerCtx) Start() { manager.logger.Panic().Err(err).Msg("unable to connect to input driver") } + // set up event listeners xevent.Unminimize = manager.config.Unminimize + xevent.FileChooserDialog = manager.config.FileChooserDialog go xevent.EventLoop(manager.config.Display) - // In case it was opened - go manager.CloseFileChooserDialog() + // in case it was opened + if manager.config.FileChooserDialog { + go manager.CloseFileChooserDialog() + } manager.OnEventError(func(error_code uint8, message string, request_code uint8, minor_code uint8) { manager.logger.Warn(). diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 03da86b2..9443aa6a 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -167,7 +167,9 @@ func (manager *WebSocketManagerCtx) Start() { }) }) - manager.fileChooserDialogEvents() + if manager.desktop.IsFileChooserDialogEnabled() { + manager.fileChooserDialogEvents() + } if manager.sessions.Settings().InactiveCursors { manager.startInactiveCursors() diff --git a/pkg/types/desktop.go b/pkg/types/desktop.go index 73f37d39..bd38da0e 100644 --- a/pkg/types/desktop.go +++ b/pkg/types/desktop.go @@ -98,5 +98,6 @@ type DesktopManager interface { // filechooser HandleFileChooserDialog(uri string) error CloseFileChooserDialog() + IsFileChooserDialogEnabled() bool IsFileChooserDialogOpened() bool } diff --git a/pkg/xevent/xevent.go b/pkg/xevent/xevent.go index 91e449e4..53b820e9 100644 --- a/pkg/xevent/xevent.go +++ b/pkg/xevent/xevent.go @@ -16,7 +16,8 @@ import ( var Emmiter events.EventEmmiter var Unminimize bool = false -var file_chooser_dialog_window uint32 = 0 +var FileChooserDialog bool = false +var fileChooserDialogWindow uint32 = 0 func init() { Emmiter = events.New() @@ -41,7 +42,7 @@ func goXEventClipboardUpdated() { //export goXEventConfigureNotify func goXEventConfigureNotify(display *C.Display, window C.Window, name *C.char, role *C.char) { - if C.GoString(role) != "GtkFileChooserDialog" { + if C.GoString(role) != "GtkFileChooserDialog" || !FileChooserDialog { return } @@ -53,19 +54,19 @@ func goXEventConfigureNotify(display *C.Display, window C.Window, name *C.char, C.XFileChooserHide(display, window) - if file_chooser_dialog_window == 0 { - file_chooser_dialog_window = uint32(window) + if fileChooserDialogWindow == 0 { + fileChooserDialogWindow = uint32(window) Emmiter.Emit("file-chooser-dialog-opened") } } //export goXEventUnmapNotify func goXEventUnmapNotify(window C.Window) { - if uint32(window) != file_chooser_dialog_window { + if uint32(window) != fileChooserDialogWindow || !FileChooserDialog { return } - file_chooser_dialog_window = 0 + fileChooserDialogWindow = 0 Emmiter.Emit("file-chooser-dialog-closed") } From 3dbcc417957dc3dfaf610d9e49b949336729aed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 24 Nov 2023 10:44:24 +0100 Subject: [PATCH 868/876] upload drop to config. --- internal/api/room/upload.go | 4 ++++ internal/config/desktop.go | 7 +++++++ internal/desktop/drop.go | 4 ++++ pkg/types/desktop.go | 1 + 4 files changed, 16 insertions(+) diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index bc25ef3d..f2fadd29 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -16,6 +16,10 @@ import ( const maxUploadSize = 32 << 20 func (h *RoomHandler) uploadDrop(w http.ResponseWriter, r *http.Request) error { + if !h.desktop.IsUploadDropEnabled() { + return utils.HttpBadRequest("upload drop is disabled") + } + err := r.ParseMultipartForm(maxUploadSize) if err != nil { return utils.HttpBadRequest("failed to parse multipart form").WithInternalErr(err) diff --git a/internal/config/desktop.go b/internal/config/desktop.go index 10bcec95..a021ddfc 100644 --- a/internal/config/desktop.go +++ b/internal/config/desktop.go @@ -20,6 +20,7 @@ type Desktop struct { InputSocket string Unminimize bool + UploadDrop bool FileChooserDialog bool } @@ -44,6 +45,11 @@ func (Desktop) Init(cmd *cobra.Command) error { return err } + cmd.PersistentFlags().Bool("desktop.upload_drop", true, "whether drop upload is enabled") + if err := viper.BindPFlag("desktop.upload_drop", cmd.PersistentFlags().Lookup("desktop.upload_drop")); err != nil { + return err + } + cmd.PersistentFlags().Bool("desktop.file_chooser_dialog", false, "whether to handle file chooser dialog externally") if err := viper.BindPFlag("desktop.file_chooser_dialog", cmd.PersistentFlags().Lookup("desktop.file_chooser_dialog")); err != nil { return err @@ -80,5 +86,6 @@ func (s *Desktop) Set() { s.UseInputDriver = viper.GetBool("desktop.input.enabled") s.InputSocket = viper.GetString("desktop.input.socket") s.Unminimize = viper.GetBool("desktop.unminimize") + s.UploadDrop = viper.GetBool("desktop.upload_drop") s.FileChooserDialog = viper.GetBool("desktop.file_chooser_dialog") } diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index 3cb13bcf..cee81a6b 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -62,3 +62,7 @@ func (manager *DesktopManagerCtx) DropFiles(x int, y int, files []string) bool { return false } } + +func (manager *DesktopManagerCtx) IsUploadDropEnabled() bool { + return manager.config.UploadDrop +} diff --git a/pkg/types/desktop.go b/pkg/types/desktop.go index bd38da0e..b7699096 100644 --- a/pkg/types/desktop.go +++ b/pkg/types/desktop.go @@ -94,6 +94,7 @@ type DesktopManager interface { // drop DropFiles(x int, y int, files []string) bool + IsUploadDropEnabled() bool // filechooser HandleFileChooserDialog(uri string) error From 014c8fa586b674d1ce31e588f7fbefa26fbe6e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 26 Jan 2024 18:47:40 +0100 Subject: [PATCH 869/876] Bullseye alongside Bookworm (#61) * revert to bullseye. * add bookworm. * add bookworm to variants. * include xf86-video-dummy because the remote git instance is offline. * fix configure. --- .devcontainer/Dockerfile | 6 +- .github/workflows/build_variants.yml | 7 +- Dockerfile | 36 +- Dockerfile.bookworm | 172 + Dockerfile.nvidia | 37 +- Dockerfile.nvidia.bookworm | 325 + runtime/dbus | 11 + runtime/supervisord.dbus.conf | 9 + xorg/xf86-input-neko/Dockerfile | 2 +- ...ndr.patch => 01_v0.3.8_xdummy-randr.patch} | 0 xorg/xf86-video-dummy/README.md | 2 + xorg/xf86-video-dummy/v0.3.8/COPYING | 2 + xorg/xf86-video-dummy/v0.3.8/ChangeLog | 809 + xorg/xf86-video-dummy/v0.3.8/Makefile.am | 29 + xorg/xf86-video-dummy/v0.3.8/Makefile.in | 865 + xorg/xf86-video-dummy/v0.3.8/README | 20 + xorg/xf86-video-dummy/v0.3.8/aclocal.m4 | 12431 +++++++++ xorg/xf86-video-dummy/v0.3.8/compile | 347 + xorg/xf86-video-dummy/v0.3.8/config.guess | 1558 ++ xorg/xf86-video-dummy/v0.3.8/config.h.in | 75 + xorg/xf86-video-dummy/v0.3.8/config.sub | 1791 ++ xorg/xf86-video-dummy/v0.3.8/configure | 20923 ++++++++++++++++ xorg/xf86-video-dummy/v0.3.8/configure.ac | 81 + xorg/xf86-video-dummy/v0.3.8/depcomp | 791 + xorg/xf86-video-dummy/v0.3.8/install-sh | 527 + xorg/xf86-video-dummy/v0.3.8/ltmain.sh | 11156 ++++++++ xorg/xf86-video-dummy/v0.3.8/missing | 215 + xorg/xf86-video-dummy/v0.3.8/src/Makefile.am | 44 + xorg/xf86-video-dummy/v0.3.8/src/Makefile.in | 707 + xorg/xf86-video-dummy/v0.3.8/src/compat-api.h | 101 + xorg/xf86-video-dummy/v0.3.8/src/dummy.h | 79 + .../v0.3.8/src/dummy_cursor.c | 104 + xorg/xf86-video-dummy/v0.3.8/src/dummy_dga.c | 175 + .../v0.3.8/src/dummy_driver.c | 761 + 34 files changed, 54168 insertions(+), 30 deletions(-) create mode 100644 Dockerfile.bookworm create mode 100644 Dockerfile.nvidia.bookworm create mode 100755 runtime/dbus create mode 100644 runtime/supervisord.dbus.conf rename xorg/xf86-video-dummy/{xdummy-randr.patch => 01_v0.3.8_xdummy-randr.patch} (100%) create mode 100644 xorg/xf86-video-dummy/README.md create mode 100644 xorg/xf86-video-dummy/v0.3.8/COPYING create mode 100644 xorg/xf86-video-dummy/v0.3.8/ChangeLog create mode 100644 xorg/xf86-video-dummy/v0.3.8/Makefile.am create mode 100644 xorg/xf86-video-dummy/v0.3.8/Makefile.in create mode 100644 xorg/xf86-video-dummy/v0.3.8/README create mode 100644 xorg/xf86-video-dummy/v0.3.8/aclocal.m4 create mode 100755 xorg/xf86-video-dummy/v0.3.8/compile create mode 100755 xorg/xf86-video-dummy/v0.3.8/config.guess create mode 100644 xorg/xf86-video-dummy/v0.3.8/config.h.in create mode 100755 xorg/xf86-video-dummy/v0.3.8/config.sub create mode 100755 xorg/xf86-video-dummy/v0.3.8/configure create mode 100644 xorg/xf86-video-dummy/v0.3.8/configure.ac create mode 100755 xorg/xf86-video-dummy/v0.3.8/depcomp create mode 100755 xorg/xf86-video-dummy/v0.3.8/install-sh create mode 100644 xorg/xf86-video-dummy/v0.3.8/ltmain.sh create mode 100755 xorg/xf86-video-dummy/v0.3.8/missing create mode 100644 xorg/xf86-video-dummy/v0.3.8/src/Makefile.am create mode 100644 xorg/xf86-video-dummy/v0.3.8/src/Makefile.in create mode 100644 xorg/xf86-video-dummy/v0.3.8/src/compat-api.h create mode 100644 xorg/xf86-video-dummy/v0.3.8/src/dummy.h create mode 100644 xorg/xf86-video-dummy/v0.3.8/src/dummy_cursor.c create mode 100644 xorg/xf86-video-dummy/v0.3.8/src/dummy_dga.c create mode 100644 xorg/xf86-video-dummy/v0.3.8/src/dummy_driver.c diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d69c04b5..7bb676fc 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -58,7 +58,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ wget ca-certificates supervisor \ - pulseaudio xserver-xorg-video-dummy \ + pulseaudio dbus-x11 xserver-xorg-video-dummy \ libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ # # needed for profile upload preStop hook @@ -122,6 +122,7 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/ COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so # copy runtime files +COPY runtime/dbus /usr/bin/dbus COPY runtime/default.pa /etc/pulse/default.pa COPY runtime/supervisord.conf /etc/neko/supervisord.conf COPY runtime/xorg.conf /etc/neko/xorg.conf @@ -132,7 +133,8 @@ COPY dev/runtime/config.yml /etc/neko/neko.yml COPY dev/runtime/supervisord.conf /etc/neko/supervisord/dev.conf # customized scripts -RUN echo '#!/bin/sh\nsleep infinity' > /usr/bin/neko; \ +RUN chmod +x /usr/bin/dbus;\ + echo '#!/bin/sh\nsleep infinity' > /usr/bin/neko; \ chmod +x /usr/bin/neko; \ echo '#!/bin/sh\nsudo sh -c "export USER='$USERNAME'\nexport HOME=/home/'$USERNAME'\n/usr/bin/supervisord -c /etc/neko/supervisord.conf"' > /usr/bin/deps; \ chmod +x /usr/bin/deps; \ diff --git a/.github/workflows/build_variants.yml b/.github/workflows/build_variants.yml index bd53c524..e104e164 100644 --- a/.github/workflows/build_variants.yml +++ b/.github/workflows/build_variants.yml @@ -19,7 +19,12 @@ jobs: strategy: matrix: include: + - variant: bookworm + dockerfile: Dockerfile.bookworm - variant: nvidia + dockerfile: Dockerfile.nvidia + - variant: nvidia_bookworm + dockerfile: Dockerfile.nvidia.bookworm steps: - name: Checkout repository @@ -42,7 +47,7 @@ jobs: uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: context: . - file: Dockerfile.${{ matrix.variant }} + file: ${{ matrix.dockerfile }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index d1f0d0ff..438b24fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,10 @@ +ARG BASE_IMAGE=debian:bullseye-slim +ARG BUILD_IMAGE=golang:1.21-bullseye + # # Stage 0: Build xorg dependencies. # -FROM debian:bookworm-slim as xorg-deps +FROM $BASE_IMAGE as xorg-deps ENV DEBIAN_FRONTEND=noninteractive @@ -15,13 +18,12 @@ WORKDIR /xorg COPY xorg/ /xorg/ -# build xserver-xorg-video-dummy 0.3.8-2 with RandR support. +# build xf86-video-dummy v0.3.8 with RandR support RUN set -eux; \ - cd xf86-video-dummy; \ - git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ - cd xserver-xorg-video-dummy; \ - patch -p1 < ../xdummy-randr.patch; \ - ./autogen.sh; \ + cd xf86-video-dummy/v0.3.8; \ + patch -p1 < ../01_v0.3.8_xdummy-randr.patch; \ + autoreconf -v --install; \ + ./configure; \ make -j$(nproc); \ make install; @@ -36,7 +38,7 @@ RUN set -eux; \ # # Stage 1: Build. # -FROM golang:1.21-bookworm as build +FROM $BUILD_IMAGE as build WORKDIR /src # @@ -45,8 +47,12 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev libxcvt-dev \ + libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ + # install libxcvt-dev (not available in debian:bullseye) + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt-dev_0.1.2-1_amd64.deb; \ + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ + apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb ./libxcvt-dev_0.1.2-1_amd64.deb; \ # # clean up apt-get clean -y; \ @@ -64,7 +70,7 @@ RUN ./build # # Stage 2: Runtime. # -FROM debian:bookworm-slim as runtime +FROM $BASE_IMAGE as runtime # # set custom user @@ -79,8 +85,8 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ wget ca-certificates supervisor \ - pulseaudio xserver-xorg-video-dummy \ - libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libxcvt0 \ + pulseaudio dbus-x11 xserver-xorg-video-dummy \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ # # needed for profile upload preStop hook zip curl \ @@ -92,6 +98,10 @@ RUN set -eux; \ gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ gstreamer1.0-pulseaudio; \ + # install libxcvt0 (not available in debian:bullseye) + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ + apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb; \ + rm ./libxcvt0_0.1.2-1_amd64.deb; \ # # create a non-root user groupadd --gid $USER_GID $USERNAME; \ @@ -133,8 +143,10 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xor # # copy runtime configs COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources +COPY runtime/dbus /usr/bin/dbus COPY runtime/default.pa /etc/pulse/default.pa COPY runtime/supervisord.conf /etc/neko/supervisord.conf +COPY runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf COPY runtime/xorg.conf /etc/neko/xorg.conf # diff --git a/Dockerfile.bookworm b/Dockerfile.bookworm new file mode 100644 index 00000000..f7c393ff --- /dev/null +++ b/Dockerfile.bookworm @@ -0,0 +1,172 @@ +ARG BASE_IMAGE=debian:bookworm-slim +ARG BUILD_IMAGE=golang:1.21-bookworm + +# +# Stage 0: Build xorg dependencies. +# +FROM $BASE_IMAGE as xorg-deps + +ENV DEBIAN_FRONTEND=noninteractive + +RUN set -eux; \ + apt-get update; \ + apt-get install -y \ + git gcc pkgconf autoconf automake libtool make xorg-dev xutils-dev \ + && rm -rf /var/lib/apt/lists/*; + +WORKDIR /xorg + +COPY xorg/ /xorg/ + +# build xf86-video-dummy v0.3.8 with RandR support +RUN set -eux; \ + cd xf86-video-dummy/v0.3.8; \ + patch -p1 < ../01_v0.3.8_xdummy-randr.patch; \ + autoreconf -v --install; \ + ./configure; \ + make -j$(nproc); \ + make install; + +# build custom input driver +RUN set -eux; \ + cd xf86-input-neko; \ + ./autogen.sh --prefix=/usr; \ + ./configure; \ + make -j$(nproc); \ + make install; + +# +# Stage 1: Build. +# +FROM $BUILD_IMAGE as build +WORKDIR /src + +# +# install dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev libxcvt-dev \ + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +ARG GIT_COMMIT +ARG GIT_BRANCH +ARG GIT_TAG + +# +# build server +COPY . . +RUN ./build + +# +# Stage 2: Runtime. +# +FROM $BASE_IMAGE as runtime + +# +# set custom user +ARG USERNAME=neko +ARG USER_UID=1000 +ARG USER_GID=$USER_UID + +# +# install dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + wget ca-certificates supervisor \ + pulseaudio xserver-xorg-video-dummy \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libxcvt0 \ + # + # needed for profile upload preStop hook + zip curl \ + # + # file chooser handler, clipboard, drop + xdotool xclip libgtk-3-0 \ + # + # gst + gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ + gstreamer1.0-pulseaudio; \ + # + # create a non-root user + groupadd --gid $USER_GID $USERNAME; \ + useradd --uid $USER_UID --gid $USERNAME --shell /bin/bash --create-home $USERNAME; \ + adduser $USERNAME audio; \ + adduser $USERNAME video; \ + adduser $USERNAME pulse; \ + # + # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 + mkdir /tmp/.X11-unix; \ + chmod 1777 /tmp/.X11-unix; \ + chown $USERNAME /tmp/.X11-unix/; \ + # + # make directories for neko + mkdir -p /etc/neko /var/www; \ + chown -R $USERNAME:$USERNAME /home/$USERNAME; \ + # + # install fonts + apt-get install -y --no-install-recommends \ + # Emojis + fonts-noto-color-emoji \ + # Chinese fonts + fonts-arphic-ukai fonts-arphic-uming \ + # Japanese fonts + fonts-ipafont-mincho fonts-ipafont-gothic \ + # Korean fonts + fonts-unfonts-core \ + # Indian fonts + fonts-indic; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# copy dependencies from previous stage +COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so +COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so + +# +# copy runtime configs +COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources +COPY runtime/default.pa /etc/pulse/default.pa +COPY runtime/supervisord.conf /etc/neko/supervisord.conf +COPY runtime/xorg.conf /etc/neko/xorg.conf + +# +# copy runtime folders +COPY --chown=neko:neko runtime/icon-theme /home/$USERNAME/.icons/default +COPY runtime/fontconfig/* /etc/fonts/conf.d/ +COPY runtime/fonts /usr/local/share/fonts + +# +# set default envs +ENV USER=$USERNAME +ENV DISPLAY=:99.0 +ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket +ENV NEKO_SERVER_BIND=:8080 +ENV NEKO_PLUGINS_ENABLED=true +ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/ + +# +# copy plugins from previous stage +COPY --from=build /src/bin/plugins/ $NEKO_PLUGINS_DIR + +# +# copy executable from previous stage +COPY --from=build /src/bin/neko /usr/bin/neko + +# +# add healthcheck +HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ + CMD wget -O - http://localhost:${NEKO_SERVER_BIND#*:}/health || exit 1 + +# +# run neko +CMD ["/usr/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"] diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index 947e4ed5..46072763 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -1,7 +1,7 @@ -ARG UBUNTU_RELEASE=22.04 -ARG CUDA_VERSION=12.2.0 +ARG UBUNTU_RELEASE=20.04 +ARG CUDA_VERSION=11.4.3 ARG VIRTUALGL_VERSION=3.1 -ARG GSTREAMER_VERSION=1.22 +ARG GSTREAMER_VERSION=1.20 # # Stage 0: Build gstreamer with nvidia plugins. @@ -56,7 +56,7 @@ RUN set -eux; \ # # Stage 0: Build xorg dependencies. # -FROM debian:bookworm-slim as xorg-deps +FROM debian:bullseye-slim as xorg-deps ENV DEBIAN_FRONTEND=noninteractive @@ -70,13 +70,12 @@ WORKDIR /xorg COPY xorg/ /xorg/ -# build xserver-xorg-video-dummy 0.3.8-2 with RandR support. +# build xf86-video-dummy v0.3.8 with RandR support RUN set -eux; \ - cd xf86-video-dummy; \ - git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \ - cd xserver-xorg-video-dummy; \ - patch -p1 < ../xdummy-randr.patch; \ - ./autogen.sh; \ + cd xf86-video-dummy/v0.3.8; \ + patch -p1 < ../01_v0.3.8_xdummy-randr.patch; \ + autoreconf -v --install; \ + ./configure; \ make -j$(nproc); \ make install; @@ -91,7 +90,7 @@ RUN set -eux; \ # # Stage 1: Build. # -FROM golang:1.21-bookworm as build +FROM golang:1.21-bullseye as build WORKDIR /src # @@ -100,8 +99,12 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev libxcvt-dev \ + libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ + # install libxcvt-dev (not available in debian:bullseye) + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt-dev_0.1.2-1_amd64.deb; \ + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ + apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb ./libxcvt-dev_0.1.2-1_amd64.deb; \ # # clean up apt-get clean -y; \ @@ -189,8 +192,8 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ wget ca-certificates supervisor \ - pulseaudio xserver-xorg-video-dummy \ - libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libx264-163 libvo-aacenc0 librtmp1 libxcvt0 \ + pulseaudio dbus-x11 xserver-xorg-video-dummy \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 libx264-155 libvo-aacenc0 librtmp1 libxcvt0 \ libgtk-3-bin software-properties-common cabextract aptitude vim curl \ # # needed for profile upload preStop hook @@ -198,6 +201,10 @@ RUN set -eux; \ # # file chooser handler, clipboard, drop xdotool xclip libgtk-3-0; \ + # install libxcvt0 (not available in debian:bullseye) + wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \ + apt-get install --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb; \ + rm ./libxcvt0_0.1.2-1_amd64.deb; \ # # create a non-root user groupadd --gid $USER_GID $USERNAME; \ @@ -279,8 +286,10 @@ RUN set -eux; \ # # copy runtime configs COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources +COPY runtime/dbus /usr/bin/dbus COPY runtime/default.pa /etc/pulse/default.pa COPY runtime/supervisord.conf /etc/neko/supervisord.conf +COPY runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf COPY runtime/xorg.conf /etc/neko/xorg.conf # diff --git a/Dockerfile.nvidia.bookworm b/Dockerfile.nvidia.bookworm new file mode 100644 index 00000000..a2932aea --- /dev/null +++ b/Dockerfile.nvidia.bookworm @@ -0,0 +1,325 @@ +ARG UBUNTU_RELEASE=22.04 +ARG CUDA_VERSION=12.2.0 +ARG VIRTUALGL_VERSION=3.1 +ARG GSTREAMER_VERSION=1.22 + +# +# Stage 0: Build gstreamer with nvidia plugins. +# +FROM ubuntu:${UBUNTU_RELEASE} AS gstreamer +ARG GSTREAMER_VERSION + +# +# install dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + # Install essentials + curl build-essential ca-certificates git \ + # Install pip and ninja + python3-pip python-gi-dev ninja-build \ + # Install build deps + autopoint autoconf automake autotools-dev libtool gettext bison flex gtk-doc-tools \ + # Install libraries + librtmp-dev \ + libvo-aacenc-dev \ + libtool-bin \ + libgtk2.0-dev \ + libgl1-mesa-dev \ + libopus-dev \ + libpulse-dev \ + libssl-dev \ + libx264-dev \ + libvpx-dev; \ + # Install meson + pip3 install meson; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# build gstreamer +RUN set -eux; \ + git clone --depth 1 --branch $GSTREAMER_VERSION https://gitlab.freedesktop.org/gstreamer/gstreamer.git /gstreamer/src; \ + cd /gstreamer/src; \ + mkdir -p /usr/share/gstreamer; \ + meson --prefix /usr/share/gstreamer \ + -Dgpl=enabled \ + -Dugly=enabled \ + -Dgst-plugins-ugly:x264=enabled \ + build; \ + ninja -C build; \ + meson install -C build; + +# +# Stage 0: Build xorg dependencies. +# +FROM debian:bookworm-slim as xorg-deps + +ENV DEBIAN_FRONTEND=noninteractive + +RUN set -eux; \ + apt-get update; \ + apt-get install -y \ + git gcc pkgconf autoconf automake libtool make xorg-dev xutils-dev \ + && rm -rf /var/lib/apt/lists/*; + +WORKDIR /xorg + +COPY xorg/ /xorg/ + +# build xf86-video-dummy v0.3.8 with RandR support +RUN set -eux; \ + cd xf86-video-dummy/v0.3.8; \ + patch -p1 < ../01_v0.3.8_xdummy-randr.patch; \ + autoreconf -v --install; \ + ./configure; \ + make -j$(nproc); \ + make install; + +# build custom input driver +RUN set -eux; \ + cd xf86-input-neko; \ + ./autogen.sh --prefix=/usr; \ + ./configure; \ + make -j$(nproc); \ + make install; + +# +# Stage 1: Build. +# +FROM golang:1.21-bookworm as build +WORKDIR /src + +# +# install dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev libxcvt-dev \ + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +ARG GIT_COMMIT +ARG GIT_BRANCH +ARG GIT_TAG + +# +# build server +COPY . . +RUN ./build + +# +# Stage 2: Runtime. +# +FROM nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_RELEASE} as runtime +ARG UBUNTU_RELEASE +ARG VIRTUALGL_VERSION + +# Make all NVIDIA GPUs visible by default +ENV NVIDIA_VISIBLE_DEVICES all +# All NVIDIA driver capabilities should preferably be used, check `NVIDIA_DRIVER_CAPABILITIES` inside the container if things do not work +ENV NVIDIA_DRIVER_CAPABILITIES all + +# +# set vgl-display to headless 3d gpu card/// correct values are egl[n] or /dev/dri/card0:if this is passed into container +ENV VGL_DISPLAY egl + +# +# set custom user +ARG USERNAME=neko +ARG USER_UID=1000 +ARG USER_GID=$USER_UID + +# +# install hardware accleration dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + dpkg --add-architecture i386; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + # opengl base: https://gitlab.com/nvidia/container-images/opengl/-/blob/ubuntu20.04/base/Dockerfile + libxau6 libxau6:i386 \ + libxdmcp6 libxdmcp6:i386 \ + libxcb1 libxcb1:i386 \ + libxext6 libxext6:i386 \ + libx11-6 libx11-6:i386 \ + # opengl runtime: https://gitlab.com/nvidia/container-images/opengl/-/blob/ubuntu20.04/glvnd/runtime/Dockerfile + libglvnd0 libglvnd0:i386 \ + libgl1 libgl1:i386 \ + libglx0 libglx0:i386 \ + libegl1 libegl1:i386 \ + libgles2 libgles2:i386 \ + # hardware accleration utilities + libglu1 libglu1:i386 \ + libvulkan-dev libvulkan-dev:i386 \ + mesa-utils mesa-utils-extra \ + mesa-va-drivers mesa-vulkan-drivers \ + vainfo vdpauinfo; \ + # + # install vulkan-utils or vulkan-tools depending on ubuntu release + if [ "${UBUNTU_RELEASE}" = "18.04" ]; then \ + apt-get install -y --no-install-recommends vulkan-utils; \ + else \ + apt-get install -y --no-install-recommends vulkan-tools; \ + fi; \ + # + # create symlink for libnvrtc.so (needed for cudaconvert) + find /usr/local/cuda/lib64/ -maxdepth 1 -type l -name "*libnvrtc.so.*" -exec sh -c 'ln -sf {} /usr/local/cuda/lib64/libnvrtc.so' \;; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# add cuda to ld path, for gstreamer cuda plugins +ENV LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu:/usr/lib/i386-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}:/usr/local/cuda/lib:/usr/local/cuda/lib64" + +# +# install dependencies +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + wget ca-certificates supervisor \ + pulseaudio xserver-xorg-video-dummy \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libx264-163 libvo-aacenc0 librtmp1 libxcvt0 \ + libgtk-3-bin software-properties-common cabextract aptitude vim curl \ + # + # needed for profile upload preStop hook + zip curl \ + # + # file chooser handler, clipboard, drop + xdotool xclip libgtk-3-0; \ + # + # create a non-root user + groupadd --gid $USER_GID $USERNAME; \ + useradd --uid $USER_UID --gid $USERNAME --shell /bin/bash --create-home $USERNAME; \ + adduser $USERNAME audio; \ + adduser $USERNAME video; \ + adduser $USERNAME pulse; \ + # + # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 + mkdir /tmp/.X11-unix; \ + chmod 1777 /tmp/.X11-unix; \ + chown $USERNAME /tmp/.X11-unix/; \ + # + # make directories for neko + mkdir -p /etc/neko /var/www; \ + chown -R $USERNAME:$USERNAME /home/$USERNAME; \ + # + # install fonts + apt-get install -y --no-install-recommends \ + # Emojis + fonts-noto-color-emoji \ + # Chinese fonts + fonts-arphic-ukai fonts-arphic-uming \ + # Japanese fonts + fonts-ipafont-mincho fonts-ipafont-gothic \ + # Korean fonts + fonts-unfonts-core \ + # Indian fonts + fonts-indic; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# copy dependencies from previous stage +COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so +COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so + +# +# configure EGL and Vulkan manually +RUN VULKAN_API_VERSION=$(dpkg -s libvulkan1 | grep -oP 'Version: [0-9|\.]+' | grep -oP '[0-9]+(\.[0-9]+)(\.[0-9]+)') && \ + # Configure EGL manually + mkdir -p /usr/share/glvnd/egl_vendor.d/ && \ + echo "{\n\ + \"file_format_version\" : \"1.0.0\",\n\ + \"ICD\": {\n\ + \"library_path\": \"libEGL_nvidia.so.0\"\n\ + }\n\ +}" > /usr/share/glvnd/egl_vendor.d/10_nvidia.json && \ + # Configure Vulkan manually + mkdir -p /etc/vulkan/icd.d/ && \ + echo "{\n\ + \"file_format_version\" : \"1.0.0\",\n\ + \"ICD\": {\n\ + \"library_path\": \"libGLX_nvidia.so.0\",\n\ + \"api_version\" : \"${VULKAN_API_VERSION}\"\n\ + }\n\ +}" > /etc/vulkan/icd.d/nvidia_icd.json + +# +# install VirtualGL and make libraries available for preload +RUN set -eux; \ + apt-get update; \ + wget "https://sourceforge.net/projects/virtualgl/files/virtualgl_${VIRTUALGL_VERSION}_amd64.deb"; \ + wget "https://sourceforge.net/projects/virtualgl/files/virtualgl32_${VIRTUALGL_VERSION}_amd64.deb"; \ + apt-get install -y --no-install-recommends ./virtualgl_${VIRTUALGL_VERSION}_amd64.deb ./virtualgl32_${VIRTUALGL_VERSION}_amd64.deb; \ + rm -f "virtualgl_${VIRTUALGL_VERSION}_amd64.deb" "virtualgl32_${VIRTUALGL_VERSION}_amd64.deb"; \ + chmod u+s /usr/lib/libvglfaker.so; \ + chmod u+s /usr/lib/libdlfaker.so; \ + chmod u+s /usr/lib32/libvglfaker.so; \ + chmod u+s /usr/lib32/libdlfaker.so; \ + chmod u+s /usr/lib/i386-linux-gnu/libvglfaker.so; \ + chmod u+s /usr/lib/i386-linux-gnu/libdlfaker.so; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/*; + +# +# copy runtime configs +COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources +COPY runtime/default.pa /etc/pulse/default.pa +COPY runtime/supervisord.conf /etc/neko/supervisord.conf +COPY runtime/xorg.conf /etc/neko/xorg.conf + +# +# copy runtime folders +COPY --chown=neko:neko runtime/icon-theme /home/$USERNAME/.icons/default +COPY runtime/fontconfig/* /etc/fonts/conf.d/ +COPY runtime/fonts /usr/local/share/fonts + +# +# set default envs +ENV USER=$USERNAME +ENV DISPLAY=:99.0 +ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket +ENV NEKO_SERVER_BIND=:8080 +ENV NEKO_PLUGINS_ENABLED=true +ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/ + +# +# set gstreamer envs +ENV PATH="/usr/share/gstreamer/bin:${PATH}" +ENV LD_LIBRARY_PATH="/usr/share/gstreamer/lib/x86_64-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" +ENV PKG_CONFIG_PATH="/usr/share/gstreamer/lib/x86_64-linux-gnu/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}" + +# +# copy gstreamer from previous stage +COPY --from=gstreamer /usr/share/gstreamer /usr/share/gstreamer + +# +# copy plugins from previous stage +COPY --from=build /src/bin/plugins/ $NEKO_PLUGINS_DIR + +# +# copy executable from previous stage +COPY --from=build /src/bin/neko /usr/bin/neko + +# +# add healthcheck +HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ + CMD wget -O - http://localhost:${NEKO_SERVER_BIND#*:}/health || exit 1 + +# +# run neko +CMD ["/usr/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"] diff --git a/runtime/dbus b/runtime/dbus new file mode 100755 index 00000000..bf0d4375 --- /dev/null +++ b/runtime/dbus @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ ! -d /var/run/dbus ]; then + mkdir -p /var/run/dbus +fi + +if [ -f /var/run/dbus/pid ]; then + rm -f /var/run/dbus/pid +fi + +/usr/bin/dbus-daemon --nofork --print-pid --config-file=/usr/share/dbus-1/system.conf diff --git a/runtime/supervisord.dbus.conf b/runtime/supervisord.dbus.conf new file mode 100644 index 00000000..4a03f43c --- /dev/null +++ b/runtime/supervisord.dbus.conf @@ -0,0 +1,9 @@ +[program:dbus] +environment=HOME="/root",USER="root" +command=/usr/bin/dbus +autorestart=true +priority=100 +user=root +stdout_logfile=/dev/stderr +stdout_logfile_maxbytes=0 +redirect_stderr=true diff --git a/xorg/xf86-input-neko/Dockerfile b/xorg/xf86-input-neko/Dockerfile index ae6b332a..4eb666e0 100644 --- a/xorg/xf86-input-neko/Dockerfile +++ b/xorg/xf86-input-neko/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:bullseye-slim ENV DEBIAN_FRONTEND=noninteractive diff --git a/xorg/xf86-video-dummy/xdummy-randr.patch b/xorg/xf86-video-dummy/01_v0.3.8_xdummy-randr.patch similarity index 100% rename from xorg/xf86-video-dummy/xdummy-randr.patch rename to xorg/xf86-video-dummy/01_v0.3.8_xdummy-randr.patch diff --git a/xorg/xf86-video-dummy/README.md b/xorg/xf86-video-dummy/README.md new file mode 100644 index 00000000..43488ce5 --- /dev/null +++ b/xorg/xf86-video-dummy/README.md @@ -0,0 +1,2 @@ +From: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy +Branch: xserver-xorg-video-dummy-1_0.3.8-2 diff --git a/xorg/xf86-video-dummy/v0.3.8/COPYING b/xorg/xf86-video-dummy/v0.3.8/COPYING new file mode 100644 index 00000000..3c1ef481 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/COPYING @@ -0,0 +1,2 @@ +Copyright 2002, SuSE Linux AG, Author: Egbert Eich + diff --git a/xorg/xf86-video-dummy/v0.3.8/ChangeLog b/xorg/xf86-video-dummy/v0.3.8/ChangeLog new file mode 100644 index 00000000..9bd1791b --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/ChangeLog @@ -0,0 +1,809 @@ +commit 4a6df6b4eecae769771eba0136bf8271d01258fb +Author: Julien Cristau +Date: Wed Dec 14 21:57:18 2016 +0100 + + xf86-video-dummy 0.3.8 + + Signed-off-by: Julien Cristau + +commit 52a6346c63c20c79f54c34e2950ccc5f1d2fb138 +Author: Julien Cristau +Date: Wed Dec 14 21:59:29 2016 +0100 + + configure: require xorg-server 1.4.99.901 + + dixChangeWindowProperty was introduced in that release. + + Signed-off-by: Julien Cristau + +commit e434975017eb90fa702653592ae590bc22aa483c +Author: Aaron Plattner +Date: Thu Sep 22 09:14:26 2016 -0700 + + Remove pointless empty functions + + These functions might be useful in a real driver, but with no + hardware, they're pointless. Get rid of them. + + v2: Rebase, get rid of pointless calls to DUMMYAdjustFrame, return TRUE from + DUMMYSwitchMode. + + Signed-off-by: Aaron Plattner + Reviewed-by: Antoine Martin + Tested-by: Antoine Martin + +commit 367c778240b4266958f33cec3653d5389e283557 +Author: Antoine Martin +Date: Tue Sep 20 13:34:40 2016 +0700 + + remove dead code in dummy driver + + Signed-off-by: Antoine Martin + Reviewed-by: Eric Engestrom + Reviewed-by: Aaron Plattner + Signed-off-by: Aaron Plattner + +commit 8706f60ab457867c120dd44e812b8fadc2be7179 +Author: Peter Hutterer +Date: Thu Jan 14 10:30:40 2016 +1000 + + Switch to using dixChangeWindowProperty + + eb36924ead40564325aa56d54a973dc8fb4eae83 removed ChangeWindowProperty from the + server. + + Signed-off-by: Peter Hutterer + Reviewed-by: Jon Turney + +commit 29433844c8b8989ea2ac64bd92b3ad61b6f9cf10 +Author: Antoine Martin +Date: Thu Sep 17 10:55:25 2015 -0400 + + Honor DacSpeed setting in xorg.conf + + Reviewed-by: Adam Jackson + Signed-off-by: Antoine Martin + +commit 0e339b256a858bfd832c92e3c14619023dea826c +Author: Alan Coopersmith +Date: Sat May 31 21:39:32 2014 -0700 + + autogen.sh: Honor NOCONFIGURE=1 + + See http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Alan Coopersmith + +commit 85402253d0f9ca464d54336e48e9a7ac91fc39bb +Author: Alan Coopersmith +Date: Sat May 31 21:38:41 2014 -0700 + + configure: Drop AM_MAINTAINER_MODE + + Signed-off-by: Alan Coopersmith + +commit 4160421c642fc6b2dd3100a06f236efc6bbe0e08 +Author: Julien Cristau +Date: Mon Sep 9 19:45:23 2013 +0200 + + Bump to 0.3.7 + + Signed-off-by: Julien Cristau + +commit 44f04fd3046043ed31369025f34353c4e0e5c1cd +Author: Adam Jackson +Date: Tue Sep 25 08:54:36 2012 -0400 + + Remove mibstore.h + + Signed-off-by: Adam Jackson + +commit fee6b520a620eed80e22840b8149abc50815f771 +Author: Dave Airlie +Date: Wed Jul 18 19:39:32 2012 +1000 + + dummy: bump to 0.3.6 for release + + Signed-off-by: Dave Airlie + +commit 1491470ee0745bf8303fa085bd30f7464098f1f2 +Author: Dave Airlie +Date: Tue Jun 5 11:14:37 2012 +0100 + + dummy: convert to the new server APIs. + + Signed-off-by: Dave Airlie + +commit 6ff612955a1a8591bf21f6aa56e7b6ebd8e2db48 +Author: Dave Airlie +Date: Wed May 23 11:37:01 2012 +0100 + + dummy: convert to new scrn conversion APIs. + + Generated from util/modular/x-driver-screen-scrn-conv.sh + + Signed-off-by: Dave Airlie + +commit 20fcd59d3f8d7393586d8b64bfac18adede726ca +Author: Dave Airlie +Date: Wed May 23 11:36:22 2012 +0100 + + dummy: add scrn conversion api compat header. + + Signed-off-by: Dave Airlie + +commit a78d524cfb332909dba89df5d709081515f0ed36 +Author: Yaakov Selkowitz +Date: Wed Mar 28 00:07:28 2012 -0500 + + Add XORG_LIBS to LIBADD + + This affects only Cygwin, where drivers must be linked against the + Xorg implib. On other systems, XORG_LIBS will be empty. + + Signed-off-by: Yaakov Selkowitz + Reviewed-by: Alan Coopersmith + Reviewed-by: Jeremy Huddleston + +commit 668223a665af38600b8b20152c7e53e731c76234 +Author: Yaakov Selkowitz +Date: Wed Mar 28 00:06:32 2012 -0500 + + Only include Xv headers if server supports it + + Signed-off-by: Yaakov Selkowitz + Reviewed-by: Jeremy Huddleston + +commit 02918fd53434a23a72fe878a90f4ec48ef0e0416 +Author: Jeremy Huddleston +Date: Mon Jan 9 01:00:40 2012 -0800 + + Don't use XFreeXDGA to determine DGA support + + If our server supports DGA and we want to build the dummy driver without it, + XFreeXDGA will be defined by the server and will be picked up rather than + our configuration option. This change forces us to honor our configuration + hoice. + + Signed-off-by: Jeremy Huddleston + +commit bccf37f052748386902112b770b89d81bddfaeb8 +Author: Cyril Brulebois +Date: Sun Jan 1 07:15:36 2012 +0100 + + dummy 0.3.5 + + Signed-off-by: Cyril Brulebois + +commit dd9be3b21842aacdee5501cd2e0bfafb11b5ec08 +Author: Jeremy Huddleston +Date: Wed Sep 14 14:50:36 2011 -0500 + + Add a configure option to disable dga + + Signed-off-by: Jeremy Huddleston + Reviewed-by: Jamey Sharp + Signed-off-by: Jamey Sharp + +commit dd598ca433d2386687f9543457e4c6ffdb16d7c4 +Author: Jeremy Huddleston +Date: Wed Sep 14 14:32:02 2011 -0500 + + Use malloc/free instead of deprecated X versions + + Signed-off-by: Jeremy Huddleston + Reviewed-by: Jamey Sharp + Signed-off-by: Jamey Sharp + +commit d70dde48087a0d5c3930860ab97585d39de7b57e +Author: Jeremy Huddleston +Date: Wed Sep 14 14:30:55 2011 -0500 + + Dummy drivers don't need PCI. + + Signed-off-by: Jeremy Huddleston + Reviewed-by: Jamey Sharp + Signed-off-by: Jamey Sharp + +commit bdc59411136b16ca3447336f22e95010bf709a53 +Author: Adam Jackson +Date: Wed May 25 06:05:29 2011 -0400 + + Port away from xalloc/xfree + + Signed-off-by: Adam Jackson + +commit 7f57ed6be7c561b83da44a6ecb0562e8f562e48e +Author: Adam Jackson +Date: Wed May 25 06:04:39 2011 -0400 + + Fix DGA includes + + Signed-off-by: Adam Jackson + +commit fb0888f90d5d1c10d69ec2add0a66e88c94f5d5c +Author: Antoine Martin +Date: Wed May 25 06:03:10 2011 -0400 + + Increase the maximum framebuffer size to 32767x32767 + + Reviewed-by: Adam Jackson + Signed-off-by: Antoine Martin + Tested-by: Antoine Martin + +commit f8dc281042b328c2fad4df38f8fb3f967a025c6f +Author: Gaetan Nadon +Date: Wed Jul 21 16:49:04 2010 -0400 + + config: add comments for main statements + +commit ca77f09bd68587e7579f139660c8cef81662fdd0 +Author: Gaetan Nadon +Date: Wed Jul 21 16:07:00 2010 -0400 + + config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES + + Signed-off-by: Gaetan Nadon + +commit 945a1619300291ffe08c82f19bea6bb2e1da8f86 +Author: Gaetan Nadon +Date: Wed Jul 21 14:05:22 2010 -0400 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Signed-off-by: Gaetan Nadon + +commit 8fbbafb7ed5988a63d16d3d9fad17dd336a32b82 +Author: Gaetan Nadon +Date: Wed Jul 21 09:27:42 2010 -0400 + + config: complete AC_INIT m4 quoting + + Signed-off-by: Gaetan Nadon + +commit 93898c6d620cb005bca60ed20b89faf9a3b8434e +Author: Gaetan Nadon +Date: Tue Jul 20 20:24:42 2010 -0400 + + config: remove unrequired AC_HEADER_STDC + + Autoconf says: + "This macro is obsolescent, as current systems have conforming + header files. New programs need not use this macro". + + Signed-off-by: Gaetan Nadon + +commit c26603e9c0ab3cb04bcac5a370c9b5de9fe0d1d6 +Author: Gaetan Nadon +Date: Tue Jul 20 19:41:30 2010 -0400 + + config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 + + XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls + AC_PROG_C_C99. This sets gcc with -std=gnu99. + If AC_PROG_CC macro is called afterwards, it resets CC to gcc. + + Signed-off-by: Gaetan Nadon + +commit 839b7420661db5e1a9e6cffe97308a34f3196e58 +Author: Gaetan Nadon +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon + +commit 51642de730f264fdfaf1c78f68a767a9347e1520 +Author: Dave Airlie +Date: Mon Jul 5 12:05:40 2010 +1000 + + dummy 0.3.4 + +commit 77ae177fd77e90a6eaeebde9df88911256264329 +Author: Jamey Sharp +Date: Fri Jun 4 16:09:34 2010 -0700 + + Use new server API to find the root window. + + Signed-off-by: Jamey Sharp + +commit 2503a68673c6012a0bf2abba58aa5060654965f9 +Author: Gaetan Nadon +Date: Sat Jun 12 15:39:03 2010 -0400 + + COPYING: replace stub file with actual Copyright notice + + Signed-off-by: Gaetan Nadon + +commit c4134a6cb6bf3d9364fd2374e79647859dbd57c3 +Author: Gaetan Nadon +Date: Mon Feb 8 20:08:52 2010 -0500 + + config: move compiler flags from configure.ac to Makefile.am + + CFLAGS is an automake defined variable that should not be set + by the module. It should not be AC_SUBST either, it already is. + + Use AM_CFLAGS in Makefile.am. This will allow the user to override + the flags as they will be in the right order. + + Signed-off-by: Gaetan Nadon + +commit 3370539eea599ff51a556507ec16a1570b8ed076 +Author: Gaetan Nadon +Date: Mon Feb 8 19:07:22 2010 -0500 + + config: remove unrequired '-I$(top_srcdir)/src' + + The current dir is already included by default in the makefile + top_builddir = .. + DEFAULT_INCLUDES = -I. -I$(top_builddir) + + Signed-off-by: Gaetan Nadon + +commit ea7cc253b0f4ea97a197ec36b3ac06279b0b95f6 +Author: Gaetan Nadon +Date: Mon Feb 8 18:42:52 2010 -0500 + + config: remove unused INCLUDES='-I$(top_srcdir)/src' + + This statement is redundant and not used in the makefile + + Signed-off-by: Gaetan Nadon + +commit bff6fc2f25648df0bbc0ea0723636260df987d34 +Author: Gaetan Nadon +Date: Mon Feb 8 17:45:42 2010 -0500 + + config: remove unused variable XORG_INCS + + Signed-off-by: Gaetan Nadon + +commit 17f6ec36df36a8999a95fd86e17013b1c44a7a2e +Author: Gaetan Nadon +Date: Tue Dec 15 20:59:46 2009 -0500 + + configure.ac: sdkdir usage duplicates the sdk include dir + + The sdkdir variable provides a duplicate copy of the include/xorg + directory. The statement is removed as this was it's only used. + In the Makefile, there is now only one instance of the -I sdkdir + The sdkdir is provided in XORG_CFLAGS. + + Acked-by: Dan Nicholson + Signed-off-by: Gaetan Nadon + +commit 86a7baa4156dc9569b7dde51b3042b7fd8093821 +Author: Michael Olbrich +Date: Thu Dec 10 14:53:50 2009 -0500 + + configure.ac: remove wrong include path. #24675 + + Don't use $(prefix)/include as include path. It can break things + when cross-compiling with DESTDIR and prefix=/usr + + Signed-off-by: Michael Olbrich + Signed-off-by: Gaetan Nadon + +commit 483db0376d08be806c9bd51646f226f9510a4e48 +Author: Adam Jackson +Date: Tue Dec 1 10:51:30 2009 -0500 + + dummy 0.3.3 + + Signed-off-by: Adam Jackson + +commit 1ea8367691e69b289c2b5ca67d8ace39994347f8 +Author: Adam Jackson +Date: Tue Dec 1 10:36:35 2009 -0500 + + Don't try to make an INSTALL file + + INSTALL_CMD is empty. This breaks make distcheck. I don't know why, + but I also don't care. + + Signed-off-by: Adam Jackson + +commit 84b8dac3e6d869aa7e7b012add892fad9c3ce136 +Author: Gaetan Nadon +Date: Mon Nov 23 09:25:05 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit be0e614859c5754a18dc7c8ad2dd55090ab166c7 +Author: Gaetan Nadon +Date: Wed Oct 28 14:41:41 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Automake 'foreign' option is specified in configure.ac. + Remove from Makefile.am + +commit 2fc665b979a56faaac388b065c4cd91e0d2994d3 +Author: Gaetan Nadon +Date: Wed Oct 28 14:09:09 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 27946998e6ec8537e7137fd453e229d81c092f54 +Author: Gaetan Nadon +Date: Mon Oct 26 12:54:21 2009 -0400 + + Several driver modules do not have a ChangeLog target in Makefile.am #23814 + + The git generated ChangeLog replaces the hand written one. + Update configure.ac to xorg-macros level 1.3. + Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros + Update Makefile.am to add ChangeLog target if missing + Remove ChangeLog from EXTRA_DIST or *CLEAN variables + This is a pre-req for the INSTALL_CMD + +commit 50b546f499ae1cafbdf8e890234616733e2e6633 +Author: Gaetan Nadon +Date: Thu Oct 22 13:00:42 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 7aefb53beeaac7de52c44be0032a5a699706b74b +Author: Gaetan Nadon +Date: Thu Oct 22 12:34:16 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 4d4e41812e21490e39da34ac123b2c66bf20598c +Author: Adam Jackson +Date: Wed Nov 18 09:37:49 2009 -0500 + + Canonically re-wrap too. + + Signed-off-by: Adam Jackson + +commit b5983dbbd5f0cb4416b0e484fb43c80208feca25 +Author: Adam Jackson +Date: Wed Nov 18 09:36:34 2009 -0500 + + Compile fix. + + Signed-off-by: Adam Jackson + +commit e39d9a265572c273915f1803a729e7211d7b247b +Author: Adam Jackson +Date: Tue Nov 17 13:46:27 2009 -0500 + + Add support for HW_SKIP_CONSOLE + + Acked-by: Aaron Plattner + Signed-off-by: Adam Jackson + +commit a8366277a70797a7fa9c8c0b739a5fdac066816f +Author: Adam Jackson +Date: Tue Nov 17 13:36:30 2009 -0500 + + Properly un/rewrap CreateWindow + + Acked-by: Aaron Plattner + Signed-off-by: Adam Jackson + +commit ecf513ae11399c5778ff7d988e838a2b6211a88b +Author: Adam Jackson +Date: Thu Jul 2 11:08:25 2009 -0400 + + dummy 0.3.2 + +commit 8fe24e48acc7ec03972ee0acb5d7ab205ecbf7e0 +Author: Adam Jackson +Date: Thu May 28 14:54:17 2009 -0400 + + Remove useless loader symbol lists. + +commit 17885c5cb1dbcfb48ee593260bcd1b1ff2887989 +Author: Alan Coopersmith +Date: Fri Jan 30 20:38:25 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit d876e719969e9d33e7e4502448a544f12eb0fab8 +Author: Julien Cristau +Date: Sun Jan 25 23:25:33 2009 +0100 + + dummy 0.3.1 + +commit 33e86171bd1815a23f35bb992a91c02785c22402 +Author: Adam Jackson +Date: Fri Aug 15 14:05:04 2008 -0400 + + Uninclude xf86Version.h + +commit 0dcdce106d01aa6ff611436c3f8374241e7a8da8 +Author: Adam Jackson +Date: Wed Mar 19 17:31:28 2008 -0400 + + dummy 0.3.0 + +commit ba7ab1d468e9a5ba37c064b3b128fa3bbb721044 +Author: Adam Jackson +Date: Wed Mar 19 17:26:51 2008 -0400 + + Death to RCS tags. + +commit 2aeec40b3d48705bc1de9da3f06deac365c25895 +Author: James Cloos +Date: Mon Sep 3 05:52:30 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 1874204e0c807c1686c28782d5eef62bd49fab04 +Author: James Cloos +Date: Thu Aug 23 19:25:48 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 345de2bd048fcc7b177a3b504522fe100b34f1e0 +Author: Brice Goglin +Date: Tue Aug 7 10:50:06 2007 +0200 + + Define DUMMY_*_VERSION* using PACKAGE_VERSION_* + +commit 22e38bed8cd2d1e54c47d0763436012eeccb2d32 +Author: Adam Jackson +Date: Fri Apr 7 18:59:48 2006 +0000 + + VERSION -> DUMMY_VERSION + +commit 7432eaf48b70437bd55e5cc98833cce224d9e131 +Author: Adam Jackson +Date: Fri Apr 7 18:50:19 2006 +0000 + + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + +commit 474af880791908da7e006c4d500bc7318107bbd1 +Author: Kevin E Martin +Date: Wed Dec 21 02:29:59 2005 +0000 + + Update package version for X11R7 release. + +commit 9b9ea496e698e4d078c67b8f5674fd6479e3b2bb +Author: Adam Jackson +Date: Mon Dec 19 16:25:53 2005 +0000 + + Stub COPYING files + +commit d2cff58c1e7ff03109bd17c5f8247b9b166b71f2 +Author: Kevin E Martin +Date: Thu Dec 15 00:24:17 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 39f1e4449acb3e5da96aaaaa86e2544e9be968b1 +Author: Kevin E Martin +Date: Sat Dec 3 05:49:33 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 1b47f2e8f47501122a3b613b95ea5de99f76a8c2 +Author: Kevin E Martin +Date: Fri Dec 2 02:16:08 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit c2c245b18409db7013dee0b0b4b7176daae7e290 +Author: Adam Jackson +Date: Tue Nov 29 23:29:58 2005 +0000 + + Only build dlloader modules by default. + +commit e6887d858e8b837c29c7833ab4b55034b736c6d8 +Author: Eric Anholt +Date: Mon Nov 21 10:49:12 2005 +0000 + + Add .cvsignores for drivers. + +commit ec562722d0ae21f82a0dcc1a4a3e45ed52592aed +Author: Kevin E Martin +Date: Tue Nov 15 05:42:03 2005 +0000 + + Add check for DGA extension to fix issues when building with separate build + roots. + +commit 1073cc5a2bd62b6972fcda4d4d9ccbe43f2506d4 +Author: Kevin E Martin +Date: Wed Nov 9 21:15:14 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 5ced29a35f7571899f281af094fbd1f242f95e7d +Author: Kevin E Martin +Date: Tue Nov 1 15:08:52 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit ffa97f23462ff045834b4abae33cf645ed6c3517 +Author: Kevin E Martin +Date: Wed Oct 19 02:48:02 2005 +0000 + + Update package version number for RC1 release. + +commit 4bb6048d8d0d87f3d91a93fef737882434702bb0 +Author: Alan Coopersmith +Date: Mon Oct 17 00:09:02 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit f586bde47b9ed6561b5350c03b088acfe2e227f6 +Author: Daniel Stone +Date: Thu Aug 18 09:03:46 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit d43c40d00ab34ae85e4684cc3860f641b0bea65c +Author: Søren Sandmann Pedersen +Date: Wed Aug 10 14:07:24 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit ef552d7e1765386c652748a97df67f4ba00beef0 +Author: Kevin E Martin +Date: Fri Jul 29 21:22:43 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit c5f63f703d838cfae54269c595e14a06ea04f243 +Author: Søren Sandmann Pedersen +Date: Wed Jul 13 21:52:24 2005 +0000 + + Add Makefile.am here. Also, for the record, CVS needs a bullet through its + head + +commit 30a2cce4b61e2b0e550479ee87f25c895cbca513 +Author: Søren Sandmann Pedersen +Date: Wed Jul 13 21:45:21 2005 +0000 + + Build system for dummy video driver + +commit ec9e85771609d6ec8a94b777fc784db4d1026f20 +Author: Adam Jackson +Date: Mon Jul 11 02:29:47 2005 +0000 + + Prep for modular builds by adding guarded #include "config.h" everywhere. + +commit 7b856f1c89ceae998c2133fcd9bba2c1493744e0 +Author: Adam Jackson +Date: Sat Jun 25 21:16:54 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit a467602c6c419bd7288d80ad50a6fa62aeff3ec8 +Author: Daniel Stone +Date: Wed Apr 20 12:25:23 2005 +0000 + + Fix includes right throughout the Xserver tree: + change "foo.h" to for core headers, e.g. X.h, Xpoll.h; + change "foo.h", "extensions/foo.h" and "X11/foo.h" to + for extension headers, e.g. Xv.h; + change "foo.[ch]" to for Xtrans files. + +commit 53407449153e20f7529ed9b403cee5aab25880d0 +Author: Adam Jackson +Date: Fri Feb 25 16:38:34 2005 +0000 + + Bug #2605: Make the cyrix, dummy, glint, neomagic, tga, and trident drivers + build when BuildXF86DGA NO. + (also fix some datestamps in the changelog) + +commit 73816949f2a28a0b8fe39108a8e493f9e47f7718 +Author: Egbert Eich +Date: Fri Jan 28 16:12:59 2005 +0000 + + Modifying X.Org Xserver DDX to allow to run X with ordinary user + permissions when no access to HW registers is required. For API changes + which mostly involve the modifications to make the RRFunc (introduced + with 6.8) more flexible please check Bugzilla #2407. NOTE: This patch + applies changes to OS specific files for other OSes which I cannot + test. + +commit 720c9b05f47c3529aa2561ab4c88319322893780 +Author: Markus Kuhn +Date: Sat Dec 4 00:43:05 2004 +0000 + + Encoding of numerous files changed to UTF-8 + +commit b227226476ae94d094376c561d77e85589592fe6 +Author: Stuart Kreitman +Date: Fri Oct 15 21:09:00 2004 +0000 + + Bugzilla #1644: Attach an atom "VFB" to root window of dummy driver. + Committing in Head. + Modified Files: dummy.h dummy_driver.c + +commit a571d5efb53cfe793d61d1b48c2bddc8d337d381 +Author: Eric Anholt +Date: Wed Jun 16 09:23:03 2004 +0000 + + DRI XFree86-4_3_99_12-merge import + +commit 289ef4abc51e6ba8e902db4093cb5380721cbfe7 +Author: Egbert Eich +Date: Wed May 26 16:24:08 2004 +0000 + + Fixing setting of physical framebuffer base for several drivers. C&T + driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic + driver: improved support for lowres double scan modes. + +commit 5d8038b2977b7c0ab0ea17e263b3720cef83db59 +Author: Egbert Eich +Date: Fri Apr 23 19:30:15 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit f8e1ff3e00a773139aa1ab0ae72c83dc7792c175 +Author: Egbert Eich +Date: Sun Mar 14 08:33:20 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit d268ada4b7e5c48cf48825a632af7f0faeaff6d0 +Author: Egbert Eich +Date: Wed Mar 3 12:12:18 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 2ba39037fa8840a654432f032cc97b6830946cf9 +Author: Egbert Eich +Date: Thu Feb 26 13:35:52 2004 +0000 + + readding XFree86's cvs IDs + +commit f352d52a2a89e4c55689a90db83a9f7e03e562c1 +Author: Egbert Eich +Date: Thu Feb 26 09:23:18 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 77748634e71f2c42d03d708515e65351f0b755cb +Author: Kaleb Keithley +Date: Tue Nov 25 19:28:36 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 106069b23188837f06b1057e03db24cad2018ea3 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:55 2003 +0000 + + XFree86 4.3.0.1 + +commit ca3b63783fc4aa1df725dbd0e560a446dcc17913 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:55 2003 +0000 + + Initial revision diff --git a/xorg/xf86-video-dummy/v0.3.8/Makefile.am b/xorg/xf86-video-dummy/v0.3.8/Makefile.am new file mode 100644 index 00000000..af06d528 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/Makefile.am @@ -0,0 +1,29 @@ +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +SUBDIRS = src +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/xorg/xf86-video-dummy/v0.3.8/Makefile.in b/xorg/xf86-video-dummy/v0.3.8/Makefile.in new file mode 100644 index 00000000..e6c730e6 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/Makefile.in @@ -0,0 +1,865 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope +DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \ + ChangeLog README compile config.guess config.sub depcomp \ + install-sh ltmain.sh missing +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip +distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DGA = @DGA@ +DLLTOOL = @DLLTOOL@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +DRIVER_NAME = @DRIVER_NAME@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +VERSION = @VERSION@ +XORG_CFLAGS = @XORG_CFLAGS@ +XORG_LIBS = @XORG_LIBS@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = src +MAINTAINERCLEANFILES = ChangeLog +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +am--refresh: Makefile + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: $(am__configure_deps) + $(am__cd) $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): + +config.h: stamp-h1 + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool config.lt + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + +distdir: $(DISTFILES) + $(am__remove_distdir) + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__post_remove_distdir) +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) + +dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + +dist-shar: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__post_remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__post_remove_distdir) + +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 + $(am__post_remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-recursive +all-am: Makefile config.h +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-hdr \ + distclean-libtool distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/xorg/xf86-video-dummy/v0.3.8/README b/xorg/xf86-video-dummy/v0.3.8/README new file mode 100644 index 00000000..917276a7 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/README @@ -0,0 +1,20 @@ +xf86-video-dummy - virtual/offscreen frame buffer driver for the Xorg X server + +Please submit bugs & patches to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/driver/xf86-video-dummy + + http://cgit.freedesktop.org/xorg/driver/xf86-video-dummy + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage diff --git a/xorg/xf86-video-dummy/v0.3.8/aclocal.m4 b/xorg/xf86-video-dummy/v0.3.8/aclocal.m4 new file mode 100644 index 00000000..a9cc2755 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/aclocal.m4 @@ -0,0 +1,12431 @@ +# generated automatically by aclocal 1.15 -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +]) + +# serial 58 LT_INIT + + +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) + + +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) + + +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS=$ltmain + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +_LT_SETUP + +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) + + +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + +# _LT_CC_BASENAME(CC) +# ------------------- +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. +m4_defun([_LT_CC_BASENAME], +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options that allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi + +_LT_CHECK_OBJDIR + +m4_require([_LT_TAG_COMPILER])dnl + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld=$lt_cv_prog_gnu_ld + +old_CC=$CC +old_CFLAGS=$CFLAGS + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + _LT_PATH_MAGIC + fi + ;; +esac + +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP + + +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from 'configure', and 'config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain=$ac_aux_dir/ltmain.sh +])# _LT_PROG_LTMAIN + + + +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the 'libtool' +# label. + + +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) + + + + + +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) + + +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) + + +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) + + +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME +# must have a single quote delimited value for this to work. +m4_define([_LT_CONFIG_STATUS_DECLARE], +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) + + +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags='_LT_TAGS'dnl +]) + + +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) + + +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _LT_CONFIG_COMMANDS +# ------------------- +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +_LT_OUTPUT_LIBTOOL_INIT +]) + +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# '#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test 0 = "$lt_write_fail" && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT + +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) + +cat >>"$CONFIG_LT" <<\_LTEOF +lt_cl_silent=false +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +'$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2011 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." + +while test 0 != $[#] +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try '$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try '$[0] --help' for more information.]) ;; + esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null +fi +_LTEOF + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +lt_cl_success=: +test yes = "$silent" && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) +])# LT_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options that allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + + cfgfile=${ofile}T + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL +# Generated automatically by $as_me ($PACKAGE) $VERSION +# NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +_LT_COPYING +_LT_LIBTOOL_TAGS + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG + + +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG + + +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG + + +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) + + +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE + +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "$LT_MULTI_MODULE"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) + + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS=$save_LDFLAGS + ]) + + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' + fi + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +]) + + +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined + case $cc_basename in + ifort*|nagfor*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test yes = "$_lt_dar_can_shared"; then + output_verbose_link_cmd=func_echo_all + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + m4_if([$1], [CXX], +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl +if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi +])# _LT_SYS_MODULE_PATH_AIX + + +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + + + +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +case $ECHO in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac + +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) + +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) +])# _LT_PROG_ECHO_BACKSLASH + + +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case $with_sysroot in #( + yes) + if test yes = "$GCC"; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([$with_sysroot]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and where our libraries should be installed.])]) + +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test no = "$enable_libtool_lock" || enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; + *ELF-64*) + HPUX_IA64_MODE=64 + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test yes = "$lt_cv_prog_gnu_ld"; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test yes != "$lt_cv_cc_needs_belf"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS=$SAVE_CFLAGS + fi + ;; +*-*solaris*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*|x86_64-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD=${LD-ld}_sol2 + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks=$enable_libtool_lock +])# _LT_ENABLE_LOCK + + +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test 0 -eq "$ac_status"; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[_LT_PROG_AR + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + bitrig* | openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) +])# _LT_CMD_OLD_ARCHIVE + + +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* +]) + +if test yes = "[$]$2"; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) +fi +])# _LT_COMPILER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +]) + +if test yes = "[$]$2"; then + m4_if([$4], , :, [$4]) +else + m4_if([$5], , :, [$5]) +fi +])# _LT_LINKER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + + +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring=ABCD + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test 17 != "$i" # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac +]) +if test -n "$lt_cv_sys_max_cmd_len"; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN + +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + + +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN + + +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test yes = "$cross_compiling"; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi +fi +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF + + +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test yes != "$enable_dlopen"; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen=load_add_on + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen=shl_load], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen=dlopen], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test no = "$lt_cv_dlopen"; then + enable_dlopen=no + else + enable_dlopen=yes + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS=$LDFLAGS + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test yes = "$lt_cv_dlopen_self"; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi + + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O + + +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) + +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS + + +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR + + +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then + + # We can hardcode non-existent directories. + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then + # Fast installation is not supported + enable_fast_install=no +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH + + +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB + + +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + +# _LT_SYS_DYNAMIC_LINKER([TAG]) +# ----------------------------- +# PORTME Fill in your ld.so characteristics +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) +m4_if([$1], + [], [ +if test yes = "$GCC"; then + case $host_os in + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary... + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo = "/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=.so +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='$libname$release$shared_ext$major' + ;; + +aix[[4-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test ia64 = "$host_cpu"; then + # AIX 5 supports IA64 + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='$libname$shared_ext' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec=$LIB + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 + fi + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[[3-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test yes = "$lt_cv_prog_gnu_ld"; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd* | bitrig*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no + else + need_version=yes + fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +os2*) + libname_spec='$name' + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test yes = "$with_gnu_ld"; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec; then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=sco + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test yes = "$with_gnu_ld"; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test no = "$dynamic_linker" && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test yes = "$GCC"; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec +fi + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec +fi + +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) +])# _LT_SYS_DYNAMIC_LINKER + + +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# find a file program that can recognize shared library +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; +esac]) +MAGIC_CMD=$lt_cv_path_MAGIC_CMD +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX + +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + + +# _LT_PATH_MAGIC +# -------------- +# find a file program that can recognize a shared library +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC + + +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test no = "$withval" || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + +ac_prog=ld +if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD=$ac_prog + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test yes = "$with_gnu_ld"; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD=$ac_dir/$ac_prog + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + +# _LT_CHECK_MAGIC_METHOD +# ---------------------- +# how to check for library dependencies +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_MAGIC_METHOD], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +AC_CACHE_CHECK([how to recognize dependent libraries], +lt_cv_deplibs_check_method, +[lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# 'unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. + +case $host_os in +aix[[4-9]]*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi[[45]]*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD + + +# LT_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM +else + lt_nm_to_check=${ac_tool_prefix}nm + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} +fi]) +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; + *) + DUMPBIN=: + ;; + esac + fi + AC_SUBST([DUMPBIN]) + if test : != "$DUMPBIN"; then + NM=$DUMPBIN + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) + +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + + +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM=-lm) + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M + +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) + + +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl + +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test yes = "$GCC"; then + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac + + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI + + +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl + +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test ia64 = "$host_cpu"; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined __osf__ +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS=conftstm.$ac_objext + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test yes = "$pipe_works"; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) +]) # _LT_CMD_GLOBAL_SYMBOLS + + +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= + +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64, which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test yes = "$GCC"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; + + hpux9* | hpux10* | hpux11*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # old Intel for x86_64, which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms that do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC + + +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd* | bitrig*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test yes = "$with_gnu_ld"; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test yes = "$lt_use_gnu_ld_interface"; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='$wl' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test ia64 != "$host_cpu"; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test linux-dietlibc = "$host_os"; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test no = "$tmp_diet" + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix[[4-9]]*) + if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag= + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then + aix_use_runtimelinking=yes + break + fi + done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac + + if test yes = "$GCC"; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' + fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' + else + # not using gcc + if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac + ;; + + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; + + hpux10*) + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test yes,no = "$GCC,$with_gnu_ld"; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + ;; + esac + fi + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi + _LT_TAGVAR(link_all_deplibs, $1)=no + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *nto* | *qnx*) + ;; + + openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + osf3*) + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands '-z linker_flag'. GCC discards it without '$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test sequent = "$host_vendor"; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' + + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + if test sni = "$host_vendor"; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no + +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld + +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) + +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test yes,yes = "$GCC,$enable_shared"; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + ;; + esac + fi + ;; +esac + +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting $shlibpath_var if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS + + +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC=$CC +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report what library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_CONFIG($1) +fi +AC_LANG_POP +CC=$lt_save_CC +])# _LT_LANG_C_CONFIG + + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_caught_CXX_error"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi + + if test yes = "$GXX"; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='$wl' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag= + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac + + if test yes = "$GXX"; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' + fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' + else + # not using gcc + if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands '-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require '-G' NOT '-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no + + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test yes != "$_lt_caught_CXX_error" + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + + +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= + +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF +]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case $prev$p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test x-L = "$p" || + test x-R = "$p"; then + prev=$p + continue + fi + + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test no = "$pre_test_object_deps_done"; then + case $prev in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)=$prev$p + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" + fi + fi + prev= + ;; + + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test no = "$pre_test_object_deps_done"; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)=$p + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)=$p + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling $1 test program" +fi + +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS + + +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test no = "$F77"; then + _lt_disable_F77=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_disable_F77"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} + CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" + +AC_LANG_POP +])# _LT_LANG_F77_CONFIG + + +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test no = "$FC"; then + _lt_disable_FC=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_disable_FC"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_FC" + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG + + +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE + +# Source file extension for Java test sources. +ac_ext=java + +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG + + +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code=$lt_simple_compile_test_code + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) + + +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) + +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f "$lt_ac_sed" && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test 10 -lt "$lt_ac_count" && break + lt_ac_count=`expr $lt_ac_count + 1` + if test "$lt_ac_count" -gt "$lt_ac_max"; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef + +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) + + +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES + + +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine what file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS + +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 8 ltoptions.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + + +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option '$2'])])[]dnl +]) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) + + +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) + ]) +])# _LT_SET_OPTIONS + + + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'dlopen' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac + +test -z "$AS" && AS=as +_LT_DECL([], [AS], [1], [Assembler program])dnl + +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl + +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +])# win32-dll + +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'win32-dll' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) + +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) + +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the 'fast-install' option into LT_INIT's first parameter.]) +]) + +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the 'disable-fast-install' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' +# LT_INIT options. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for lt_pkg in $withval; do + IFS=$lt_save_ifs + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [pic_mode=m4_default([$1], [default])]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'pic-only' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) + +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + + +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + + +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59, which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + + + +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) + +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# @configure_input@ + +# serial 4179 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.4.6' +macro_revision='2.4.6' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) + +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) + +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED + + +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR + +dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. +dnl +dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. +dnl +dnl Permission is hereby granted, free of charge, to any person obtaining a +dnl copy of this software and associated documentation files (the "Software"), +dnl to deal in the Software without restriction, including without limitation +dnl the rights to use, copy, modify, merge, publish, distribute, sublicense, +dnl and/or sell copies of the Software, and to permit persons to whom the +dnl Software is furnished to do so, subject to the following conditions: +dnl +dnl The above copyright notice and this permission notice (including the next +dnl paragraph) shall be included in all copies or substantial portions of the +dnl Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +dnl DEALINGS IN THE SOFTWARE. + +# XORG_MACROS_VERSION(required-version) +# ------------------------------------- +# Minimum version: 1.1.0 +# +# If you're using a macro added in Version 1.1 or newer, include this in +# your configure.ac with the minimum required version, such as: +# XORG_MACROS_VERSION(1.1) +# +# To ensure that this macro is defined, also add: +# m4_ifndef([XORG_MACROS_VERSION], +# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])]) +# +# +# See the "minimum version" comment for each macro you use to see what +# version you require. +m4_defun([XORG_MACROS_VERSION],[ +m4_define([vers_have], [1.19.0]) +m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) +m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) +m4_if(m4_cmp(maj_have, maj_needed), 0,, + [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])]) +m4_if(m4_version_compare(vers_have, [$1]), -1, + [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])]) +m4_undefine([vers_have]) +m4_undefine([maj_have]) +m4_undefine([maj_needed]) +]) # XORG_MACROS_VERSION + +# XORG_PROG_RAWCPP() +# ------------------ +# Minimum version: 1.0.0 +# +# Find cpp program and necessary flags for use in pre-processing text files +# such as man pages and config files +AC_DEFUN([XORG_PROG_RAWCPP],[ +AC_REQUIRE([AC_PROG_CPP]) +AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], + [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) + +# Check for flag to avoid builtin definitions - assumes unix is predefined, +# which is not the best choice for supporting other OS'es, but covers most +# of the ones we need for now. +AC_MSG_CHECKING([if $RAWCPP requires -undef]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])]) +if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + AC_MSG_RESULT([no]) +else + if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + RAWCPPFLAGS=-undef + AC_MSG_RESULT([yes]) + # under Cygwin unix is still defined even with -undef + elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + RAWCPPFLAGS="-undef -ansi" + AC_MSG_RESULT([yes, with -ansi]) + else + AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) + fi +fi +rm -f conftest.$ac_ext + +AC_MSG_CHECKING([if $RAWCPP requires -traditional]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) +if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + AC_MSG_RESULT([no]) +else + if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + TRADITIONALCPPFLAGS="-traditional" + RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) + fi +fi +rm -f conftest.$ac_ext +AC_SUBST(RAWCPPFLAGS) +AC_SUBST(TRADITIONALCPPFLAGS) +]) # XORG_PROG_RAWCPP + +# XORG_MANPAGE_SECTIONS() +# ----------------------- +# Minimum version: 1.0.0 +# +# Determine which sections man pages go in for the different man page types +# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. +# Not sure if there's any better way than just hardcoding by OS name. +# Override default settings by setting environment variables +# Added MAN_SUBSTS in version 1.8 +# Added AC_PROG_SED in version 1.8 + +AC_DEFUN([XORG_MANPAGE_SECTIONS],[ +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([AC_PROG_SED]) + +if test x$APP_MAN_SUFFIX = x ; then + APP_MAN_SUFFIX=1 +fi +if test x$APP_MAN_DIR = x ; then + APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' +fi + +if test x$LIB_MAN_SUFFIX = x ; then + LIB_MAN_SUFFIX=3 +fi +if test x$LIB_MAN_DIR = x ; then + LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' +fi + +if test x$FILE_MAN_SUFFIX = x ; then + case $host_os in + solaris*) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; + esac +fi +if test x$FILE_MAN_DIR = x ; then + FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' +fi + +if test x$MISC_MAN_SUFFIX = x ; then + case $host_os in + solaris*) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; + esac +fi +if test x$MISC_MAN_DIR = x ; then + MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' +fi + +if test x$DRIVER_MAN_SUFFIX = x ; then + case $host_os in + solaris*) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; + esac +fi +if test x$DRIVER_MAN_DIR = x ; then + DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' +fi + +if test x$ADMIN_MAN_SUFFIX = x ; then + case $host_os in + solaris*) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; + esac +fi +if test x$ADMIN_MAN_DIR = x ; then + ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' +fi + + +AC_SUBST([APP_MAN_SUFFIX]) +AC_SUBST([LIB_MAN_SUFFIX]) +AC_SUBST([FILE_MAN_SUFFIX]) +AC_SUBST([MISC_MAN_SUFFIX]) +AC_SUBST([DRIVER_MAN_SUFFIX]) +AC_SUBST([ADMIN_MAN_SUFFIX]) +AC_SUBST([APP_MAN_DIR]) +AC_SUBST([LIB_MAN_DIR]) +AC_SUBST([FILE_MAN_DIR]) +AC_SUBST([MISC_MAN_DIR]) +AC_SUBST([DRIVER_MAN_DIR]) +AC_SUBST([ADMIN_MAN_DIR]) + +XORG_MAN_PAGE="X Version 11" +AC_SUBST([XORG_MAN_PAGE]) +MAN_SUBSTS="\ + -e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xservername__|Xorg|g' \ + -e 's|__xconfigfile__|xorg.conf|g' \ + -e 's|__projectroot__|\$(prefix)|g' \ + -e 's|__apploaddir__|\$(appdefaultdir)|g' \ + -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ + -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \ + -e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'" +AC_SUBST([MAN_SUBSTS]) + +]) # XORG_MANPAGE_SECTIONS + +# XORG_CHECK_SGML_DOCTOOLS([MIN-VERSION]) +# ------------------------ +# Minimum version: 1.7.0 +# +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent +# provided by xorg-sgml-doctools, if installed. +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ +AC_MSG_CHECKING([for X.Org SGML entities m4_ifval([$1],[>= $1])]) +XORG_SGML_PATH= +PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])], + [XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`], + [m4_ifval([$1],[:], + [if test x"$cross_compiling" != x"yes" ; then + AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent], + [XORG_SGML_PATH=$prefix/share/sgml]) + fi]) + ]) + +# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing +# the path and the name of the doc stylesheet +if test "x$XORG_SGML_PATH" != "x" ; then + AC_MSG_RESULT([$XORG_SGML_PATH]) + STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11 + XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl +else + AC_MSG_RESULT([no]) +fi + +AC_SUBST(XORG_SGML_PATH) +AC_SUBST(STYLESHEET_SRCDIR) +AC_SUBST(XSL_STYLESHEET) +AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XSL_STYLESHEET" != "x"]) +]) # XORG_CHECK_SGML_DOCTOOLS + +# XORG_CHECK_LINUXDOC +# ------------------- +# Minimum version: 1.0.0 +# +# Defines the variable MAKE_TEXT if the necessary tools and +# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt. +# Whether or not the necessary tools and files are found can be checked +# with the AM_CONDITIONAL "BUILD_LINUXDOC" +AC_DEFUN([XORG_CHECK_LINUXDOC],[ +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) +AC_REQUIRE([XORG_WITH_PS2PDF]) + +AC_PATH_PROG(LINUXDOC, linuxdoc) + +AC_MSG_CHECKING([whether to build documentation]) + +if test x$XORG_SGML_PATH != x && test x$LINUXDOC != x ; then + BUILDDOC=yes +else + BUILDDOC=no +fi + +AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) + +AC_MSG_RESULT([$BUILDDOC]) + +AC_MSG_CHECKING([whether to build pdf documentation]) + +if test x$have_ps2pdf != xno && test x$BUILD_PDFDOC != xno; then + BUILDPDFDOC=yes +else + BUILDPDFDOC=no +fi + +AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) + +AC_MSG_RESULT([$BUILDPDFDOC]) + +MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt -f" +MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" +MAKE_PDF="$PS2PDF" +MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" + +AC_SUBST(MAKE_TEXT) +AC_SUBST(MAKE_PS) +AC_SUBST(MAKE_PDF) +AC_SUBST(MAKE_HTML) +]) # XORG_CHECK_LINUXDOC + +# XORG_CHECK_DOCBOOK +# ------------------- +# Minimum version: 1.0.0 +# +# Checks for the ability to build output formats from SGML DocBook source. +# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC" +# indicates whether the necessary tools and files are found and, if set, +# $(MAKE_XXX) blah.sgml will produce blah.xxx. +AC_DEFUN([XORG_CHECK_DOCBOOK],[ +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) + +BUILDTXTDOC=no +BUILDPDFDOC=no +BUILDPSDOC=no +BUILDHTMLDOC=no + +AC_PATH_PROG(DOCBOOKPS, docbook2ps) +AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) +AC_PATH_PROG(DOCBOOKHTML, docbook2html) +AC_PATH_PROG(DOCBOOKTXT, docbook2txt) + +AC_MSG_CHECKING([whether to build text documentation]) +if test x$XORG_SGML_PATH != x && test x$DOCBOOKTXT != x && + test x$BUILD_TXTDOC != xno; then + BUILDTXTDOC=yes +fi +AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) +AC_MSG_RESULT([$BUILDTXTDOC]) + +AC_MSG_CHECKING([whether to build PDF documentation]) +if test x$XORG_SGML_PATH != x && test x$DOCBOOKPDF != x && + test x$BUILD_PDFDOC != xno; then + BUILDPDFDOC=yes +fi +AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) +AC_MSG_RESULT([$BUILDPDFDOC]) + +AC_MSG_CHECKING([whether to build PostScript documentation]) +if test x$XORG_SGML_PATH != x && test x$DOCBOOKPS != x && + test x$BUILD_PSDOC != xno; then + BUILDPSDOC=yes +fi +AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) +AC_MSG_RESULT([$BUILDPSDOC]) + +AC_MSG_CHECKING([whether to build HTML documentation]) +if test x$XORG_SGML_PATH != x && test x$DOCBOOKHTML != x && + test x$BUILD_HTMLDOC != xno; then + BUILDHTMLDOC=yes +fi +AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes]) +AC_MSG_RESULT([$BUILDHTMLDOC]) + +MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT" +MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS" +MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF" +MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML" + +AC_SUBST(MAKE_TEXT) +AC_SUBST(MAKE_PS) +AC_SUBST(MAKE_PDF) +AC_SUBST(MAKE_HTML) +]) # XORG_CHECK_DOCBOOK + +# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT]) +# ---------------- +# Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-xmlto option, it allows maximum flexibilty in making decisions +# as whether or not to use the xmlto package. When DEFAULT is not specified, +# --with-xmlto assumes 'auto'. +# +# Interface to module: +# HAVE_XMLTO: used in makefiles to conditionally generate documentation +# XMLTO: returns the path of the xmlto program found +# returns the path set by the user in the environment +# --with-xmlto: 'yes' user instructs the module to use xmlto +# 'no' user instructs the module not to use xmlto +# +# Added in version 1.10.0 +# HAVE_XMLTO_TEXT: used in makefiles to conditionally generate text documentation +# xmlto for text output requires either lynx, links, or w3m browsers +# +# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_XMLTO],[ +AC_ARG_VAR([XMLTO], [Path to xmlto command]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(xmlto, + AS_HELP_STRING([--with-xmlto], + [Use xmlto to regenerate documentation (default: ]_defopt[)]), + [use_xmlto=$withval], [use_xmlto=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_xmlto" = x"auto"; then + AC_PATH_PROG([XMLTO], [xmlto]) + if test "x$XMLTO" = "x"; then + AC_MSG_WARN([xmlto not found - documentation targets will be skipped]) + have_xmlto=no + else + have_xmlto=yes + fi +elif test "x$use_xmlto" = x"yes" ; then + AC_PATH_PROG([XMLTO], [xmlto]) + if test "x$XMLTO" = "x"; then + AC_MSG_ERROR([--with-xmlto=yes specified but xmlto not found in PATH]) + fi + have_xmlto=yes +elif test "x$use_xmlto" = x"no" ; then + if test "x$XMLTO" != "x"; then + AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified]) + fi + have_xmlto=no +else + AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no']) +fi + +# Test for a minimum version of xmlto, if provided. +m4_ifval([$1], +[if test "$have_xmlto" = yes; then + # scrape the xmlto version + AC_MSG_CHECKING([the xmlto version]) + xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3` + AC_MSG_RESULT([$xmlto_version]) + AS_VERSION_COMPARE([$xmlto_version], [$1], + [if test "x$use_xmlto" = xauto; then + AC_MSG_WARN([xmlto version $xmlto_version found, but $1 needed]) + have_xmlto=no + else + AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed]) + fi]) +fi]) + +# Test for the ability of xmlto to generate a text target +# +# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the +# following test for empty XML docbook files. +# For compatibility reasons use the following empty XML docbook file and if +# it fails try it again with a non-empty XML file. +have_xmlto_text=no +cat > conftest.xml << "EOF" +EOF +AS_IF([test "$have_xmlto" = yes], + [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], + [have_xmlto_text=yes], + [# Try it again with a non-empty XML file. + cat > conftest.xml << "EOF" + +EOF + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], + [have_xmlto_text=yes], + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) +rm -f conftest.xml +AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) +AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) +]) # XORG_WITH_XMLTO + +# XORG_WITH_XSLTPROC([MIN-VERSION], [DEFAULT]) +# -------------------------------------------- +# Minimum version: 1.12.0 +# Minimum version for optional DEFAULT argument: 1.12.0 +# +# XSLT (Extensible Stylesheet Language Transformations) is a declarative, +# XML-based language used for the transformation of XML documents. +# The xsltproc command line tool is for applying XSLT stylesheets to XML documents. +# It is used under the cover by xmlto to generate html files from DocBook/XML. +# The XSLT processor is often used as a standalone tool for transformations. +# It should not be assumed that this tool is used only to work with documnetation. +# When DEFAULT is not specified, --with-xsltproc assumes 'auto'. +# +# Interface to module: +# HAVE_XSLTPROC: used in makefiles to conditionally generate documentation +# XSLTPROC: returns the path of the xsltproc program found +# returns the path set by the user in the environment +# --with-xsltproc: 'yes' user instructs the module to use xsltproc +# 'no' user instructs the module not to use xsltproc +# have_xsltproc: returns yes if xsltproc found in PATH or no +# +# If the user sets the value of XSLTPROC, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_XSLTPROC],[ +AC_ARG_VAR([XSLTPROC], [Path to xsltproc command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for xsltproc MIN-VERSION is not implemented])]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(xsltproc, + AS_HELP_STRING([--with-xsltproc], + [Use xsltproc for the transformation of XML documents (default: ]_defopt[)]), + [use_xsltproc=$withval], [use_xsltproc=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_xsltproc" = x"auto"; then + AC_PATH_PROG([XSLTPROC], [xsltproc]) + if test "x$XSLTPROC" = "x"; then + AC_MSG_WARN([xsltproc not found - cannot transform XML documents]) + have_xsltproc=no + else + have_xsltproc=yes + fi +elif test "x$use_xsltproc" = x"yes" ; then + AC_PATH_PROG([XSLTPROC], [xsltproc]) + if test "x$XSLTPROC" = "x"; then + AC_MSG_ERROR([--with-xsltproc=yes specified but xsltproc not found in PATH]) + fi + have_xsltproc=yes +elif test "x$use_xsltproc" = x"no" ; then + if test "x$XSLTPROC" != "x"; then + AC_MSG_WARN([ignoring XSLTPROC environment variable since --with-xsltproc=no was specified]) + fi + have_xsltproc=no +else + AC_MSG_ERROR([--with-xsltproc expects 'yes' or 'no']) +fi + +AM_CONDITIONAL([HAVE_XSLTPROC], [test "$have_xsltproc" = yes]) +]) # XORG_WITH_XSLTPROC + +# XORG_WITH_PERL([MIN-VERSION], [DEFAULT]) +# ---------------------------------------- +# Minimum version: 1.15.0 +# +# PERL (Practical Extraction and Report Language) is a language optimized for +# scanning arbitrary text files, extracting information from those text files, +# and printing reports based on that information. +# +# When DEFAULT is not specified, --with-perl assumes 'auto'. +# +# Interface to module: +# HAVE_PERL: used in makefiles to conditionally scan text files +# PERL: returns the path of the perl program found +# returns the path set by the user in the environment +# --with-perl: 'yes' user instructs the module to use perl +# 'no' user instructs the module not to use perl +# have_perl: returns yes if perl found in PATH or no +# +# If the user sets the value of PERL, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_PERL],[ +AC_ARG_VAR([PERL], [Path to perl command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for perl MIN-VERSION is not implemented])]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(perl, + AS_HELP_STRING([--with-perl], + [Use perl for extracting information from files (default: ]_defopt[)]), + [use_perl=$withval], [use_perl=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_perl" = x"auto"; then + AC_PATH_PROG([PERL], [perl]) + if test "x$PERL" = "x"; then + AC_MSG_WARN([perl not found - cannot extract information and report]) + have_perl=no + else + have_perl=yes + fi +elif test "x$use_perl" = x"yes" ; then + AC_PATH_PROG([PERL], [perl]) + if test "x$PERL" = "x"; then + AC_MSG_ERROR([--with-perl=yes specified but perl not found in PATH]) + fi + have_perl=yes +elif test "x$use_perl" = x"no" ; then + if test "x$PERL" != "x"; then + AC_MSG_WARN([ignoring PERL environment variable since --with-perl=no was specified]) + fi + have_perl=no +else + AC_MSG_ERROR([--with-perl expects 'yes' or 'no']) +fi + +AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes]) +]) # XORG_WITH_PERL + +# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT]) +# ---------------- +# Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-asciidoc option, it allows maximum flexibilty in making decisions +# as whether or not to use the asciidoc package. When DEFAULT is not specified, +# --with-asciidoc assumes 'auto'. +# +# Interface to module: +# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation +# ASCIIDOC: returns the path of the asciidoc program found +# returns the path set by the user in the environment +# --with-asciidoc: 'yes' user instructs the module to use asciidoc +# 'no' user instructs the module not to use asciidoc +# +# If the user sets the value of ASCIIDOC, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_ASCIIDOC],[ +AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(asciidoc, + AS_HELP_STRING([--with-asciidoc], + [Use asciidoc to regenerate documentation (default: ]_defopt[)]), + [use_asciidoc=$withval], [use_asciidoc=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_asciidoc" = x"auto"; then + AC_PATH_PROG([ASCIIDOC], [asciidoc]) + if test "x$ASCIIDOC" = "x"; then + AC_MSG_WARN([asciidoc not found - documentation targets will be skipped]) + have_asciidoc=no + else + have_asciidoc=yes + fi +elif test "x$use_asciidoc" = x"yes" ; then + AC_PATH_PROG([ASCIIDOC], [asciidoc]) + if test "x$ASCIIDOC" = "x"; then + AC_MSG_ERROR([--with-asciidoc=yes specified but asciidoc not found in PATH]) + fi + have_asciidoc=yes +elif test "x$use_asciidoc" = x"no" ; then + if test "x$ASCIIDOC" != "x"; then + AC_MSG_WARN([ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified]) + fi + have_asciidoc=no +else + AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no']) +fi +m4_ifval([$1], +[if test "$have_asciidoc" = yes; then + # scrape the asciidoc version + AC_MSG_CHECKING([the asciidoc version]) + asciidoc_version=`$ASCIIDOC --version 2>/dev/null | cut -d' ' -f2` + AC_MSG_RESULT([$asciidoc_version]) + AS_VERSION_COMPARE([$asciidoc_version], [$1], + [if test "x$use_asciidoc" = xauto; then + AC_MSG_WARN([asciidoc version $asciidoc_version found, but $1 needed]) + have_asciidoc=no + else + AC_MSG_ERROR([asciidoc version $asciidoc_version found, but $1 needed]) + fi]) +fi]) +AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) +]) # XORG_WITH_ASCIIDOC + +# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT]) +# ------------------------------------------- +# Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# Minimum version for optional DOT checking: 1.18.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-doxygen option, it allows maximum flexibilty in making decisions +# as whether or not to use the doxygen package. When DEFAULT is not specified, +# --with-doxygen assumes 'auto'. +# +# Interface to module: +# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation +# DOXYGEN: returns the path of the doxygen program found +# returns the path set by the user in the environment +# --with-doxygen: 'yes' user instructs the module to use doxygen +# 'no' user instructs the module not to use doxygen +# +# If the user sets the value of DOXYGEN, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_DOXYGEN],[ +AC_ARG_VAR([DOXYGEN], [Path to doxygen command]) +AC_ARG_VAR([DOT], [Path to the dot graphics utility]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(doxygen, + AS_HELP_STRING([--with-doxygen], + [Use doxygen to regenerate documentation (default: ]_defopt[)]), + [use_doxygen=$withval], [use_doxygen=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_doxygen" = x"auto"; then + AC_PATH_PROG([DOXYGEN], [doxygen]) + if test "x$DOXYGEN" = "x"; then + AC_MSG_WARN([doxygen not found - documentation targets will be skipped]) + have_doxygen=no + else + have_doxygen=yes + fi +elif test "x$use_doxygen" = x"yes" ; then + AC_PATH_PROG([DOXYGEN], [doxygen]) + if test "x$DOXYGEN" = "x"; then + AC_MSG_ERROR([--with-doxygen=yes specified but doxygen not found in PATH]) + fi + have_doxygen=yes +elif test "x$use_doxygen" = x"no" ; then + if test "x$DOXYGEN" != "x"; then + AC_MSG_WARN([ignoring DOXYGEN environment variable since --with-doxygen=no was specified]) + fi + have_doxygen=no +else + AC_MSG_ERROR([--with-doxygen expects 'yes' or 'no']) +fi +m4_ifval([$1], +[if test "$have_doxygen" = yes; then + # scrape the doxygen version + AC_MSG_CHECKING([the doxygen version]) + doxygen_version=`$DOXYGEN --version 2>/dev/null` + AC_MSG_RESULT([$doxygen_version]) + AS_VERSION_COMPARE([$doxygen_version], [$1], + [if test "x$use_doxygen" = xauto; then + AC_MSG_WARN([doxygen version $doxygen_version found, but $1 needed]) + have_doxygen=no + else + AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed]) + fi]) +fi]) + +dnl Check for DOT if we have doxygen. The caller decides if it is mandatory +dnl HAVE_DOT is a variable that can be used in your doxygen.in config file: +dnl HAVE_DOT = @HAVE_DOT@ +HAVE_DOT=no +if test "x$have_doxygen" = "xyes"; then + AC_PATH_PROG([DOT], [dot]) + if test "x$DOT" != "x"; then + HAVE_DOT=yes + fi +fi + +AC_SUBST([HAVE_DOT]) +AM_CONDITIONAL([HAVE_DOT], [test "$HAVE_DOT" = "yes"]) +AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) +]) # XORG_WITH_DOXYGEN + +# XORG_WITH_GROFF([DEFAULT]) +# ---------------- +# Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-groff option, it allows maximum flexibilty in making decisions +# as whether or not to use the groff package. When DEFAULT is not specified, +# --with-groff assumes 'auto'. +# +# Interface to module: +# HAVE_GROFF: used in makefiles to conditionally generate documentation +# HAVE_GROFF_MM: the memorandum macros (-mm) package +# HAVE_GROFF_MS: the -ms macros package +# GROFF: returns the path of the groff program found +# returns the path set by the user in the environment +# --with-groff: 'yes' user instructs the module to use groff +# 'no' user instructs the module not to use groff +# +# Added in version 1.9.0: +# HAVE_GROFF_HTML: groff has dependencies to output HTML format: +# pnmcut pnmcrop pnmtopng pnmtops from the netpbm package. +# psselect from the psutils package. +# the ghostcript package. Refer to the grohtml man pages +# +# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path. +# +# OS and distros often splits groff in a basic and full package, the former +# having the groff program and the later having devices, fonts and macros +# Checking for the groff executable is not enough. +# +# If macros are missing, we cannot assume that groff is useless, so we don't +# unset HAVE_GROFF or GROFF env variables. +# HAVE_GROFF_?? can never be true while HAVE_GROFF is false. +# +AC_DEFUN([XORG_WITH_GROFF],[ +AC_ARG_VAR([GROFF], [Path to groff command]) +m4_define([_defopt], m4_default([$1], [auto])) +AC_ARG_WITH(groff, + AS_HELP_STRING([--with-groff], + [Use groff to regenerate documentation (default: ]_defopt[)]), + [use_groff=$withval], [use_groff=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_groff" = x"auto"; then + AC_PATH_PROG([GROFF], [groff]) + if test "x$GROFF" = "x"; then + AC_MSG_WARN([groff not found - documentation targets will be skipped]) + have_groff=no + else + have_groff=yes + fi +elif test "x$use_groff" = x"yes" ; then + AC_PATH_PROG([GROFF], [groff]) + if test "x$GROFF" = "x"; then + AC_MSG_ERROR([--with-groff=yes specified but groff not found in PATH]) + fi + have_groff=yes +elif test "x$use_groff" = x"no" ; then + if test "x$GROFF" != "x"; then + AC_MSG_WARN([ignoring GROFF environment variable since --with-groff=no was specified]) + fi + have_groff=no +else + AC_MSG_ERROR([--with-groff expects 'yes' or 'no']) +fi + +# We have groff, test for the presence of the macro packages +if test "x$have_groff" = x"yes"; then + AC_MSG_CHECKING([for ${GROFF} -ms macros]) + if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then + groff_ms_works=yes + else + groff_ms_works=no + fi + AC_MSG_RESULT([$groff_ms_works]) + AC_MSG_CHECKING([for ${GROFF} -mm macros]) + if ${GROFF} -mm -I. /dev/null >/dev/null 2>&1 ; then + groff_mm_works=yes + else + groff_mm_works=no + fi + AC_MSG_RESULT([$groff_mm_works]) +fi + +# We have groff, test for HTML dependencies, one command per package +if test "x$have_groff" = x"yes"; then + AC_PATH_PROGS(GS_PATH, [gs gswin32c]) + AC_PATH_PROG(PNMTOPNG_PATH, [pnmtopng]) + AC_PATH_PROG(PSSELECT_PATH, [psselect]) + if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then + have_groff_html=yes + else + have_groff_html=no + AC_MSG_WARN([grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages]) + fi +fi + +# Set Automake conditionals for Makefiles +AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes]) +AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes]) +AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes]) +AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) +]) # XORG_WITH_GROFF + +# XORG_WITH_FOP([MIN-VERSION], [DEFAULT]) +# --------------------------------------- +# Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# Minimum version for optional MIN-VERSION argument: 1.15.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-fop option, it allows maximum flexibilty in making decisions +# as whether or not to use the fop package. When DEFAULT is not specified, +# --with-fop assumes 'auto'. +# +# Interface to module: +# HAVE_FOP: used in makefiles to conditionally generate documentation +# FOP: returns the path of the fop program found +# returns the path set by the user in the environment +# --with-fop: 'yes' user instructs the module to use fop +# 'no' user instructs the module not to use fop +# +# If the user sets the value of FOP, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_FOP],[ +AC_ARG_VAR([FOP], [Path to fop command]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(fop, + AS_HELP_STRING([--with-fop], + [Use fop to regenerate documentation (default: ]_defopt[)]), + [use_fop=$withval], [use_fop=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_fop" = x"auto"; then + AC_PATH_PROG([FOP], [fop]) + if test "x$FOP" = "x"; then + AC_MSG_WARN([fop not found - documentation targets will be skipped]) + have_fop=no + else + have_fop=yes + fi +elif test "x$use_fop" = x"yes" ; then + AC_PATH_PROG([FOP], [fop]) + if test "x$FOP" = "x"; then + AC_MSG_ERROR([--with-fop=yes specified but fop not found in PATH]) + fi + have_fop=yes +elif test "x$use_fop" = x"no" ; then + if test "x$FOP" != "x"; then + AC_MSG_WARN([ignoring FOP environment variable since --with-fop=no was specified]) + fi + have_fop=no +else + AC_MSG_ERROR([--with-fop expects 'yes' or 'no']) +fi + +# Test for a minimum version of fop, if provided. +m4_ifval([$1], +[if test "$have_fop" = yes; then + # scrape the fop version + AC_MSG_CHECKING([for fop minimum version]) + fop_version=`$FOP -version 2>/dev/null | cut -d' ' -f3` + AC_MSG_RESULT([$fop_version]) + AS_VERSION_COMPARE([$fop_version], [$1], + [if test "x$use_fop" = xauto; then + AC_MSG_WARN([fop version $fop_version found, but $1 needed]) + have_fop=no + else + AC_MSG_ERROR([fop version $fop_version found, but $1 needed]) + fi]) +fi]) +AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) +]) # XORG_WITH_FOP + +# XORG_WITH_M4([MIN-VERSION]) +# --------------------------- +# Minimum version: 1.19.0 +# +# This macro attempts to locate an m4 macro processor which supports +# -I option and is only useful for modules relying on M4 in order to +# expand macros in source code files. +# +# Interface to module: +# M4: returns the path of the m4 program found +# returns the path set by the user in the environment +# +AC_DEFUN([XORG_WITH_M4], [ +AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4], + [AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4], + [[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \ + ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]], + [AC_MSG_ERROR([could not find m4 that supports -I option])], + [$PATH:/usr/gnu/bin])]) + +AC_SUBST([M4], [$ac_cv_path_M4]) +]) # XORG_WITH_M4 + +# XORG_WITH_PS2PDF([DEFAULT]) +# ---------------- +# Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-ps2pdf option, it allows maximum flexibilty in making decisions +# as whether or not to use the ps2pdf package. When DEFAULT is not specified, +# --with-ps2pdf assumes 'auto'. +# +# Interface to module: +# HAVE_PS2PDF: used in makefiles to conditionally generate documentation +# PS2PDF: returns the path of the ps2pdf program found +# returns the path set by the user in the environment +# --with-ps2pdf: 'yes' user instructs the module to use ps2pdf +# 'no' user instructs the module not to use ps2pdf +# +# If the user sets the value of PS2PDF, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_PS2PDF],[ +AC_ARG_VAR([PS2PDF], [Path to ps2pdf command]) +m4_define([_defopt], m4_default([$1], [auto])) +AC_ARG_WITH(ps2pdf, + AS_HELP_STRING([--with-ps2pdf], + [Use ps2pdf to regenerate documentation (default: ]_defopt[)]), + [use_ps2pdf=$withval], [use_ps2pdf=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_ps2pdf" = x"auto"; then + AC_PATH_PROG([PS2PDF], [ps2pdf]) + if test "x$PS2PDF" = "x"; then + AC_MSG_WARN([ps2pdf not found - documentation targets will be skipped]) + have_ps2pdf=no + else + have_ps2pdf=yes + fi +elif test "x$use_ps2pdf" = x"yes" ; then + AC_PATH_PROG([PS2PDF], [ps2pdf]) + if test "x$PS2PDF" = "x"; then + AC_MSG_ERROR([--with-ps2pdf=yes specified but ps2pdf not found in PATH]) + fi + have_ps2pdf=yes +elif test "x$use_ps2pdf" = x"no" ; then + if test "x$PS2PDF" != "x"; then + AC_MSG_WARN([ignoring PS2PDF environment variable since --with-ps2pdf=no was specified]) + fi + have_ps2pdf=no +else + AC_MSG_ERROR([--with-ps2pdf expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) +]) # XORG_WITH_PS2PDF + +# XORG_ENABLE_DOCS (enable_docs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a builder to skip all +# documentation targets except traditional man pages. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_DOCS: used in makefiles to conditionally generate documentation +# --enable-docs: 'yes' user instructs the module to generate docs +# 'no' user instructs the module not to generate docs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_DOCS],[ +m4_define([docs_default], m4_default([$1], [yes])) +AC_ARG_ENABLE(docs, + AS_HELP_STRING([--enable-docs], + [Enable building the documentation (default: ]docs_default[)]), + [build_docs=$enableval], [build_docs=]docs_default) +m4_undefine([docs_default]) +AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) +AC_MSG_CHECKING([whether to build documentation]) +AC_MSG_RESULT([$build_docs]) +]) # XORG_ENABLE_DOCS + +# XORG_ENABLE_DEVEL_DOCS (enable_devel_docs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# This macro enables a builder to skip all developer documentation. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_DEVEL_DOCS: used in makefiles to conditionally generate developer docs +# --enable-devel-docs: 'yes' user instructs the module to generate developer docs +# 'no' user instructs the module not to generate developer docs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[ +m4_define([devel_default], m4_default([$1], [yes])) +AC_ARG_ENABLE(devel-docs, + AS_HELP_STRING([--enable-devel-docs], + [Enable building the developer documentation (default: ]devel_default[)]), + [build_devel_docs=$enableval], [build_devel_docs=]devel_default) +m4_undefine([devel_default]) +AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes]) +AC_MSG_CHECKING([whether to build developer documentation]) +AC_MSG_RESULT([$build_devel_docs]) +]) # XORG_ENABLE_DEVEL_DOCS + +# XORG_ENABLE_SPECS (enable_specs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# This macro enables a builder to skip all functional specification targets. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_SPECS: used in makefiles to conditionally generate specs +# --enable-specs: 'yes' user instructs the module to generate specs +# 'no' user instructs the module not to generate specs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_SPECS],[ +m4_define([spec_default], m4_default([$1], [yes])) +AC_ARG_ENABLE(specs, + AS_HELP_STRING([--enable-specs], + [Enable building the specs (default: ]spec_default[)]), + [build_specs=$enableval], [build_specs=]spec_default) +m4_undefine([spec_default]) +AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes]) +AC_MSG_CHECKING([whether to build functional specifications]) +AC_MSG_RESULT([$build_specs]) +]) # XORG_ENABLE_SPECS + +# XORG_ENABLE_UNIT_TESTS (enable_unit_tests=auto) +# ---------------------------------------------- +# Minimum version: 1.13.0 +# +# This macro enables a builder to enable/disable unit testing +# It makes no assumption about the test cases implementation +# Test cases may or may not use Automake "Support for test suites" +# They may or may not use the software utility library GLib +# +# When used in conjunction with XORG_WITH_GLIB, use both AM_CONDITIONAL +# ENABLE_UNIT_TESTS and HAVE_GLIB. Not all unit tests may use glib. +# The variable enable_unit_tests is used by other macros in this file. +# +# Interface to module: +# ENABLE_UNIT_TESTS: used in makefiles to conditionally build tests +# enable_unit_tests: used in configure.ac for additional configuration +# --enable-unit-tests: 'yes' user instructs the module to build tests +# 'no' user instructs the module not to build tests +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_UNIT_TESTS],[ +AC_BEFORE([$0], [XORG_WITH_GLIB]) +AC_BEFORE([$0], [XORG_LD_WRAP]) +AC_REQUIRE([XORG_MEMORY_CHECK_FLAGS]) +m4_define([_defopt], m4_default([$1], [auto])) +AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests], + [Enable building unit test cases (default: ]_defopt[)]), + [enable_unit_tests=$enableval], [enable_unit_tests=]_defopt) +m4_undefine([_defopt]) +AM_CONDITIONAL(ENABLE_UNIT_TESTS, [test "x$enable_unit_tests" != xno]) +AC_MSG_CHECKING([whether to build unit test cases]) +AC_MSG_RESULT([$enable_unit_tests]) +]) # XORG_ENABLE_UNIT_TESTS + +# XORG_ENABLE_INTEGRATION_TESTS (enable_unit_tests=auto) +# ------------------------------------------------------ +# Minimum version: 1.17.0 +# +# This macro enables a builder to enable/disable integration testing +# It makes no assumption about the test cases' implementation +# Test cases may or may not use Automake "Support for test suites" +# +# Please see XORG_ENABLE_UNIT_TESTS for unit test support. Unit test support +# usually requires less dependencies and may be built and run under less +# stringent environments than integration tests. +# +# Interface to module: +# ENABLE_INTEGRATION_TESTS: used in makefiles to conditionally build tests +# enable_integration_tests: used in configure.ac for additional configuration +# --enable-integration-tests: 'yes' user instructs the module to build tests +# 'no' user instructs the module not to build tests +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_INTEGRATION_TESTS],[ +AC_REQUIRE([XORG_MEMORY_CHECK_FLAGS]) +m4_define([_defopt], m4_default([$1], [auto])) +AC_ARG_ENABLE(integration-tests, AS_HELP_STRING([--enable-integration-tests], + [Enable building integration test cases (default: ]_defopt[)]), + [enable_integration_tests=$enableval], + [enable_integration_tests=]_defopt) +m4_undefine([_defopt]) +AM_CONDITIONAL([ENABLE_INTEGRATION_TESTS], + [test "x$enable_integration_tests" != xno]) +AC_MSG_CHECKING([whether to build unit test cases]) +AC_MSG_RESULT([$enable_integration_tests]) +]) # XORG_ENABLE_INTEGRATION_TESTS + +# XORG_WITH_GLIB([MIN-VERSION], [DEFAULT]) +# ---------------------------------------- +# Minimum version: 1.13.0 +# +# GLib is a library which provides advanced data structures and functions. +# This macro enables a module to test for the presence of Glib. +# +# When used with ENABLE_UNIT_TESTS, it is assumed GLib is used for unit testing. +# Otherwise the value of $enable_unit_tests is blank. +# +# Please see XORG_ENABLE_INTEGRATION_TESTS for integration test support. Unit +# test support usually requires less dependencies and may be built and run under +# less stringent environments than integration tests. +# +# Interface to module: +# HAVE_GLIB: used in makefiles to conditionally build targets +# with_glib: used in configure.ac to know if GLib has been found +# --with-glib: 'yes' user instructs the module to use glib +# 'no' user instructs the module not to use glib +# +AC_DEFUN([XORG_WITH_GLIB],[ +AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(glib, AS_HELP_STRING([--with-glib], + [Use GLib library for unit testing (default: ]_defopt[)]), + [with_glib=$withval], [with_glib=]_defopt) +m4_undefine([_defopt]) + +have_glib=no +# Do not probe GLib if user explicitly disabled unit testing +if test "x$enable_unit_tests" != x"no"; then + # Do not probe GLib if user explicitly disabled it + if test "x$with_glib" != x"no"; then + m4_ifval( + [$1], + [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $1], [have_glib=yes], [have_glib=no])], + [PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])] + ) + fi +fi + +# Not having GLib when unit testing has been explicitly requested is an error +if test "x$enable_unit_tests" = x"yes"; then + if test "x$have_glib" = x"no"; then + AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found]) + fi +fi + +# Having unit testing disabled when GLib has been explicitly requested is an error +if test "x$enable_unit_tests" = x"no"; then + if test "x$with_glib" = x"yes"; then + AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found]) + fi +fi + +# Not having GLib when it has been explicitly requested is an error +if test "x$with_glib" = x"yes"; then + if test "x$have_glib" = x"no"; then + AC_MSG_ERROR([--with-glib=yes specified but glib-2.0 not found]) + fi +fi + +AM_CONDITIONAL([HAVE_GLIB], [test "$have_glib" = yes]) +]) # XORG_WITH_GLIB + +# XORG_LD_WRAP([required|optional]) +# --------------------------------- +# Minimum version: 1.13.0 +# +# Check if linker supports -wrap, passed via compiler flags +# +# When used with ENABLE_UNIT_TESTS, it is assumed -wrap is used for unit testing. +# Otherwise the value of $enable_unit_tests is blank. +# +# Argument added in 1.16.0 - default is "required", to match existing behavior +# of returning an error if enable_unit_tests is yes, and ld -wrap is not +# available, an argument of "optional" allows use when some unit tests require +# ld -wrap and others do not. +# +AC_DEFUN([XORG_LD_WRAP],[ +XORG_CHECK_LINKER_FLAGS([-Wl,-wrap,exit],[have_ld_wrap=yes],[have_ld_wrap=no], + [AC_LANG_PROGRAM([#include + void __wrap_exit(int status) { return; }], + [exit(0);])]) +# Not having ld wrap when unit testing has been explicitly requested is an error +if test "x$enable_unit_tests" = x"yes" -a "x$1" != "xoptional"; then + if test "x$have_ld_wrap" = x"no"; then + AC_MSG_ERROR([--enable-unit-tests=yes specified but ld -wrap support is not available]) + fi +fi +AM_CONDITIONAL([HAVE_LD_WRAP], [test "$have_ld_wrap" = yes]) +# +]) # XORG_LD_WRAP + +# XORG_CHECK_LINKER_FLAGS +# ----------------------- +# SYNOPSIS +# +# XORG_CHECK_LINKER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE], [PROGRAM-SOURCE]) +# +# DESCRIPTION +# +# Check whether the given linker FLAGS work with the current language's +# linker, or whether they give an error. +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# PROGRAM-SOURCE is the program source to link with, if needed +# +# NOTE: Based on AX_CHECK_COMPILER_FLAGS. +# +# LICENSE +# +# Copyright (c) 2009 Mike Frysinger +# Copyright (c) 2009 Steven G. Johnson +# Copyright (c) 2009 Matteo Frigo +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well.# +AC_DEFUN([XORG_CHECK_LINKER_FLAGS], +[AC_MSG_CHECKING([whether the linker accepts $1]) +dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname: +AS_LITERAL_IF([$1], + [AC_CACHE_VAL(AS_TR_SH(xorg_cv_linker_flags_[$1]), [ + ax_save_FLAGS=$LDFLAGS + LDFLAGS="$1" + AC_LINK_IFELSE([m4_default([$4],[AC_LANG_PROGRAM()])], + AS_TR_SH(xorg_cv_linker_flags_[$1])=yes, + AS_TR_SH(xorg_cv_linker_flags_[$1])=no) + LDFLAGS=$ax_save_FLAGS])], + [ax_save_FLAGS=$LDFLAGS + LDFLAGS="$1" + AC_LINK_IFELSE([AC_LANG_PROGRAM()], + eval AS_TR_SH(xorg_cv_linker_flags_[$1])=yes, + eval AS_TR_SH(xorg_cv_linker_flags_[$1])=no) + LDFLAGS=$ax_save_FLAGS]) +eval xorg_check_linker_flags=$AS_TR_SH(xorg_cv_linker_flags_[$1]) +AC_MSG_RESULT($xorg_check_linker_flags) +if test "x$xorg_check_linker_flags" = xyes; then + m4_default([$2], :) +else + m4_default([$3], :) +fi +]) # XORG_CHECK_LINKER_FLAGS + +# XORG_MEMORY_CHECK_FLAGS +# ----------------------- +# Minimum version: 1.16.0 +# +# This macro attempts to find appropriate memory checking functionality +# for various platforms which unit testing code may use to catch various +# forms of memory allocation and access errors in testing. +# +# Interface to module: +# XORG_MALLOC_DEBUG_ENV - environment variables to set to enable debugging +# Usually added to TESTS_ENVIRONMENT in Makefile.am +# +# If the user sets the value of XORG_MALLOC_DEBUG_ENV, it is used verbatim. +# +AC_DEFUN([XORG_MEMORY_CHECK_FLAGS],[ + +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_ARG_VAR([XORG_MALLOC_DEBUG_ENV], + [Environment variables to enable memory checking in tests]) + +# Check for different types of support on different platforms +case $host_os in + solaris*) + AC_CHECK_LIB([umem], [umem_alloc], + [malloc_debug_env='LD_PRELOAD=libumem.so UMEM_DEBUG=default']) + ;; + *-gnu*) # GNU libc - Value is used as a single byte bit pattern, + # both directly and inverted, so should not be 0 or 255. + malloc_debug_env='MALLOC_PERTURB_=15' + ;; + darwin*) + malloc_debug_env='MallocPreScribble=1 MallocScribble=1 DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib' + ;; + *bsd*) + malloc_debug_env='MallocPreScribble=1 MallocScribble=1' + ;; +esac + +# User supplied flags override default flags +if test "x$XORG_MALLOC_DEBUG_ENV" != "x"; then + malloc_debug_env="$XORG_MALLOC_DEBUG_ENV" +fi + +AC_SUBST([XORG_MALLOC_DEBUG_ENV],[$malloc_debug_env]) +]) # XORG_WITH_LINT + +# XORG_CHECK_MALLOC_ZERO +# ---------------------- +# Minimum version: 1.0.0 +# +# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if +# malloc(0) returns NULL. Packages should add one of these cflags to +# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. +AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ +AC_ARG_ENABLE(malloc0returnsnull, + AS_HELP_STRING([--enable-malloc0returnsnull], + [malloc(0) returns NULL (default: auto)]), + [MALLOC_ZERO_RETURNS_NULL=$enableval], + [MALLOC_ZERO_RETURNS_NULL=auto]) + +AC_MSG_CHECKING([whether malloc(0) returns NULL]) +if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then +AC_CACHE_VAL([xorg_cv_malloc0_returns_null], + [AC_RUN_IFELSE([AC_LANG_PROGRAM([ +#include +],[ + char *m0, *r0, *c0, *p; + m0 = malloc(0); + p = malloc(10); + r0 = realloc(p,0); + c0 = calloc(0,10); + exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1); +])], + [xorg_cv_malloc0_returns_null=yes], + [xorg_cv_malloc0_returns_null=no])]) +MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null +fi +AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) + +if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then + MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL" + XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS + XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC" +else + MALLOC_ZERO_CFLAGS="" + XMALLOC_ZERO_CFLAGS="" + XTMALLOC_ZERO_CFLAGS="" +fi + +AC_SUBST([MALLOC_ZERO_CFLAGS]) +AC_SUBST([XMALLOC_ZERO_CFLAGS]) +AC_SUBST([XTMALLOC_ZERO_CFLAGS]) +]) # XORG_CHECK_MALLOC_ZERO + +# XORG_WITH_LINT() +# ---------------- +# Minimum version: 1.1.0 +# +# This macro enables the use of a tool that flags some suspicious and +# non-portable constructs (likely to be bugs) in C language source code. +# It will attempt to locate the tool and use appropriate options. +# There are various lint type tools on different platforms. +# +# Interface to module: +# LINT: returns the path to the tool found on the platform +# or the value set to LINT on the configure cmd line +# also an Automake conditional +# LINT_FLAGS: an Automake variable with appropriate flags +# +# --with-lint: 'yes' user instructs the module to use lint +# 'no' user instructs the module not to use lint (default) +# +# If the user sets the value of LINT, AC_PATH_PROG skips testing the path. +# If the user sets the value of LINT_FLAGS, they are used verbatim. +# +AC_DEFUN([XORG_WITH_LINT],[ + +AC_ARG_VAR([LINT], [Path to a lint-style command]) +AC_ARG_VAR([LINT_FLAGS], [Flags for the lint-style command]) +AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint], + [Use a lint-style source code checker (default: disabled)])], + [use_lint=$withval], [use_lint=no]) + +# Obtain platform specific info like program name and options +# The lint program on FreeBSD and NetBSD is different from the one on Solaris +case $host_os in + *linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*) + lint_name=splint + lint_options="-badflag" + ;; + *freebsd* | *netbsd*) + lint_name=lint + lint_options="-u -b" + ;; + *solaris*) + lint_name=lint + lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" + ;; +esac + +# Test for the presence of the program (either guessed by the code or spelled out by the user) +if test "x$use_lint" = x"yes" ; then + AC_PATH_PROG([LINT], [$lint_name]) + if test "x$LINT" = "x"; then + AC_MSG_ERROR([--with-lint=yes specified but lint-style tool not found in PATH]) + fi +elif test "x$use_lint" = x"no" ; then + if test "x$LINT" != "x"; then + AC_MSG_WARN([ignoring LINT environment variable since --with-lint=no was specified]) + fi +else + AC_MSG_ERROR([--with-lint expects 'yes' or 'no'. Use LINT variable to specify path.]) +fi + +# User supplied flags override default flags +if test "x$LINT_FLAGS" != "x"; then + lint_options=$LINT_FLAGS +fi + +AC_SUBST([LINT_FLAGS],[$lint_options]) +AM_CONDITIONAL(LINT, [test "x$LINT" != x]) + +]) # XORG_WITH_LINT + +# XORG_LINT_LIBRARY(LIBNAME) +# -------------------------- +# Minimum version: 1.1.0 +# +# Sets up flags for building lint libraries for checking programs that call +# functions in the library. +# +# Interface to module: +# LINTLIB - Automake variable with the name of lint library file to make +# MAKE_LINT_LIB - Automake conditional +# +# --enable-lint-library: - 'yes' user instructs the module to created a lint library +# - 'no' user instructs the module not to create a lint library (default) + +AC_DEFUN([XORG_LINT_LIBRARY],[ +AC_REQUIRE([XORG_WITH_LINT]) +AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library], + [Create lint library (default: disabled)])], + [make_lint_lib=$enableval], [make_lint_lib=no]) + +if test "x$make_lint_lib" = x"yes" ; then + LINTLIB=llib-l$1.ln + if test "x$LINT" = "x"; then + AC_MSG_ERROR([Cannot make lint library without --with-lint]) + fi +elif test "x$make_lint_lib" != x"no" ; then + AC_MSG_ERROR([--enable-lint-library expects 'yes' or 'no'.]) +fi + +AC_SUBST(LINTLIB) +AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) + +]) # XORG_LINT_LIBRARY + +# XORG_COMPILER_BRAND +# ------------------- +# Minimum version: 1.14.0 +# +# Checks for various brands of compilers and sets flags as appropriate: +# GNU gcc - relies on AC_PROG_CC (via AC_PROG_CC_C99) to set GCC to "yes" +# GNU g++ - relies on AC_PROG_CXX to set GXX to "yes" +# clang compiler - sets CLANGCC to "yes" +# Intel compiler - sets INTELCC to "yes" +# Sun/Oracle Solaris Studio cc - sets SUNCC to "yes" +# +AC_DEFUN([XORG_COMPILER_BRAND], [ +AC_LANG_CASE( + [C], [ + AC_REQUIRE([AC_PROG_CC_C99]) + ], + [C++], [ + AC_REQUIRE([AC_PROG_CXX]) + ] +) +AC_CHECK_DECL([__clang__], [CLANGCC="yes"], [CLANGCC="no"]) +AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) +AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) +]) # XORG_COMPILER_BRAND + +# XORG_TESTSET_CFLAG(, , [, ...]) +# --------------- +# Minimum version: 1.16.0 +# +# Test if the compiler works when passed the given flag as a command line argument. +# If it succeeds, the flag is appeneded to the given variable. If not, it tries the +# next flag in the list until there are no more options. +# +# Note that this does not guarantee that the compiler supports the flag as some +# compilers will simply ignore arguments that they do not understand, but we do +# attempt to weed out false positives by using -Werror=unknown-warning-option and +# -Werror=unused-command-line-argument +# +AC_DEFUN([XORG_TESTSET_CFLAG], [ +m4_if([$#], 0, [m4_fatal([XORG_TESTSET_CFLAG was given with an unsupported number of arguments])]) +m4_if([$#], 1, [m4_fatal([XORG_TESTSET_CFLAG was given with an unsupported number of arguments])]) + +AC_LANG_COMPILER_REQUIRE + +AC_LANG_CASE( + [C], [ + AC_REQUIRE([AC_PROG_CC_C99]) + define([PREFIX], [C]) + define([CACHE_PREFIX], [cc]) + define([COMPILER], [$CC]) + ], + [C++], [ + define([PREFIX], [CXX]) + define([CACHE_PREFIX], [cxx]) + define([COMPILER], [$CXX]) + ] +) + +[xorg_testset_save_]PREFIX[FLAGS]="$PREFIX[FLAGS]" + +if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "x" ; then + PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option" + AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unknown-warning-option], + [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], + [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=yes], + [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=no])) + [xorg_testset_]CACHE_PREFIX[_unknown_warning_option]=$[xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option] + PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]" +fi + +if test "x$[xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]" = "x" ; then + if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "xyes" ; then + PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option" + fi + PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument" + AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unused-command-line-argument], + [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], + [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=yes], + [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=no])) + [xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]=$[xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument] + PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]" +fi + +found="no" +m4_foreach([flag], m4_cdr($@), [ + if test $found = "no" ; then + if test "x$xorg_testset_]CACHE_PREFIX[_unknown_warning_option" = "xyes" ; then + PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_]CACHE_PREFIX[_unused_command_line_argument" = "xyes" ; then + PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument" + fi + + PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag[" + +dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname + AC_MSG_CHECKING([if ]COMPILER[ supports ]flag[]) + cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[]) + AC_CACHE_VAL($cacheid, + [AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])], + [eval $cacheid=yes], + [eval $cacheid=no])]) + + PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]" + + eval supported=\$$cacheid + AC_MSG_RESULT([$supported]) + if test "$supported" = "yes" ; then + $1="$$1 ]flag[" + found="yes" + fi + fi +]) +]) # XORG_TESTSET_CFLAG + +# XORG_COMPILER_FLAGS +# --------------- +# Minimum version: 1.16.0 +# +# Defines BASE_CFLAGS or BASE_CXXFLAGS to contain a set of command line +# arguments supported by the selected compiler which do NOT alter the generated +# code. These arguments will cause the compiler to print various warnings +# during compilation AND turn a conservative set of warnings into errors. +# +# The set of flags supported by BASE_CFLAGS and BASE_CXXFLAGS will grow in +# future versions of util-macros as options are added to new compilers. +# +AC_DEFUN([XORG_COMPILER_FLAGS], [ +AC_REQUIRE([XORG_COMPILER_BRAND]) + +AC_ARG_ENABLE(selective-werror, + AS_HELP_STRING([--disable-selective-werror], + [Turn off selective compiler errors. (default: enabled)]), + [SELECTIVE_WERROR=$enableval], + [SELECTIVE_WERROR=yes]) + +AC_LANG_CASE( + [C], [ + define([PREFIX], [C]) + ], + [C++], [ + define([PREFIX], [CXX]) + ] +) +# -v is too short to test reliably with XORG_TESTSET_CFLAG +if test "x$SUNCC" = "xyes"; then + [BASE_]PREFIX[FLAGS]="-v" +else + [BASE_]PREFIX[FLAGS]="" +fi + +# This chunk of warnings were those that existed in the legacy CWARNFLAGS +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wall]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-arith]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-declarations]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wformat=2], [-Wformat]) + +AC_LANG_CASE( + [C], [ + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wstrict-prototypes]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition], [-fd]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement]) + ] +) + +# This chunk adds additional warnings that could catch undesired effects. +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) + +# These are currently disabled because they are noisy. They will be enabled +# in the future once the codebase is sufficiently modernized to silence +# them. For now, I don't want them to drown out the other warnings. +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) + +# Turn some warnings into errors, so we don't accidently get successful builds +# when there are problems that should be fixed. + +if test "x$SELECTIVE_WERROR" = "xyes" ; then +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=implicit], [-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=nonnull]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=init-self]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=main]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=missing-braces]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=sequence-point]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=return-type], [-errwarn=E_FUNC_HAS_NO_RETURN_STMT]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=trigraphs]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=array-bounds]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=write-strings]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=address]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=int-to-pointer-cast], [-errwarn=E_BAD_PTR_INT_COMBINATION]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=pointer-to-int-cast]) # Also -errwarn=E_BAD_PTR_INT_COMBINATION +else +AC_MSG_WARN([You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wimplicit]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnonnull]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Winit-self]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmain]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-braces]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wsequence-point]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wreturn-type]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wtrigraphs]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Warray-bounds]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wwrite-strings]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Waddress]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wint-to-pointer-cast]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-to-int-cast]) +fi + +AC_SUBST([BASE_]PREFIX[FLAGS]) +]) # XORG_COMPILER_FLAGS + +# XORG_CWARNFLAGS +# --------------- +# Minimum version: 1.2.0 +# Deprecated since: 1.16.0 (Use XORG_COMPILER_FLAGS instead) +# +# Defines CWARNFLAGS to enable C compiler warnings. +# +# This function is deprecated because it defines -fno-strict-aliasing +# which alters the code generated by the compiler. If -fno-strict-aliasing +# is needed, then it should be added explicitly in the module when +# it is updated to use BASE_CFLAGS. +# +AC_DEFUN([XORG_CWARNFLAGS], [ +AC_REQUIRE([XORG_COMPILER_FLAGS]) +AC_REQUIRE([XORG_COMPILER_BRAND]) +AC_LANG_CASE( + [C], [ + CWARNFLAGS="$BASE_CFLAGS" + if test "x$GCC" = xyes ; then + CWARNFLAGS="$CWARNFLAGS -fno-strict-aliasing" + fi + AC_SUBST(CWARNFLAGS) + ] +) +]) # XORG_CWARNFLAGS + +# XORG_STRICT_OPTION +# ----------------------- +# Minimum version: 1.3.0 +# +# Add configure option to enable strict compilation flags, such as treating +# warnings as fatal errors. +# If --enable-strict-compilation is passed to configure, adds strict flags to +# $BASE_CFLAGS or $BASE_CXXFLAGS and the deprecated $CWARNFLAGS. +# +# Starting in 1.14.0 also exports $STRICT_CFLAGS for use in other tests or +# when strict compilation is unconditionally desired. +AC_DEFUN([XORG_STRICT_OPTION], [ +AC_REQUIRE([XORG_CWARNFLAGS]) +AC_REQUIRE([XORG_COMPILER_FLAGS]) + +AC_ARG_ENABLE(strict-compilation, + AS_HELP_STRING([--enable-strict-compilation], + [Enable all warnings from compiler and make them errors (default: disabled)]), + [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no]) + +AC_LANG_CASE( + [C], [ + define([PREFIX], [C]) + ], + [C++], [ + define([PREFIX], [CXX]) + ] +) + +[STRICT_]PREFIX[FLAGS]="" +XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-pedantic]) +XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-Werror], [-errwarn]) + +# Earlier versions of gcc (eg: 4.2) support -Werror=attributes, but do not +# activate it with -Werror, so we add it here explicitly. +XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-Werror=attributes]) + +if test "x$STRICT_COMPILE" = "xyes"; then + [BASE_]PREFIX[FLAGS]="$[BASE_]PREFIX[FLAGS] $[STRICT_]PREFIX[FLAGS]" + AC_LANG_CASE([C], [CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"]) +fi +AC_SUBST([STRICT_]PREFIX[FLAGS]) +AC_SUBST([BASE_]PREFIX[FLAGS]) +AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS])) +]) # XORG_STRICT_OPTION + +# XORG_DEFAULT_OPTIONS +# -------------------- +# Minimum version: 1.3.0 +# +# Defines default options for X.Org modules. +# +AC_DEFUN([XORG_DEFAULT_OPTIONS], [ +AC_REQUIRE([AC_PROG_INSTALL]) +XORG_COMPILER_FLAGS +XORG_CWARNFLAGS +XORG_STRICT_OPTION +XORG_RELEASE_VERSION +XORG_CHANGELOG +XORG_INSTALL +XORG_MANPAGE_SECTIONS +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +]) # XORG_DEFAULT_OPTIONS + +# XORG_INSTALL() +# ---------------- +# Minimum version: 1.4.0 +# +# Defines the variable INSTALL_CMD as the command to copy +# INSTALL from $prefix/share/util-macros. +# +AC_DEFUN([XORG_INSTALL], [ +AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` +INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ +mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ +echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +AC_SUBST([INSTALL_CMD]) +]) # XORG_INSTALL +dnl Copyright 2005 Red Hat, Inc +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation. +dnl +dnl The above copyright notice and this permission notice shall be included +dnl in all copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +dnl OTHER DEALINGS IN THE SOFTWARE. +dnl +dnl Except as contained in this notice, the name of the copyright holders shall +dnl not be used in advertising or otherwise to promote the sale, use or +dnl other dealings in this Software without prior written authorization +dnl from the copyright holders. +dnl + +# XORG_RELEASE_VERSION +# -------------------- +# Defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. + +AC_DEFUN([XORG_RELEASE_VERSION],[ + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], + [`echo $PACKAGE_VERSION | cut -d . -f 1`], + [Major version of this package]) + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` + if test "x$PVM" = "x"; then + PVM="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], + [$PVM], + [Minor version of this package]) + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` + if test "x$PVP" = "x"; then + PVP="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [$PVP], + [Patch version of this package]) +]) + +# XORG_CHANGELOG() +# ---------------- +# Minimum version: 1.2.0 +# +# Defines the variable CHANGELOG_CMD as the command to generate +# ChangeLog from git. +# +# +AC_DEFUN([XORG_CHANGELOG], [ +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ +|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ +echo 'git directory not found: installing possibly empty changelog.' >&2)" +AC_SUBST([CHANGELOG_CMD]) +]) # XORG_CHANGELOG + +dnl Copyright 2005 Red Hat, Inc +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation. +dnl +dnl The above copyright notice and this permission notice shall be included +dnl in all copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +dnl OTHER DEALINGS IN THE SOFTWARE. +dnl +dnl Except as contained in this notice, the name of the copyright holders shall +dnl not be used in advertising or otherwise to promote the sale, use or +dnl other dealings in this Software without prior written authorization +dnl from the copyright holders. +dnl + +# XORG_DRIVER_CHECK_EXT(MACRO, PROTO) +# -------------------------- +# Checks for the MACRO define in xorg-server.h (from the sdk). If it +# is defined, then add the given PROTO to $REQUIRED_MODULES. + +AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include "xorg-server.h" +#if !defined $1 +#error $1 not defined +#endif + ]])], + [_EXT_CHECK=yes], + [_EXT_CHECK=no]) + CFLAGS="$SAVE_CFLAGS" + AC_MSG_CHECKING([if $1 is defined]) + AC_MSG_RESULT([$_EXT_CHECK]) + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES $2" + fi +]) + +# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.15' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.15], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.15])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + diff --git a/xorg/xf86-video-dummy/v0.3.8/compile b/xorg/xf86-video-dummy/v0.3.8/compile new file mode 100755 index 00000000..a85b723c --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/compile @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/xorg/xf86-video-dummy/v0.3.8/config.guess b/xorg/xf86-video-dummy/v0.3.8/config.guess new file mode 100755 index 00000000..b79252d6 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/config.guess @@ -0,0 +1,1558 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-06-10' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright 1992-2013 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; +esac + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/xorg/xf86-video-dummy/v0.3.8/config.h.in b/xorg/xf86-video-dummy/v0.3.8/config.h.in new file mode 100644 index 00000000..5f4ad8e4 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/config.h.in @@ -0,0 +1,75 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +#include "xorg-server.h" + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#undef LT_OBJDIR + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Support DGA extension */ +#undef USE_DGA + +/* Version number of package */ +#undef VERSION diff --git a/xorg/xf86-video-dummy/v0.3.8/config.sub b/xorg/xf86-video-dummy/v0.3.8/config.sub new file mode 100755 index 00000000..9633db70 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/config.sub @@ -0,0 +1,1791 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-08-10' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2013 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 \ + | or1k | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or1k-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/xorg/xf86-video-dummy/v0.3.8/configure b/xorg/xf86-video-dummy/v0.3.8/configure new file mode 100755 index 00000000..b6375fe3 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/configure @@ -0,0 +1,20923 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.69 for xf86-video-dummy 0.3.8. +# +# Report bugs to . +# +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + +SHELL=${CONFIG_SHELL-/bin/sh} + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='xf86-video-dummy' +PACKAGE_TARNAME='xf86-video-dummy' +PACKAGE_VERSION='0.3.8' +PACKAGE_STRING='xf86-video-dummy 0.3.8' +PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_URL='' + +ac_unique_file="Makefile.am" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +LIBOBJS +DRIVER_NAME +XORG_LIBS +XORG_CFLAGS +DGA_FALSE +DGA_TRUE +DGA +moduledir +LT_SYS_LIBRARY_PATH +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +MANIFEST_TOOL +RANLIB +ac_ct_AR +AR +DLLTOOL +OBJDUMP +LN_S +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +LIBTOOL +MAN_SUBSTS +XORG_MAN_PAGE +ADMIN_MAN_DIR +DRIVER_MAN_DIR +MISC_MAN_DIR +FILE_MAN_DIR +LIB_MAN_DIR +APP_MAN_DIR +ADMIN_MAN_SUFFIX +DRIVER_MAN_SUFFIX +MISC_MAN_SUFFIX +FILE_MAN_SUFFIX +LIB_MAN_SUFFIX +APP_MAN_SUFFIX +SED +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +INSTALL_CMD +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG +CHANGELOG_CMD +STRICT_CFLAGS +CWARNFLAGS +BASE_CFLAGS +EGREP +GREP +CPP +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +runstatedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_silent_rules +enable_dependency_tracking +enable_selective_werror +enable_strict_compilation +enable_static +enable_shared +with_pic +enable_fast_install +with_aix_soname +with_gnu_ld +with_sysroot +enable_libtool_lock +enable_dga +with_xorg_module_dir +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +LT_SYS_LIBRARY_PATH +XORG_CFLAGS +XORG_LIBS' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir runstatedir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures xf86-video-dummy 0.3.8 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root + [DATAROOTDIR/doc/xf86-video-dummy] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of xf86-video-dummy 0.3.8:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --disable-selective-werror + Turn off selective compiler errors. (default: + enabled) + --enable-strict-compilation + Enable all warnings from compiler and make them + errors (default: disabled) + --enable-static[=PKGS] build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --disable-dga Build DGA extension (default: yes) + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). + --with-xorg-module-dir=DIR + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. + XORG_CFLAGS C compiler flags for XORG, overriding pkg-config + XORG_LIBS linker flags for XORG, overriding pkg-config + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +xf86-video-dummy configure 0.3.8 +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by xf86-video-dummy $as_me 0.3.8, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +ac_config_headers="$ac_config_headers config.h" + +ac_aux_dir= +for ac_dir in . "$srcdir"/.; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in . \"$srcdir\"/." "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + + +# Initialize Automake +am__api_version='1.15' + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='xf86-video-dummy' + VERSION='0.3.8' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + + +# Require xorg-macros: XORG_DEFAULT_OPTIONS + + + + + + + + + + + +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; then : + +fi + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + + + +ac_fn_c_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" +if test "x$ac_cv_have_decl___clang__" = xyes; then : + CLANGCC="yes" +else + CLANGCC="no" +fi + +ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" +if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then : + INTELCC="yes" +else + INTELCC="no" +fi + +ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" +if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then : + SUNCC="yes" +else + SUNCC="no" +fi + + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + + + + + + +# Check whether --enable-selective-werror was given. +if test "${enable_selective_werror+set}" = set; then : + enableval=$enable_selective_werror; SELECTIVE_WERROR=$enableval +else + SELECTIVE_WERROR=yes +fi + + + + + +# -v is too short to test reliably with XORG_TESTSET_CFLAG +if test "x$SUNCC" = "xyes"; then + BASE_CFLAGS="-v" +else + BASE_CFLAGS="" +fi + +# This chunk of warnings were those that existed in the legacy CWARNFLAGS + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wall" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 +$as_echo_n "checking if $CC supports -Wall... " >&6; } + cacheid=xorg_cv_cc_flag__Wall + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wall" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wpointer-arith" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 +$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; } + cacheid=xorg_cv_cc_flag__Wpointer_arith + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wpointer-arith" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmissing-declarations" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 +$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_declarations + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-declarations" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wformat=2" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 +$as_echo_n "checking if $CC supports -Wformat=2... " >&6; } + cacheid=xorg_cv_cc_flag__Wformat_2 + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wformat=2" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wformat" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 +$as_echo_n "checking if $CC supports -Wformat... " >&6; } + cacheid=xorg_cv_cc_flag__Wformat + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wformat" + found="yes" + fi + fi + + + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wstrict-prototypes" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 +$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; } + cacheid=xorg_cv_cc_flag__Wstrict_prototypes + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wstrict-prototypes" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmissing-prototypes" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 +$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_prototypes + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-prototypes" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wnested-externs" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 +$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; } + cacheid=xorg_cv_cc_flag__Wnested_externs + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wnested-externs" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wbad-function-cast" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5 +$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; } + cacheid=xorg_cv_cc_flag__Wbad_function_cast + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wbad-function-cast" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wold-style-definition" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5 +$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; } + cacheid=xorg_cv_cc_flag__Wold_style_definition + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wold-style-definition" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -fd" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 +$as_echo_n "checking if $CC supports -fd... " >&6; } + cacheid=xorg_cv_cc_flag__fd + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -fd" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wdeclaration-after-statement" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5 +$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; } + cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wdeclaration-after-statement" + found="yes" + fi + fi + + + + + +# This chunk adds additional warnings that could catch undesired effects. + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wunused" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 +$as_echo_n "checking if $CC supports -Wunused... " >&6; } + cacheid=xorg_cv_cc_flag__Wunused + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wunused" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wuninitialized" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 +$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; } + cacheid=xorg_cv_cc_flag__Wuninitialized + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wuninitialized" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wshadow" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 +$as_echo_n "checking if $CC supports -Wshadow... " >&6; } + cacheid=xorg_cv_cc_flag__Wshadow + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wshadow" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmissing-noreturn" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 +$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_noreturn + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmissing-format-attribute" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 +$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_format_attribute + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wredundant-decls" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wredundant-decls" >&5 +$as_echo_n "checking if $CC supports -Wredundant-decls... " >&6; } + cacheid=xorg_cv_cc_flag__Wredundant_decls + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wredundant-decls" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wlogical-op" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 +$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; } + cacheid=xorg_cv_cc_flag__Wlogical_op + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op" + found="yes" + fi + fi + + + +# These are currently disabled because they are noisy. They will be enabled +# in the future once the codebase is sufficiently modernized to silence +# them. For now, I don't want them to drown out the other warnings. +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) + +# Turn some warnings into errors, so we don't accidently get successful builds +# when there are problems that should be fixed. + +if test "x$SELECTIVE_WERROR" = "xyes" ; then + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=implicit" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 +$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_implicit + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=implicit" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 +$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } + cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=nonnull" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 +$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_nonnull + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=nonnull" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=init-self" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5 +$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_init_self + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=init-self" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=main" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 +$as_echo_n "checking if $CC supports -Werror=main... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_main + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=main" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=missing-braces" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5 +$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_missing_braces + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=missing-braces" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=sequence-point" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5 +$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_sequence_point + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=sequence-point" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=return-type" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5 +$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_return_type + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=return-type" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 +$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } + cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=trigraphs" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 +$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_trigraphs + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=trigraphs" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=array-bounds" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5 +$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_array_bounds + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=array-bounds" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=write-strings" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5 +$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_write_strings + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=write-strings" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=address" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 +$as_echo_n "checking if $CC supports -Werror=address... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_address + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=address" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=int-to-pointer-cast" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5 +$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=int-to-pointer-cast" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5 +$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } + cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=pointer-to-int-cast" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5 +$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast" + found="yes" + fi + fi + + # Also -errwarn=E_BAD_PTR_INT_COMBINATION +else +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5 +$as_echo "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;} + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wimplicit" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 +$as_echo_n "checking if $CC supports -Wimplicit... " >&6; } + cacheid=xorg_cv_cc_flag__Wimplicit + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wimplicit" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wnonnull" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 +$as_echo_n "checking if $CC supports -Wnonnull... " >&6; } + cacheid=xorg_cv_cc_flag__Wnonnull + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wnonnull" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Winit-self" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 +$as_echo_n "checking if $CC supports -Winit-self... " >&6; } + cacheid=xorg_cv_cc_flag__Winit_self + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Winit-self" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmain" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 +$as_echo_n "checking if $CC supports -Wmain... " >&6; } + cacheid=xorg_cv_cc_flag__Wmain + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmain" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmissing-braces" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 +$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_braces + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-braces" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wsequence-point" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 +$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; } + cacheid=xorg_cv_cc_flag__Wsequence_point + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wsequence-point" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wreturn-type" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 +$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; } + cacheid=xorg_cv_cc_flag__Wreturn_type + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wreturn-type" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wtrigraphs" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 +$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; } + cacheid=xorg_cv_cc_flag__Wtrigraphs + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wtrigraphs" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Warray-bounds" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 +$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; } + cacheid=xorg_cv_cc_flag__Warray_bounds + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Warray-bounds" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wwrite-strings" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 +$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; } + cacheid=xorg_cv_cc_flag__Wwrite_strings + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wwrite-strings" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Waddress" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 +$as_echo_n "checking if $CC supports -Waddress... " >&6; } + cacheid=xorg_cv_cc_flag__Waddress + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Waddress" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wint-to-pointer-cast" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5 +$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; } + cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wint-to-pointer-cast" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wpointer-to-int-cast" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5 +$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; } + cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wpointer-to-int-cast" + found="yes" + fi + fi + + +fi + + + + + + + + CWARNFLAGS="$BASE_CFLAGS" + if test "x$GCC" = xyes ; then + CWARNFLAGS="$CWARNFLAGS -fno-strict-aliasing" + fi + + + + + + + + +# Check whether --enable-strict-compilation was given. +if test "${enable_strict_compilation+set}" = set; then : + enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval +else + STRICT_COMPILE=no +fi + + + + + + +STRICT_CFLAGS="" + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -pedantic" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 +$as_echo_n "checking if $CC supports -pedantic... " >&6; } + cacheid=xorg_cv_cc_flag__pedantic + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + STRICT_CFLAGS="$STRICT_CFLAGS -pedantic" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 +$as_echo_n "checking if $CC supports -Werror... " >&6; } + cacheid=xorg_cv_cc_flag__Werror + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + STRICT_CFLAGS="$STRICT_CFLAGS -Werror" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -errwarn" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 +$as_echo_n "checking if $CC supports -errwarn... " >&6; } + cacheid=xorg_cv_cc_flag__errwarn + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + STRICT_CFLAGS="$STRICT_CFLAGS -errwarn" + found="yes" + fi + fi + + + +# Earlier versions of gcc (eg: 4.2) support -Werror=attributes, but do not +# activate it with -Werror, so we add it here explicitly. + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=attributes" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 +$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_attributes + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" + found="yes" + fi + fi + + + +if test "x$STRICT_COMPILE" = "xyes"; then + BASE_CFLAGS="$BASE_CFLAGS $STRICT_CFLAGS" + CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" +fi + + + + + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + + +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ +|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ +echo 'git directory not found: installing possibly empty changelog.' >&2)" + + + + +macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` +INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ +mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ +echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" + + + + + + +if test x$APP_MAN_SUFFIX = x ; then + APP_MAN_SUFFIX=1 +fi +if test x$APP_MAN_DIR = x ; then + APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' +fi + +if test x$LIB_MAN_SUFFIX = x ; then + LIB_MAN_SUFFIX=3 +fi +if test x$LIB_MAN_DIR = x ; then + LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' +fi + +if test x$FILE_MAN_SUFFIX = x ; then + case $host_os in + solaris*) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; + esac +fi +if test x$FILE_MAN_DIR = x ; then + FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' +fi + +if test x$MISC_MAN_SUFFIX = x ; then + case $host_os in + solaris*) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; + esac +fi +if test x$MISC_MAN_DIR = x ; then + MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' +fi + +if test x$DRIVER_MAN_SUFFIX = x ; then + case $host_os in + solaris*) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; + esac +fi +if test x$DRIVER_MAN_DIR = x ; then + DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' +fi + +if test x$ADMIN_MAN_SUFFIX = x ; then + case $host_os in + solaris*) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; + esac +fi +if test x$ADMIN_MAN_DIR = x ; then + ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' +fi + + + + + + + + + + + + + + + +XORG_MAN_PAGE="X Version 11" + +MAN_SUBSTS="\ + -e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xservername__|Xorg|g' \ + -e 's|__xconfigfile__|xorg.conf|g' \ + -e 's|__projectroot__|\$(prefix)|g' \ + -e 's|__apploaddir__|\$(appdefaultdir)|g' \ + -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ + -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \ + -e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'" + + + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + + + +# Initialize libtool +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else + enable_static=no +fi + + + + + + + + + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac + + + +macro_version='2.4.6' +macro_revision='2.4.6' + + + + + + + + + + + + + +ltmain=$ac_aux_dir/ltmain.sh + +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case $ECHO in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_FGREP" || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_FGREP=$FGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +test -z "$GREP" && GREP=grep + + + + + + + + + + + + + + + + + + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD=$ac_prog + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test yes = "$with_gnu_ld"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD=$ac_dir/$ac_prog + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM +else + lt_nm_to_check=${ac_tool_prefix}nm + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$DUMPBIN" && break + done +fi +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in dumpbin "link -dump" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_DUMPBIN" && break +done + + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DUMPBIN=$ac_ct_DUMPBIN + fi +fi + + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; + *) + DUMPBIN=: + ;; + esac + fi + + if test : != "$DUMPBIN"; then + NM=$DUMPBIN + fi +fi +test -z "$NM" && NM=nm + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else + i=0 + teststring=ABCD + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test 17 != "$i" # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac + +fi + +if test -n "$lt_cv_sys_max_cmd_len"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } +fi +max_cmd_len=$lt_cv_sys_max_cmd_len + + + + + + +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi + + + + + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test yes != "$GCC"; then + reload_cmds=false + fi + ;; + darwin*) + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + +test -z "$OBJDUMP" && OBJDUMP=objdump + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# 'unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. + +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + + + + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test 0 -eq "$ac_status"; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +test -z "$STRIP" && STRIP=: + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +test -z "$RANLIB" && RANLIB=: + + + + + + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + bitrig* | openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else + +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[BCDT]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; +hpux*) + if test ia64 = "$host_cpu"; then + symcode='[ABCDEGRST]' + fi + ;; +irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; +osf*) + symcode='[BCDEGQRST]' + ;; +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac + +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined __osf__ +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS=conftstm.$ac_objext + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest$ac_exeext; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi + else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test yes = "$pipe_works"; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done + +fi + +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case $with_sysroot in #( + yes) + if test yes = "$GCC"; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi + +test no = "$enable_libtool_lock" || enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; + *ELF-64*) + HPUX_IA64_MODE=64 + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test yes = "$lt_cv_prog_gnu_ld"; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes +else + lt_cv_cc_needs_belf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test yes != "$lt_cv_cc_needs_belf"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS=$SAVE_CFLAGS + fi + ;; +*-*solaris*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*|x86_64-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD=${LD-ld}_sol2 + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks=$enable_libtool_lock + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: +fi + + + + + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LIPO="lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_LIPO" = x; then + LIPO=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LIPO=$ac_ct_LIPO + fi +else + LIPO="$ac_cv_prog_LIPO" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL="otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL=$ac_ct_OTOOL + fi +else + OTOOL="$ac_cv_prog_OTOOL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL64="otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL64=$ac_ct_OTOOL64 + fi +else + OTOOL64="$ac_cv_prog_OTOOL64" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "$LT_MULTI_MODULE"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes +else + lt_cv_ld_exported_symbols_list=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' + fi + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + +fi + +done + + + + + +# Set options + + + + enable_dlopen=no + + + enable_win32_dll=no + + + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else + enable_shared=yes +fi + + + + + + + + + + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for lt_pkg in $withval; do + IFS=$lt_save_ifs + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else + pic_mode=default +fi + + + + + + + + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else + enable_fast_install=yes +fi + + + + + + + + + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + + + + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS=$ltmain + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +test -z "$LN_S" && LN_S="ln -s" + + + + + + + + + + + + + + +if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir + + + + + +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF + + + + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld=$lt_cv_prog_gnu_ld + +old_CC=$CC +old_CFLAGS=$CFLAGS + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +func_cc_basename $compiler +cc_basename=$func_cc_basename_result + + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; +esac +fi + +MAGIC_CMD=$lt_cv_path_MAGIC_CMD +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; +esac +fi + +MAGIC_CMD=$lt_cv_path_MAGIC_CMD +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + else + MAGIC_CMD=: + fi +fi + + fi + ;; +esac + +# Use C for the default configuration in the libtool script + +lt_save_CC=$CC +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +objext=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* + + +if test -n "$compiler"; then + +lt_prog_compiler_no_builtin_flag= + +if test yes = "$GCC"; then + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : +fi + +fi + + + + + + + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= + + + if test yes = "$GCC"; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + lt_prog_compiler_pic='-fPIC' + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; + + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='$wl-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # old Intel for x86_64, which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; + + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi + +case $host_os in + # For platforms that do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + +if test yes = "$lt_cv_prog_compiler_pic_works"; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac +else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no +fi + +fi + + + + + + + + + + + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } + +if test yes = "$lt_cv_prog_compiler_static_works"; then + : +else + lt_prog_compiler_static= +fi + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd* | bitrig*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; + esac + + ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test yes = "$with_gnu_ld"; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test yes = "$lt_use_gnu_ld_interface"; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='$wl' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test ia64 != "$host_cpu"; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='$wl--export-all-symbols' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test linux-dietlibc = "$host_os"; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test no = "$tmp_diet" + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + + if test no = "$ld_shlibs"; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + + aix[4-9]*) + if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag= + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then + aix_use_runtimelinking=yes + break + fi + done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac + + if test yes = "$GCC"; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' + fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' + else + # not using gcc + if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi + + export_dynamic_flag_spec='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=/usr/lib:/lib + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=/usr/lib:/lib + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi + archive_cmds_need_lc=yes + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac + ;; + + darwin* | rhapsody*) + + + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec='' + fi + link_all_deplibs=yes + allow_undefined_flag=$_lt_dar_allow_undefined + case $cc_basename in + ifort*|nagfor*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test yes = "$_lt_dar_can_shared"; then + output_verbose_link_cmd=func_echo_all + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + + else + ld_shlibs=no + fi + + ;; + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + hpux9*) + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='$wl+b $wl$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='$wl-E' + ;; + + hpux10*) + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='$wl-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test yes,no = "$GCC,$with_gnu_ld"; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + + ;; + esac + fi + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='$wl-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi + link_all_deplibs=no + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; + + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + *nto* | *qnx*) + ;; + + openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' + else + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + fi + else + ld_shlibs=no + fi + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + + osf3*) + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; + + solaris*) + no_undefined_flag=' -z defs' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands '-z linker_flag'. GCC discards it without '$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac + link_all_deplibs=yes + ;; + + sunos4*) + if test sequent = "$host_vendor"; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='$wl-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='$wl-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='$wl-Bexport' + runpath_var='LD_RUN_PATH' + + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; + esac + + if test sni = "$host_vendor"; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='$wl-Blargedynsym' + ;; + esac + fi + fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test no = "$ld_shlibs" && can_build_shared=no + +with_gnu_ld=$with_gnu_ld + + + + + + + + + + + + + + + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test yes,yes = "$GCC,$enable_shared"; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; + esac + fi + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +if test yes = "$GCC"; then + case $host_os in + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary... + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo = "/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=.so +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + + + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='$libname$release$shared_ext$major' + ;; + +aix[4-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test ia64 = "$host_cpu"; then + # AIX 5 supports IA64 + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='$libname$shared_ext' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec=$LIB + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[23].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 + fi + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[3-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test yes = "$lt_cv_prog_gnu_ld"; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd* | bitrig*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no + else + need_version=yes + fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +os2*) + libname_spec='$name' + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test yes = "$with_gnu_ld"; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec; then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=sco + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test yes = "$with_gnu_ld"; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test no = "$dynamic_linker" && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test yes = "$GCC"; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec +fi + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec +fi + +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test yes = "$hardcode_automatic"; then + + # We can hardcode non-existent directories. + if test no != "$hardcode_direct" && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } + +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then + # Fast installation is not supported + enable_fast_install=no +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + if test yes != "$enable_dlopen"; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen=load_add_on + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl +else + + lt_cv_dlopen=dyld + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : + lt_cv_dlopen=shl_load +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes +else + ac_cv_lib_dld_shl_load=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : + lt_cv_dlopen=dlopen +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes +else + ac_cv_lib_svld_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes +else + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test no = "$lt_cv_dlopen"; then + enable_dlopen=no + else + enable_dlopen=yes + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS=$LDFLAGS + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test yes = "$cross_compiling"; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } + + if test yes = "$lt_cv_dlopen_self"; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test yes = "$cross_compiling"; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + + + + + + + + + + + + + + + + +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +fi + + + + + + + + + + + + + # Report what library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[4-9]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } + + + + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC=$lt_save_CC + + + + + + + + + + + + + + + + ac_config_commands="$ac_config_commands libtool" + + + + +# Only expand once: + + + + + +# Define a configure option for an alternate module directory +# Check whether --enable-dga was given. +if test "${enable_dga+set}" = set; then : + enableval=$enable_dga; DGA=$enableval +else + DGA=yes +fi + + +# Check whether --with-xorg-module-dir was given. +if test "${with_xorg_module_dir+set}" = set; then : + withval=$with_xorg_module_dir; moduledir="$withval" +else + moduledir="$libdir/xorg/modules" +fi + + + + +# Store the list of server defined optional extensions in REQUIRED_MODULES + + + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include "xorg-server.h" +#if !defined RANDR +#error RANDR not defined +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + _EXT_CHECK=yes +else + _EXT_CHECK=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if RANDR is defined" >&5 +$as_echo_n "checking if RANDR is defined... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_EXT_CHECK" >&5 +$as_echo "$_EXT_CHECK" >&6; } + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES randrproto" + fi + + + + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include "xorg-server.h" +#if !defined RENDER +#error RENDER not defined +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + _EXT_CHECK=yes +else + _EXT_CHECK=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if RENDER is defined" >&5 +$as_echo_n "checking if RENDER is defined... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_EXT_CHECK" >&5 +$as_echo "$_EXT_CHECK" >&6; } + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES renderproto" + fi + + + + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include "xorg-server.h" +#if !defined XV +#error XV not defined +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + _EXT_CHECK=yes +else + _EXT_CHECK=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if XV is defined" >&5 +$as_echo_n "checking if XV is defined... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_EXT_CHECK" >&5 +$as_echo "$_EXT_CHECK" >&6; } + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES videoproto" + fi + + +if test "x$DGA" = xyes; then + + + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include "xorg-server.h" +#if !defined XFreeXDGA +#error XFreeXDGA not defined +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + _EXT_CHECK=yes +else + _EXT_CHECK=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if XFreeXDGA is defined" >&5 +$as_echo_n "checking if XFreeXDGA is defined... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_EXT_CHECK" >&5 +$as_echo "$_EXT_CHECK" >&6; } + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES xf86dgaproto" + fi + + +$as_echo "#define USE_DGA 1" >>confdefs.h + +fi + + if test "x$DGA" = xyes; then + DGA_TRUE= + DGA_FALSE='#' +else + DGA_TRUE='#' + DGA_FALSE= +fi + + +# Obtain compiler/linker options for the driver dependencies + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5 +$as_echo_n "checking for XORG... " >&6; } + +if test -n "$XORG_CFLAGS"; then + pkg_cv_XORG_CFLAGS="$XORG_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.4.99.901 xproto fontsproto \$REQUIRED_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$XORG_LIBS"; then + pkg_cv_XORG_LIBS="$XORG_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.4.99.901 xproto fontsproto \$REQUIRED_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES" 2>&1` + else + XORG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XORG_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES) were not met: + +$XORG_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables XORG_CFLAGS +and XORG_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables XORG_CFLAGS +and XORG_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + XORG_CFLAGS=$pkg_cv_XORG_CFLAGS + XORG_LIBS=$pkg_cv_XORG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + +# Checks for libraries. + + +DRIVER_NAME=dummy + + +ac_config_files="$ac_config_files Makefile src/Makefile" + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DGA_TRUE}" && test -z "${DGA_FALSE}"; then + as_fn_error $? "conditional \"DGA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by xf86-video-dummy $as_me 0.3.8, which was +generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +xf86-video-dummy config.status 0.3.8 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2012 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' + +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in SHELL \ +ECHO \ +PATH_SEPARATOR \ +SED \ +GREP \ +EGREP \ +FGREP \ +LD \ +NM \ +LN_S \ +lt_SP2NL \ +lt_NL2SP \ +reload_flag \ +OBJDUMP \ +deplibs_check_method \ +file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ +AR \ +AR_FLAGS \ +archiver_list_spec \ +STRIP \ +RANLIB \ +CC \ +CFLAGS \ +compiler \ +lt_cv_sys_global_symbol_pipe \ +lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ +lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ +nm_file_list_spec \ +lt_cv_truncate_bin \ +lt_prog_compiler_no_builtin_flag \ +lt_prog_compiler_pic \ +lt_prog_compiler_wl \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ +MANIFEST_TOOL \ +DSYMUTIL \ +NMEDIT \ +LIPO \ +OTOOL \ +OTOOL64 \ +shrext_cmds \ +export_dynamic_flag_spec \ +whole_archive_flag_spec \ +compiler_needs_object \ +with_gnu_ld \ +allow_undefined_flag \ +no_undefined_flag \ +hardcode_libdir_flag_spec \ +hardcode_libdir_separator \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ +variables_saved_for_relink \ +libname_spec \ +library_names_spec \ +soname_spec \ +install_override_mode \ +finish_eval \ +old_striplib \ +striplib; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in reload_cmds \ +old_postinstall_cmds \ +old_postuninstall_cmds \ +old_archive_cmds \ +extract_expsyms_cmds \ +old_archive_from_new_cmds \ +old_archive_from_expsyms_cmds \ +archive_cmds \ +archive_expsym_cmds \ +module_cmds \ +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ +postlink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ +sys_lib_search_path_spec \ +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +ac_aux_dir='$ac_aux_dir' + +# See if we are running on zsh, and set the options that allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi + + + PACKAGE='$PACKAGE' + VERSION='$VERSION' + RM='$RM' + ofile='$ofile' + + + + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} + ;; + "libtool":C) + + # See if we are running on zsh, and set the options that allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + + cfgfile=${ofile}T + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL +# Generated automatically by $as_me ($PACKAGE) $VERSION +# NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +# The names of the tagged configurations supported by this script. +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + +# ### BEGIN LIBTOOL CONFIG + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# What type of objects to build. +pic_mode=$pic_mode + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# A sed program that does not truncate output. +SED=$lt_SED + +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="\$SED -e 1s/^X//" + +# A grep program that handles long lines. +GREP=$lt_GREP + +# An ERE matcher. +EGREP=$lt_EGREP + +# A literal string matcher. +FGREP=$lt_FGREP + +# A BSD- or MS-compatible name lister. +NM=$lt_NM + +# Whether we need soft or hard links. +LN_S=$lt_LN_S + +# What is the maximum length of a command? +max_cmd_len=$max_cmd_len + +# Object file suffix (normally "o"). +objext=$ac_objext + +# Executable file suffix (normally ""). +exeext=$exeext + +# whether the shell understands "unset". +lt_unset=$lt_unset + +# turn spaces into newlines. +SP2NL=$lt_lt_SP2NL + +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP + +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method = "file_magic". +file_magic_cmd=$lt_file_magic_cmd + +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + +# The archiver. +AR=$lt_AR + +# Flags to create an archive. +AR_FLAGS=$lt_AR_FLAGS + +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + +# A symbol stripping program. +STRIP=$lt_STRIP + +# Commands used to install an old-style archive. +RANLIB=$lt_RANLIB +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + +# A C compiler. +LTCC=$lt_CC + +# LTCC compiler flags. +LTCFLAGS=$lt_CFLAGS + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration. +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + +# Transform the output of nm in a C name address pair. +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# Transform the output of nm in a C name address pair when lib prefix is needed. +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and where our libraries should be installed. +lt_sysroot=$lt_sysroot + +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# Used to examine libraries when file_magic_cmd begins with "file". +MAGIC_CMD=$MAGIC_CMD + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + +# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +DSYMUTIL=$lt_DSYMUTIL + +# Tool to change global to local symbols on Mac OS X. +NMEDIT=$lt_NMEDIT + +# Tool to manipulate fat objects and archives on Mac OS X. +LIPO=$lt_LIPO + +# ldd/readelf like tool for Mach-O binaries on Mac OS X. +OTOOL=$lt_OTOOL + +# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +OTOOL64=$lt_OTOOL64 + +# Old archive suffix (normally "a"). +libext=$libext + +# Shared library suffix (normally ".so"). +shrext_cmds=$lt_shrext_cmds + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at link time. +variables_saved_for_relink=$lt_variables_saved_for_relink + +# Do we need the "lib" prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Library versioning type. +version_type=$version_type + +# Shared library runtime path variable. +runpath_var=$runpath_var + +# Shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + +# Command to use after installation of a shared archive. +postinstall_cmds=$lt_postinstall_cmds + +# Command to use after uninstallation of a shared archive. +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# As "finish_cmds", except a single script fragment to be evaled but +# not shown. +finish_eval=$lt_finish_eval + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Compile-time system search path for libraries. +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + + +# The linker used to build libraries. +LD=$lt_LD + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds + +# A language specific compiler. +CC=$lt_compiler + +# Is the compiler the GNU compiler? +with_gcc=$GCC + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc + +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec + +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds + +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds + +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag + +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator + +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct + +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \$shlibpath_var if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute + +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L + +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var + +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic + +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs + +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds + +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action + +# ### END LIBTOOL CONFIG + +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + +ltmain=$ac_aux_dir/ltmain.sh + + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + + ;; + + esac +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + diff --git a/xorg/xf86-video-dummy/v0.3.8/configure.ac b/xorg/xf86-video-dummy/v0.3.8/configure.ac new file mode 100644 index 00000000..4eb7faec --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/configure.ac @@ -0,0 +1,81 @@ +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Process this file with autoconf to produce a configure script + +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([xf86-video-dummy], + [0.3.8], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [xf86-video-dummy]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_AUX_DIR(.) + +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + +# Initialize libtool +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + +AH_TOP([#include "xorg-server.h"]) + +# Define a configure option for an alternate module directory +AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: yes)]), [DGA=$enableval], [DGA=yes]) +AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ], + [ moduledir="$withval" ], + [ moduledir="$libdir/xorg/modules" ]) +AC_SUBST(moduledir) + + +# Store the list of server defined optional extensions in REQUIRED_MODULES +XORG_DRIVER_CHECK_EXT(RANDR, randrproto) +XORG_DRIVER_CHECK_EXT(RENDER, renderproto) +XORG_DRIVER_CHECK_EXT(XV, videoproto) + +if test "x$DGA" = xyes; then + XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) + AC_DEFINE(USE_DGA, 1, [Support DGA extension]) +fi +AC_SUBST([DGA]) +AM_CONDITIONAL([DGA], [test "x$DGA" = xyes]) + +# Obtain compiler/linker options for the driver dependencies +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4.99.901] xproto fontsproto $REQUIRED_MODULES) + +# Checks for libraries. + + +DRIVER_NAME=dummy +AC_SUBST([DRIVER_NAME]) + +AC_CONFIG_FILES([ + Makefile + src/Makefile +]) +AC_OUTPUT diff --git a/xorg/xf86-video-dummy/v0.3.8/depcomp b/xorg/xf86-video-dummy/v0.3.8/depcomp new file mode 100755 index 00000000..4ebd5b3a --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/depcomp @@ -0,0 +1,791 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2013-05-30.07; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputting dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Avoid interferences from the environment. +gccflag= dashmflag= + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The second -e expression handles DOS-style file names with drive + # letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the "deleted header file" problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. +## Some versions of gcc put a space before the ':'. On the theory +## that the space means something, we add a space to the output as +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like '#:fec' to the end of the + # dependency line. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" + echo >> "$depfile" + # The second pass generates a dummy entry for each header file. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" + else + make_dummy_depfile + fi + rm -f "$tmpdepfile" + ;; + +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts '$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + set_dir_from "$object" + set_base_from "$object" + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" + rm -f "$tmpdepfile" + ;; + +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using '\' : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + set_dir_from "$object" + set_base_from "$object" + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" + else + make_dummy_depfile + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + +tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + # Remove '-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for ':' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. + "$@" $dashmflag | + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift + cleared=no eat=no + for arg + do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + if test $eat = yes; then + eat=no + continue + fi + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix=`echo "$object" | sed 's/^.*\././'` + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + # Remove '-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + IFS=" " + for arg + do + case "$arg" in + -o) + shift + ;; + $object) + shift + ;; + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/xorg/xf86-video-dummy/v0.3.8/install-sh b/xorg/xf86-video-dummy/v0.3.8/install-sh new file mode 100755 index 00000000..377bb868 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/install-sh @@ -0,0 +1,527 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2011-11-20.07; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +nl=' +' +IFS=" "" $nl" + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +no_target_directory= + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names problematic for 'test' and other utilities. + case $src in + -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + dst=$dst_arg + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir + shift + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/xorg/xf86-video-dummy/v0.3.8/ltmain.sh b/xorg/xf86-video-dummy/v0.3.8/ltmain.sh new file mode 100644 index 00000000..a736cf99 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/ltmain.sh @@ -0,0 +1,11156 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 + +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit , 1996 + +# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +PROGRAM=libtool +PACKAGE=libtool +VERSION="2.4.6 Debian-2.4.6-2" +package_revision=2.4.6 + + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac +fi + +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" + fi" +done + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" + +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + + +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. + +: ${CP="cp -f"} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} +: ${MAKE="make"} +: ${MKDIR="mkdir"} +: ${MV="mv -f"} +: ${RM="rm -f"} +: ${SHELL="${CONFIG_SHELL-/bin/sh}"} + + +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## + +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' + +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' + +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" + + +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. + +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. + +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: + +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 + +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` + +# Make sure we have an absolute progpath for reexecution: +case $progpath in + [\\/]*|[A-Za-z]:\\*) ;; + *[\\/]*) + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` + progdir=`cd "$progdir" && pwd` + progpath=$progdir/$progname + ;; + *) + _G_IFS=$IFS + IFS=${PATH_SEPARATOR-:} + for progdir in $PATH; do + IFS=$_G_IFS + test -x "$progdir/$progname" && break + done + IFS=$_G_IFS + test -n "$progdir" || progdir=`pwd` + progpath=$progdir/$progname + ;; +esac + + +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. + +opt_dry_run=false +opt_quiet=false +opt_verbose=false + +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } + + require_term_colors=: +} + + +## ----------------- ## +## Function library. ## +## ----------------- ## + +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. + + +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. + + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd + + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $debug_cmd + + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- +# Make sure the entire path to DIRECTORY-PATH is available. +func_mkdir_p () +{ + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= + + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then + + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; + esac + + # While some portion of DIR does not yet exist... + while test ! -d "$_G_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited + # list incase some portion of path contains whitespace. + _G_dir_list=$_G_directory_path:$_G_dir_list + + # If the last portion added has no slash in it, the list is done + case $_G_directory_path in */*) ;; *) break ;; esac + + # ...otherwise throw away the child directory and loop + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` + done + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` + + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes + # try to create one of the directories concurrently. Don't + # stop in that case! + $MKDIR "$_G_dir" 2>/dev/null || : + done + IFS=$func_mkdir_p_IFS + + # Bail out if we (or some other process) failed to create a directory. + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" + fi +} + + +# func_mktempdir [BASENAME] +# ------------------------- +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, BASENAME is the basename for that directory. +func_mktempdir () +{ + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} + + if test : = "$opt_dry_run"; then + # Return a directory name, but don't create it in dry-run mode + _G_tmpdir=$_G_template-$$ + else + + # If mktemp works, use that first and foremost + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` + + if test ! -d "$_G_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd + + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} + + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} + + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result +} + + +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () +{ + $debug_cmd + + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result +} + + +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () +{ + $debug_cmd + + func_parse_options_result= + + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift + + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break + + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; + + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result +} + + +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () +{ + $debug_cmd + + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" + + func_run_hooks func_validate_options ${1+"$@"} + + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result +} + + + +## ----------------- ## +## Helper functions. ## +## ----------------- ## + +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () +{ + $debug_cmd + + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE +} + + +# func_help +# --------- +# Echo long help message to standard output and exit. +func_help () +{ + $debug_cmd + + func_usage_message + $ECHO "$long_help_message" + exit 0 +} + + +# func_missing_arg ARGNAME +# ------------------------ +# Echo program name prefixed message to standard error and set global +# exit_cmd. +func_missing_arg () +{ + $debug_cmd + + func_error "Missing argument for '$1'." + exit_cmd=exit +} + + +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () +{ + $debug_cmd + + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} + + +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () +{ + $debug_cmd + + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} + + +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + + exit $? +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: + +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' + + +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () +{ + $debug_cmd + + $warning_func ${1+"$@"} +} + + +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" + +# Additional text appended to 'usage_message' in response to '--help'. +func_help () +{ + $debug_cmd + + func_usage_message + $ECHO "$long_help_message + +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname $scriptversion Debian-2.4.6-2 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi + + +# func_fatal_configuration ARG... +# ------------------------------- +# Echo program name prefixed message to standard error, followed by +# a configuration failure hint, and exit. +func_fatal_configuration () +{ + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." +} + + +# func_config +# ----------- +# Display the configuration for all the tags in this script. +func_config () +{ + re_begincf='^# ### BEGIN LIBTOOL' + re_endcf='^# ### END LIBTOOL' + + # Default configuration. + $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" + + # Now print the configurations for the tags. + for tagname in $taglist; do + $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" + done + + exit $? +} + + +# func_features +# ------------- +# Display the features supported by this script. +func_features () +{ + echo "host: $host" + if test yes = "$build_libtool_libs"; then + echo "enable shared libraries" + else + echo "disable shared libraries" + fi + if test yes = "$build_old_libs"; then + echo "enable static libraries" + else + echo "disable static libraries" + fi + + exit $? +} + + +# func_enable_tag TAGNAME +# ----------------------- +# Verify that TAGNAME is valid, and either flag an error and exit, or +# enable the TAGNAME tag. We also add TAGNAME to the global $taglist +# variable here. +func_enable_tag () +{ + # Global variable: + tagname=$1 + + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac + + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; + *) + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac +} + + +# func_check_version_match +# ------------------------ +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + + nonopt= + preserve_args= + + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep + + +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd + + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; + + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options + + + +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift + fi + + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } + + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result +} +func_add_hook func_validate_options libtool_validate_options + + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift + + + +## ----------- ## +## Main. ## +## ----------- ## + +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + +# func_lalib_p file +# True iff FILE is a libtool '.la' library or '.lo' object file. +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_lalib_p () +{ + test -f "$1" && + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p +} + +# func_lalib_unsafe_p file +# True iff FILE is a libtool '.la' library or '.lo' object file. +# This function implements the same check as func_lalib_p without +# resorting to external programs. To this end, it redirects stdin and +# closes it afterwards, without saving the original file descriptor. +# As a safety measure, use it only where a negative result would be +# fatal anyway. Works if 'file' does not exist. +func_lalib_unsafe_p () +{ + lalib_p=no + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line + case $lalib_p_line in + \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac + done + exec 0<&5 5<&- + fi + test yes = "$lalib_p" +} + +# func_ltwrapper_script_p file +# True iff FILE is a libtool wrapper script +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_script_p () +{ + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p +} + +# func_ltwrapper_executable_p file +# True iff FILE is a libtool wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_executable_p () +{ + func_ltwrapper_exec_suffix= + case $1 in + *.exe) ;; + *) func_ltwrapper_exec_suffix=.exe ;; + esac + $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +} + +# func_ltwrapper_scriptname file +# Assumes file is an ltwrapper_executable +# uses $file to determine the appropriate filename for a +# temporary ltwrapper_script. +func_ltwrapper_scriptname () +{ + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper +} + +# func_ltwrapper_p file +# True iff FILE is a libtool wrapper script or wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_p () +{ + func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" +} + + +# func_execute_cmds commands fail_cmd +# Execute tilde-delimited COMMANDS. +# If FAIL_CMD is given, eval that upon failure. +# FAIL_CMD may read-access the current command in variable CMD! +func_execute_cmds () +{ + $debug_cmd + + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$sp$nl + eval cmd=\"$cmd\" + IFS=$save_ifs + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +} + + +# func_source file +# Source FILE, adding directory component if necessary. +# Note that it is not necessary on cygwin/mingw to append a dot to +# FILE even if both FILE and FILE.exe exist: automatic-append-.exe +# behavior happens only for exec(3), not for open(2)! Also, sourcing +# 'FILE.' does not work on cygwin managed mounts. +func_source () +{ + $debug_cmd + + case $1 in + */* | *\\*) . "$1" ;; + *) . "./$1" ;; + esac +} + + +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case $lt_sysroot:$1 in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result='='$func_stripname_result + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () +{ + $debug_cmd + + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case "$@ " in + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + func_echo "unable to infer tagged configuration" + func_fatal_error "specify a tag with '--tag'" +# else +# func_verbose "using $tagname tagged configuration" + fi + ;; + esac + fi +} + + + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# but don't create it if we're doing a dry run. +func_write_libtool_object () +{ + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' + else + write_lobj=none + fi + + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T </dev/null` + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $debug_cmd + + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result= + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result"; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $debug_cmd + + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $debug_cmd + + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $debug_cmd + + if test -z "$2" && test -n "$1"; then + func_error "Could not determine host file name corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result=$1 + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $debug_cmd + + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " '$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result=$3 + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $debug_cmd + + case $4 in + $1 ) func_to_host_path_result=$3$func_to_host_path_result + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via '$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $debug_cmd + + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $debug_cmd + + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result=$1 +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $debug_cmd + + func_to_host_file_result=$1 + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result=$func_convert_core_msys_to_w32_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $debug_cmd + + func_to_host_file_result=$1 + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $debug_cmd + + func_to_host_file_result=$1 + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $debug_cmd + + func_to_host_file_result=$1 + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_cygpath_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $debug_cmd + + func_to_host_file_result=$1 + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_cygpath_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via '$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $debug_cmd + + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd=func_convert_path_$func_stripname_result + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $debug_cmd + + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result=$1 +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $debug_cmd + + func_to_host_path_result=$1 + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result=$func_convert_core_msys_to_w32_result + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $debug_cmd + + func_to_host_path_result=$1 + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $debug_cmd + + func_to_host_path_result=$1 + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $debug_cmd + + func_to_host_path_result=$1 + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_cygpath_result + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $debug_cmd + + func_to_host_path_result=$1 + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_cygpath_result + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_nix_to_cygwin + + +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + +# func_mode_compile arg... +func_mode_compile () +{ + $debug_cmd + + # Get the compilation command and the source file. + base_compile= + srcfile=$nonopt # always keep a non-empty value in "srcfile" + suppress_opt=yes + suppress_output= + arg_mode=normal + libobj= + later= + pie_flag= + + for arg + do + case $arg_mode in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg=$arg + arg_mode=normal + ;; + + target ) + libobj=$arg + arg_mode=normal + continue + ;; + + normal ) + # Accept any command-line options. + case $arg in + -o) + test -n "$libobj" && \ + func_fatal_error "you cannot specify '-o' more than once" + arg_mode=target + continue + ;; + + -pie | -fpie | -fPIE) + func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) + func_append later " $arg" + continue + ;; + + -no-suppress) + suppress_opt=no + continue + ;; + + -Xcompiler) + arg_mode=arg # the next one goes into the "base_compile" arg list + continue # The current "srcfile" will either be retained or + ;; # replaced later. I would guess that would be a bug. + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + lastarg= + save_ifs=$IFS; IFS=, + for arg in $args; do + IFS=$save_ifs + func_append_quoted lastarg "$arg" + done + IFS=$save_ifs + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. + func_append base_compile " $lastarg" + continue + ;; + + *) + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # + lastarg=$srcfile + srcfile=$arg + ;; + esac # case $arg + ;; + esac # case $arg_mode + + # Aesthetically quote the previous argument. + func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in + arg) + func_fatal_error "you must specify an argument for -Xcompile" + ;; + target) + func_fatal_error "you must specify a target with '-o'" + ;; + *) + # Get the name of the library object. + test -z "$libobj" && { + func_basename "$srcfile" + libobj=$func_basename_result + } + ;; + esac + + # Recognize several different file suffixes. + # If the user specifies -o file.o, it is replaced with file.lo + case $libobj in + *.[cCFSifmso] | \ + *.ada | *.adb | *.ads | *.asm | \ + *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) + func_xform "$libobj" + libobj=$func_xform_result + ;; + esac + + case $libobj in + *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; + *) + func_fatal_error "cannot determine name of library object from '$libobj'" + ;; + esac + + func_infer_tag $base_compile + + for arg in $later; do + case $arg in + -shared) + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" + build_old_libs=no + continue + ;; + + -static) + build_libtool_libs=no + build_old_libs=yes + continue + ;; + + -prefer-pic) + pic_mode=yes + continue + ;; + + -prefer-non-pic) + pic_mode=no + continue + ;; + esac + done + + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && func_warning "libobj name '$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname + + test -z "$base_compile" && \ + func_fatal_help "you must specify a compilation command" + + # Delete any leftover library objects. + if test yes = "$build_old_libs"; then + removelist="$obj $lobj $libobj ${libobj}T" + else + removelist="$lobj $libobj ${libobj}T" + fi + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in + cygwin* | mingw* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then + # non-PIC code in shared libraries is not supported + pic_mode=default + fi + + # Calculate the filename of the output object if compiler does + # not support -o with -c + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock + else + output_obj= + need_locks=no + lockfile= + fi + + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test yes = "$need_locks"; then + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + elif test warn = "$need_locks"; then + if test -f "$lockfile"; then + $ECHO "\ +*** ERROR, $lockfile exists and contains: +`cat $lockfile 2>/dev/null` + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support '-c' and '-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist + func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + + # Only build a PIC object if we are building libtool libraries. + if test yes = "$build_libtool_libs"; then + # Without this assignment, base_compile gets emptied. + fbsd_hideous_sh_bug=$base_compile + + if test no != "$pic_mode"; then + command="$base_compile $qsrcfile $pic_flag" + else + # Don't build PIC code + command="$base_compile $qsrcfile" + fi + + func_mkdir_p "$xdir$objdir" + + if test -z "$output_obj"; then + # Place PIC objects in $objdir + func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ + 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' + + if test warn = "$need_locks" && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support '-c' and '-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then + func_show_eval '$MV "$output_obj" "$lobj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + + # Allow error messages only from the first compilation. + if test yes = "$suppress_opt"; then + suppress_output=' >/dev/null 2>&1' + fi + fi + + # Only build a position-dependent object if we build old libraries. + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then + # Don't build PIC code + command="$base_compile $qsrcfile$pie_flag" + else + command="$base_compile $qsrcfile $pic_flag" + fi + if test yes = "$compiler_c_o"; then + func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. + func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + + if test warn = "$need_locks" && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support '-c' and '-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed + if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then + func_show_eval '$MV "$output_obj" "$obj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + fi + + $opt_dry_run || { + func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" + + # Unlock the critical section if it was locked + if test no != "$need_locks"; then + removelist=$lockfile + $RM "$lockfile" + fi + } + + exit $EXIT_SUCCESS +} + +$opt_help || { + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} +} + +func_mode_help () +{ + # We need to display help for each of the modes. + case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. + func_help + ;; + + clean) + $ECHO \ +"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... + +Remove files from the build directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed +to RM. + +If FILE is a libtool library, object or program, all the files associated +with it are deleted. Otherwise, only FILE itself is deleted using RM." + ;; + + compile) + $ECHO \ +"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE + +Compile a source file into a libtool library object. + +This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler + +COMPILE-COMMAND is a command to be used in creating a 'standard' object file +from the given SOURCEFILE. + +The output file name is determined by removing the directory component from +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." + ;; + + execute) + $ECHO \ +"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... + +Automatically set library path, then run a program. + +This mode accepts the following additional options: + + -dlopen FILE add the directory containing FILE to the library path + +This mode sets the library path environment variable according to '-dlopen' +flags. + +If any of the ARGS are libtool executable wrappers, then they are translated +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. + +Then, COMMAND is executed, with ARGS as arguments." + ;; + + finish) + $ECHO \ +"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... + +Complete the installation of libtool libraries. + +Each LIBDIR is a directory that contains libtool libraries. + +The commands that this mode executes may require superuser privileges. Use +the '--dry-run' option if you just want to see what would be executed." + ;; + + install) + $ECHO \ +"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... + +Install executables or libraries. + +INSTALL-COMMAND is the installation command. The first component should be +either the 'install' or 'cp' program. + +The following components of INSTALL-COMMAND are treated specially: + + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation + +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; + + link) + $ECHO \ +"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... + +Link object files or libraries together to form another library, or to +create an executable program. + +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. + +The following components of LINK-COMMAND are treated specially: + + -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened + -no-fast-install disable the fast-install mode + -no-install link a not-installable executable + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) + -precious-files-regex REGEX + don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -shared only do dynamic linking of libtool libraries + -shrext SUFFIX override the standard shared library file extension + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) + +All other options (arguments beginning with '-') are ignored. + +Every other argument is treated as a filename. Files ending in '.la' are +treated as uninstalled libtool libraries, other files are standard or library +object files. + +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is +required, except when creating a convenience library. + +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. + +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file +is created, otherwise an executable program is created." + ;; + + uninstall) + $ECHO \ +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... + +Remove libraries from an installation directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed +to RM. + +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." + ;; + + *) + func_fatal_help "invalid operation mode '$opt_mode'" + ;; + esac + + echo + $ECHO "Try '$progname --help' for more information about other modes." +} + +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test : = "$opt_help"; then + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + $SED '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi + + +# func_mode_execute arg... +func_mode_execute () +{ + $debug_cmd + + # The first argument is the command name. + cmd=$nonopt + test -z "$cmd" && \ + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. + for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "'$file' is not a file" + + dir= + case $file in + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "'$lib' is not a valid libtool archive" + + # Read the libtool library. + dlname= + library_names= + func_source "$file" + + # Skip this library if it cannot be dlopened. + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && \ + func_warning "'$file' was not linked with '-export-dynamic'" + continue + fi + + func_dirname "$file" "" "." + dir=$func_dirname_result + + if test -f "$dir/$objdir/$dlname"; then + func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" + fi + fi + ;; + + *.lo) + # Just add the directory containing the .lo file. + func_dirname "$file" "" "." + dir=$func_dirname_result + ;; + + *) + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" + continue + ;; + esac + + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` + test -n "$absdir" && dir=$absdir + + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic=$magic + + # Check if any of the arguments is a wrapper script. + args= + for file + do + case $file in + -* | *.la | *.lo ) ;; + *) + # Do a test to see if this is really a libtool program. + if func_ltwrapper_script_p "$file"; then + func_source "$file" + # Transform arg to wrapped name. + file=$progdir/$program + elif func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. + file=$progdir/$program + fi + ;; + esac + # Quote arguments (to preserve shell metacharacters). + func_append_quoted args "$file" + done + + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + fi + + # Restore saved environment variables + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" + done + + # Now prepare to actually exec the command. + exec_cmd=\$cmd$args + fi +} + +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} + + +# func_mode_finish arg... +func_mode_finish () +{ + $debug_cmd + + libs= + libdirs= + admincmds= + + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "'$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument '$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and '=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + func_execute_cmds "$finish_cmds" 'admincmds="$admincmds +'"$cmd"'"' + fi + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done + fi + + # Exit here if they wanted silent mode. + $opt_quiet && exit $EXIT_SUCCESS + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the '$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the '$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + $ECHO " - use the '$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" + fi + echo + + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi + exit $EXIT_SUCCESS +} + +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} + + +# func_mode_install arg... +func_mode_install () +{ + $debug_cmd + + # There may be an optional sh(1) argument at the beginning of + # install_prog (especially on Windows NT). + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || + # Allow the use of GNU shtool's install command. + case $nonopt in *shtool*) :;; *) false;; esac + then + # Aesthetically quote it. + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " + arg=$1 + shift + else + install_prog= + arg=$nonopt + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac + + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir=false + stripme= + no_mode=: + for arg + do + arg2= + if test -n "$dest"; then + func_append files " $dest" + dest=$arg + continue + fi + + case $arg in + -d) isdir=: ;; + -f) + if $install_cp; then :; else + prev=$arg + fi + ;; + -g | -m | -o) + prev=$arg + ;; + -s) + stripme=" -s" + continue + ;; + -*) + ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi + prev= + else + dest=$arg + continue + fi + ;; + esac + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ + func_fatal_help "you must specify an install program" + + test -n "$prev" && \ + func_fatal_help "the '$prev' option requires an argument" + + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + + if test -z "$files"; then + if test -z "$dest"; then + func_fatal_help "no file or destination specified" + else + func_fatal_help "you must specify a destination" + fi + fi + + # Strip any trailing slash from the destination. + func_stripname '' '/' "$dest" + dest=$func_stripname_result + + # Check to see that the destination is a directory. + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest + destname= + else + func_dirname_and_basename "$dest" "" "." + destdir=$func_dirname_result + destname=$func_basename_result + + # Not a directory, so check to see that there is only one file specified. + set dummy $files; shift + test "$#" -gt 1 && \ + func_fatal_help "'$dest' is not a directory" + fi + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + for file in $files; do + case $file in + *.lo) ;; + *) + func_fatal_help "'$destdir' must be an absolute directory name" + ;; + esac + done + ;; + esac + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic=$magic + + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do + + # Do each installation. + case $file in + *.$libext) + # Do the static libraries later. + func_append staticlibs " $file" + ;; + + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "'$file' is not a valid libtool archive" + + library_names= + old_library= + relink_command= + func_source "$file" + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir=$func_dirname_result + func_append dir "$objdir" + + if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. + test "$inst_prefix_dir" = "$destdir" && \ + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + fi + + func_warning "relinking '$file'" + func_show_eval "$relink_command" \ + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' + fi + + # See the names of the shared library. + set dummy $library_names; shift + if test -n "$1"; then + realname=$1 + shift + + srcname=$realname + test -n "$relink_command" && srcname=${realname}T + + # Install the shared library and build the symlinks. + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ + 'exit $?' + tstripme=$stripme + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= + ;; + esac + ;; + esac + if test -n "$tstripme" && test -n "$striplib"; then + func_show_eval "$striplib $destdir/$realname" 'exit $?' + fi + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. + # Try 'ln -sf' first, because the 'ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. + for linkname + do + test "$linkname" != "$realname" \ + && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" + done + fi + + # Do each command in the postinstall commands. + lib=$destdir/$realname + func_execute_cmds "$postinstall_cmds" 'exit $?' + fi + + # Install the pseudo-library for information purposes. + func_basename "$file" + name=$func_basename_result + instname=$dir/${name}i + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. + test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) + # Install (i.e. copy) a libtool object. + + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile=$destdir/$destname + else + func_basename "$file" + destfile=$func_basename_result + destfile=$destdir/$destfile + fi + + # Deduce the name of the destination old-style object file. + case $destfile in + *.lo) + func_lo2o "$destfile" + staticdest=$func_lo2o_result + ;; + *.$objext) + staticdest=$destfile + destfile= + ;; + *) + func_fatal_help "cannot copy a libtool object to '$destfile'" + ;; + esac + + # Install the libtool object if requested. + test -n "$destfile" && \ + func_show_eval "$install_prog $file $destfile" 'exit $?' + + # Install the old object if enabled. + if test yes = "$build_old_libs"; then + # Deduce the name of the old-style object file. + func_lo2o "$file" + staticobj=$func_lo2o_result + func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' + fi + exit $EXIT_SUCCESS + ;; + + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile=$destdir/$destname + else + func_basename "$file" + destfile=$func_basename_result + destfile=$destdir/$destfile + fi + + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install + stripped_ext= + case $file in + *.exe) + if test ! -f "$file"; then + func_stripname '' '.exe' "$file" + file=$func_stripname_result + stripped_ext=.exe + fi + ;; + esac + + # Do a test to see if this is really a libtool program. + case $host in + *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result + else + func_stripname '' '.exe' "$file" + wrapper=$func_stripname_result + fi + ;; + *) + wrapper=$file + ;; + esac + if func_ltwrapper_script_p "$wrapper"; then + notinst_deplibs= + relink_command= + + func_source "$wrapper" + + # Check the variables that should have been set. + test -z "$generated_by_libtool_version" && \ + func_fatal_error "invalid libtool wrapper script '$wrapper'" + + finalize=: + for lib in $notinst_deplibs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + func_source "$lib" + fi + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` + if test -n "$libdir" && test ! -f "$libfile"; then + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false + fi + done + + relink_command= + func_source "$wrapper" + + outputname= + if test no = "$fast_install" && test -n "$relink_command"; then + $opt_dry_run || { + if $finalize; then + tmpdir=`func_mktempdir` + func_basename "$file$stripped_ext" + file=$func_basename_result + outputname=$tmpdir/$file + # Replace the output file specification. + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_quiet || { + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" + } + if eval "$relink_command"; then : + else + func_error "error: relink '$file' with the above command before installing it" + $opt_dry_run || ${RM}r "$tmpdir" + continue + fi + file=$outputname + else + func_warning "cannot relink '$file'" + fi + } + else + # Install the binary that we compiled earlier. + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` + fi + fi + + # remove .exe since cygwin /usr/bin/install will append another + # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in + *.exe:*.exe) + # this is ok + ;; + *.exe:*) + destfile=$destfile.exe + ;; + *:*.exe) + func_stripname '' '.exe' "$destfile" + destfile=$func_stripname_result + ;; + esac + ;; + esac + func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' + $opt_dry_run || if test -n "$outputname"; then + ${RM}r "$tmpdir" + fi + ;; + esac + done + + for file in $staticlibs; do + func_basename "$file" + name=$func_basename_result + + # Set up the ranlib parameters. + oldlib=$destdir/$name + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + + func_show_eval "$install_prog \$file \$oldlib" 'exit $?' + + if test -n "$stripme" && test -n "$old_striplib"; then + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' + fi + + # Do each command in the postinstall commands. + func_execute_cmds "$old_postinstall_cmds" 'exit $?' + done + + test -n "$future_libdirs" && \ + func_warning "remember to run '$progname --finish$future_libdirs'" + + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' + else + exit $EXIT_SUCCESS + fi +} + +test install = "$opt_mode" && func_mode_install ${1+"$@"} + + +# func_generate_dlsyms outputname originator pic_p +# Extract symbols from dlprefiles and create ${outputname}S.o with +# a dlpreopen symbol table. +func_generate_dlsyms () +{ + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` + my_dlsyms= + + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + my_dlsyms=${my_outputname}S.c + else + func_error "not configured to extract global symbols from dlpreopened files" + fi + fi + + if test -n "$my_dlsyms"; then + case $my_dlsyms in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist=$output_objdir/$my_outputname.nm + + func_show_eval "$RM $nlist ${nlist}S ${nlist}T" + + # Parse the name list into a source file. + func_verbose "creating $output_objdir/$my_dlsyms" + + $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ + +#ifdef __cplusplus +extern \"C\" { +#endif + +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined __osf__ +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + +/* External symbol declarations for the compiler. */\ +" + + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" + + $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" + + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + export_symbols=$output_objdir/$outputname.exp + $opt_dry_run || { + $RM $export_symbols + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } + fi + fi + + for dlprefile in $dlprefiles; do + func_verbose "extracting global C symbols from '$dlprefile'" + func_basename "$dlprefile" + name=$func_basename_result + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename= + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname"; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename=$func_basename_result + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename"; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac + done + + $opt_dry_run || { + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $MV "$nlist"T "$nlist" + fi + + # Try sorting and uniquifying the output. + if $GREP -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then + : + else + $GREP -v "^: " < "$nlist" > "$nlist"S + fi + + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' + else + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + fi + + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + + echo >> "$output_objdir/$my_dlsyms" "\ + +/* The mapping between symbol names and symbols. */ +typedef struct { + const char *name; + void *address; +} lt_dlsymlist; +extern LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ +LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[] = +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi + + case $need_lib_prefix in + no) + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + *) + eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + esac + echo >> "$output_objdir/$my_dlsyms" "\ + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_${my_prefix}_LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif\ +" + } # !$opt_dry_run + + pic_flag_for_symtable= + case "$compile_command " in + *" -static "*) ;; + *) + case $host in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; + *-*-hpux*) + pic_flag_for_symtable=" $pic_flag" ;; + *) + $my_pic_p && pic_flag_for_symtable=" $pic_flag" + ;; + esac + ;; + esac + symtab_cflags= + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; + *) func_append symtab_cflags " $arg" ;; + esac + done + + # Now compile the dynamic symbol file. + func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' + + # Clean up the generated files. + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' + + # Transform the symbol file into the correct name. + symfileobj=$output_objdir/${my_outputname}S.$objext + case $host in + *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + else + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + fi + ;; + *) + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + ;; + esac + ;; + *) + func_fatal_error "unknown suffix for '$my_dlsyms'" + ;; + esac + else + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + + # Nullify the symbol file. + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` + fi +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. +func_win32_libid () +{ + $debug_cmd + + win32_libid_type=unknown + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ + s|.*|import| + p + q + } + }'` + ;; + esac + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $ECHO "$win32_libid_type" +} + +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $debug_cmd + + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $debug_cmd + + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1"; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result= + fi +} + + +# func_extract_an_archive dir oldlib +func_extract_an_archive () +{ + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test yes = "$lock_old_archive_extraction"; then + $opt_dry_run || rm -f "$lockfile" + fi + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" + fi +} + + +# func_extract_archives gentop oldlib ... +func_extract_archives () +{ + $debug_cmd + + my_gentop=$1; shift + my_oldlibs=${1+"$@"} + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= + + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + func_basename "$my_xlib" + my_xlib=$func_basename_result + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + func_arith $extracted_serial + 1 + extracted_serial=$func_arith_result + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u + + func_mkdir_p "$my_xdir" + + case $host in + *-darwin*) + func_verbose "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + $opt_dry_run || { + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result + darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` + if test -n "$darwin_arches"; then + darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" + cd "$darwin_curdir" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" + done # $darwin_arches + ## Okay now we've a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ + cd "$darwin_orig_dir" + else + cd $darwin_orig_dir + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + } # !$opt_dry_run + ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result=$my_oldobjs +} + + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory where it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=${1-no} + + $ECHO "\ +#! $SHELL + +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='$sed_quote_subst' + +# Be Bourne compatible +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command=\"$relink_command\" + +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + generated_by_libtool_version='$macro_version' + notinst_deplibs='$notinst_deplibs' +else + # When we are sourced in execute mode, \$file and \$ECHO are already set. + if test \"\$libtool_execute_magic\" != \"$magic\"; then + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ that is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options that match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` + + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; + esac + fi + + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + done + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then + thisdir=\`pwd\` + fi + # remove .libs from thisdir + case \"\$thisdir\" in + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; + $objdir ) thisdir=. ;; + esac + fi + + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" + + if test yes = "$fast_install"; then + $ECHO "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" + + if test ! -f \"\$progdir/\$program\" || + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then + + file=\"\$\$-\$program\" + + if test ! -d \"\$progdir\"; then + $MKDIR \"\$progdir\" + else + $RM \"\$progdir/\$file\" + fi" + + $ECHO "\ + + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + \$ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" + exit 1 + fi + fi + + $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $RM \"\$progdir/\$program\"; + $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $RM \"\$progdir/\$file\" + fi" + else + $ECHO "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" + fi + + $ECHO "\ + + if test -f \"\$progdir/\$program\"; then" + + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + + # Export our shlibpath_var if we have one. + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` + + export $shlibpath_var +" + fi + + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. + func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi\ +" +} + + +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because +# it depends on a number of variable set therein. +func_emit_cwrapperexe_src () +{ + cat < +#include +#ifdef _MSC_VER +# include +# include +# include +#else +# include +# include +# ifdef __CYGWIN__ +# include +# endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include + +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + +/* declarations of non-ANSI functions */ +#if defined __MINGW32__ +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined __CYGWIN__ +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined other_platform || defined ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined _MSC_VER +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +#elif defined __MINGW32__ +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined __CYGWIN__ +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined other platforms ... */ +#endif + +#if defined PATH_MAX +# define LT_PATHMAX PATH_MAX +#elif defined MAXPATHLEN +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif + +#ifndef S_IXOTH +# define S_IXOTH 0 +#endif +#ifndef S_IXGRP +# define S_IXGRP 0 +#endif + +/* path handling portability macros */ +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' +#endif + +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ +# define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif +#endif + +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ + +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif + +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free (stale); stale = 0; } \ +} while (0) + +#if defined LT_DEBUGWRAPPER +static int lt_debug = 1; +#else +static int lt_debug = 0; +#endif + +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + +void *xmalloc (size_t num); +char *xstrdup (const char *string); +const char *base_name (const char *name); +char *find_executable (const char *wrapper); +char *chase_symlinks (const char *pathspec); +int make_executable (const char *path); +int check_executable (const char *path); +char *strendzap (char *str, const char *pat); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); +void lt_setenv (const char *name, const char *value); +char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_update_exe_path (const char *name, const char *value); +void lt_update_lib_path (const char *name, const char *value); +char **prepare_spawn (char **argv); +void lt_dump_script (FILE *f); +EOF + + cat <= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else + return 0; +} + +int +make_executable (const char *path) +{ + int rval = 0; + struct stat st; + + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); + if ((!path) || (!*path)) + return 0; + + if (stat (path, &st) >= 0) + { + rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); + } + return rval; +} + +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise + Does not chase symlinks, even on platforms that support them. +*/ +char * +find_executable (const char *wrapper) +{ + int has_slash = 0; + const char *p; + const char *p_next; + /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; + size_t tmp_len; + char *concat_name; + + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; + + /* Absolute path? */ +#if defined HAVE_DOS_BASED_FILE_SYSTEM + if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } +#if defined HAVE_DOS_BASED_FILE_SYSTEM + } +#endif + + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char *path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char *q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR (*q)) + break; + p_len = (size_t) (q - p); + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = + XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + return NULL; +} + +char * +chase_symlinks (const char *pathspec) +{ +#ifndef S_ISLNK + return xstrdup (pathspec); +#else + char buf[LT_PATHMAX]; + struct stat s; + char *tmp_pathspec = xstrdup (pathspec); + char *p; + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) + { + has_symlinks = 1; + break; + } + + /* search backwards for last DIR_SEPARATOR */ + p = tmp_pathspec + strlen (tmp_pathspec) - 1; + while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + p--; + if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + { + /* no more DIR_SEPARATORS left */ + break; + } + *p = '\0'; + } + else + { + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); + + if (!has_symlinks) + { + return xstrdup (pathspec); + } + + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); +#endif +} + +char * +strendzap (char *str, const char *pat) +{ + size_t len, patlen; + + assert (str != NULL); + assert (pat != NULL); + + len = strlen (str); + patlen = strlen (pat); + + if (patlen <= len) + { + str += len - patlen; + if (STREQ (str, pat)) + *str = '\0'; + } + return str; +} + +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + +static void +lt_error_core (int exit_status, const char *file, + int line, const char *mode, + const char *message, va_list ap) +{ + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + + if (exit_status >= 0) + exit (exit_status); +} + +void +lt_fatal (const char *file, int line, const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); +} + +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + +void +lt_setenv (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); + { +#ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ + char *str = xstrdup (value); + setenv (name, str, 1); +#else + size_t len = strlen (name) + 1 + strlen (value) + 1; + char *str = XMALLOC (char, len); + sprintf (str, "%s=%s", name, value); + if (putenv (str) != EXIT_SUCCESS) + { + XFREE (str); + } +#endif + } +} + +char * +lt_extend_str (const char *orig_value, const char *add, int to_end) +{ + char *new_value; + if (orig_value && *orig_value) + { + size_t orig_value_len = strlen (orig_value); + size_t add_len = strlen (add); + new_value = XMALLOC (char, add_len + orig_value_len + 1); + if (to_end) + { + strcpy (new_value, orig_value); + strcpy (new_value + orig_value_len, add); + } + else + { + strcpy (new_value, add); + strcpy (new_value + add_len, orig_value); + } + } + else + { + new_value = xstrdup (add); + } + return new_value; +} + +void +lt_update_exe_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + /* some systems can't cope with a ':'-terminated path #' */ + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[--len] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +void +lt_update_lib_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' + cat <<"EOF" +} +EOF +} +# end: func_emit_cwrapperexe_src + +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $debug_cmd + + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + +# func_mode_link arg... +func_mode_link () +{ + $debug_cmd + + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # what system we are compiling for in order to pass an extra + # flag for every libtool invocation. + # allow_undefined=no + + # FIXME: Unfortunately, there are problems with the above when trying + # to make a dll that has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. + allow_undefined=yes + ;; + *) + allow_undefined=yes + ;; + esac + libtool_args=$nonopt + base_compile="$nonopt $@" + compile_command=$nonopt + finalize_command=$nonopt + + compile_rpath= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= + convenience= + old_convenience= + deplibs= + old_deplibs= + compiler_flags= + linker_flags= + dllsearchpath= + lib_search_path=`pwd` + inst_prefix_dir= + new_inherited_linker_flags= + + avoid_version=no + bindir= + dlfiles= + dlprefiles= + dlself=no + export_dynamic=no + export_symbols= + export_symbols_regex= + generated= + libobjs= + ltlibs= + module=no + no_install=no + objs= + os2dllname= + non_pic_objects= + precious_files_regex= + prefer_static_libs=no + preload=false + prev= + prevarg= + release= + rpath= + xrpath= + perm_rpath= + temp_rpath= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= + single_module=$wl-single_module + func_infer_tag $base_compile + + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in + -shared) + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" + build_old_libs=no + break + ;; + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then + func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=built + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac + build_libtool_libs=no + build_old_libs=yes + break + ;; + esac + done + + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes + + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg=$1 + shift + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) + func_append compile_command " @OUTPUT@" + func_append finalize_command " @OUTPUT@" + ;; + esac + + case $prev in + bindir) + bindir=$arg + prev= + continue + ;; + dlfiles|dlprefiles) + $preload || { + # Add the symbol object into the linking commands. + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" + preload=: + } + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) + if test no = "$dlself"; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + self) + if test dlprefiles = "$prev"; then + dlself=yes + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then + dlself=yes + else + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + *) + if test dlfiles = "$prev"; then + func_append dlfiles " $arg" + else + func_append dlprefiles " $arg" + fi + prev= + continue + ;; + esac + ;; + expsyms) + export_symbols=$arg + test -f "$arg" \ + || func_fatal_error "symbol file '$arg' does not exist" + prev= + continue + ;; + expsyms_regex) + export_symbols_regex=$arg + prev= + continue + ;; + framework) + case $host in + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; + *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; + esac + prev= + continue + ;; + inst_prefix) + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. + prev= + continue + ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg + moreargs= + for fil in `cat "$save_arg"` + do +# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + if test -z "$pic_object" || + test -z "$non_pic_object" || + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir=$func_dirname_result + + if test none != "$pic_object"; then + # Prepend the subdirectory the object is found in. + pic_object=$xdir$pic_object + + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test dlprefiles = "$prev"; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg=$pic_object + fi + + # Non-PIC object. + if test none != "$non_pic_object"; then + # Prepend the subdirectory the object is found in. + non_pic_object=$xdir$non_pic_object + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object=$pic_object + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir=$func_dirname_result + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "'$arg' is not a valid libtool object" + fi + fi + done + else + func_fatal_error "link input file '$arg' does not exist" + fi + arg=$save_arg + prev= + continue + ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; + precious_regex) + precious_files_regex=$arg + prev= + continue + ;; + release) + release=-$arg + prev= + continue + ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + if test rpath = "$prev"; then + case "$rpath " in + *" $arg "*) ;; + *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; + *) func_append xrpath " $arg" ;; + esac + fi + prev= + continue + ;; + shrext) + shrext_cmds=$arg + prev= + continue + ;; + weak) + func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" + continue + ;; + *) + eval "$prev=\"\$arg\"" + prev= + continue + ;; + esac + fi # test -n "$prev" + + prevarg=$arg + + case $arg in + -all-static) + if test -n "$link_static_flag"; then + # See comment for -static flag below, for more details. + func_append compile_command " $link_static_flag" + func_append finalize_command " $link_static_flag" + fi + continue + ;; + + -allow-undefined) + # FIXME: remove this flag sometime in the future. + func_fatal_error "'-allow-undefined' must not be used because it is the default" + ;; + + -avoid-version) + avoid_version=yes + continue + ;; + + -bindir) + prev=bindir + continue + ;; + + -dlopen) + prev=dlfiles + continue + ;; + + -dlpreopen) + prev=dlprefiles + continue + ;; + + -export-dynamic) + export_dynamic=yes + continue + ;; + + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + func_fatal_error "more than one -exported-symbols argument is not allowed" + fi + if test X-export-symbols = "X$arg"; then + prev=expsyms + else + prev=expsyms_regex + fi + continue + ;; + + -framework) + prev=framework + continue + ;; + + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* + # so, if we see these flags be careful not to treat them like -L + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix* | /*-*-irix*) + func_append compile_command " $arg" + func_append finalize_command " $arg" + ;; + esac + continue + ;; + + -L*) + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between '-L' and '$1'" + else + func_fatal_error "need path for '-L' option" + fi + fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir + ;; + esac + case "$deplibs " in + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; + *) + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" + ;; + esac + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; + *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + continue + ;; + + -l*) + if test X-lc = "X$arg" || test X-lm = "X$arg"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + # These systems don't actually have a C or math library (as such) + continue + ;; + *-*-os2*) + # These systems don't actually have a C library (as such) + test X-lc = "X$arg" && continue + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + # Do not include libc due to us having libc/libc_r. + test X-lc = "X$arg" && continue + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework + func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test X-lc = "X$arg" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test X-lc = "X$arg" && continue + ;; + esac + elif test X-lc_r = "X$arg"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; + esac + fi + func_append deplibs " $arg" + continue + ;; + + -mllvm) + prev=mllvm + continue + ;; + + -module) + module=yes + continue + ;; + + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler + continue + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; + + -multi_module) + single_module=$wl-multi_module + continue + ;; + + -no-fast-install) + fast_install=no + continue + ;; + + -no-install) + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows + # and Darwin in order for the loader to find any dlls it needs. + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" + fast_install=no + ;; + *) no_install=yes ;; + esac + continue + ;; + + -no-undefined) + allow_undefined=no + continue + ;; + + -objectlist) + prev=objectlist + continue + ;; + + -os2dllname) + prev=os2dllname + continue + ;; + + -o) prev=output ;; + + -precious-files-regex) + prev=precious_regex + continue + ;; + + -release) + prev=release + continue + ;; + + -rpath) + prev=rpath + continue + ;; + + -R) + prev=xrpath + continue + ;; + + -R*) + func_stripname '-R' '' "$arg" + dir=$func_stripname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + continue + ;; + + -shared) + # The effects of -shared are defined in a previous loop. + continue + ;; + + -shrext) + prev=shrext + continue + ;; + + -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects + # would be equivalent was wrong. It would break on at least + # Digital Unix and AIX. + continue + ;; + + -thread-safe) + thread_safe=yes + continue + ;; + + -version-info) + prev=vinfo + continue + ;; + + -version-number) + prev=vinfo + vinfo_number=yes + continue + ;; + + -weak) + prev=weak + continue + ;; + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs=$IFS; IFS=, + for flag in $args; do + IFS=$save_ifs + func_quote_for_eval "$flag" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" + done + IFS=$save_ifs + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs=$IFS; IFS=, + for flag in $args; do + IFS=$save_ifs + func_quote_for_eval "$flag" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" + done + IFS=$save_ifs + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Xcompiler) + prev=xcompiler + continue + ;; + + -Xlinker) + prev=xlinker + continue + ;; + + -XCClinker) + prev=xcclinker + continue + ;; + + # -msg_* for osf cc + -msg_*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + ;; + + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*|-fsanitize=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" + func_append finalize_command " $arg" + func_append compiler_flags " $arg" + continue + ;; + + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + + # Some other compiler flag. + -* | +*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + ;; + + *.$objext) + # A standard object. + func_append objs " $arg" + ;; + + *.lo) + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + if test -z "$pic_object" || + test -z "$non_pic_object" || + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir=$func_dirname_result + + test none = "$pic_object" || { + # Prepend the subdirectory the object is found in. + pic_object=$xdir$pic_object + + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test dlprefiles = "$prev"; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg=$pic_object + } + + # Non-PIC object. + if test none != "$non_pic_object"; then + # Prepend the subdirectory the object is found in. + non_pic_object=$xdir$non_pic_object + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object=$pic_object + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir=$func_dirname_result + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "'$arg' is not a valid libtool object" + fi + fi + ;; + + *.$libext) + # An archive. + func_append deplibs " $arg" + func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + + func_resolve_sysroot "$arg" + if test dlfiles = "$prev"; then + # This library was specified with -dlopen. + func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test dlprefiles = "$prev"; then + # The library was specified with -dlpreopen. + func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else + func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; + + # Some other compiler argument. + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + ;; + esac # arg + + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + done # argument parsing loop + + test -n "$prev" && \ + func_fatal_help "the '$prevarg' option requires an argument" + + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + + oldlibs= + # calculate the name of the file, without its directory + func_basename "$output" + outputname=$func_basename_result + libobjs_save=$libobjs + + if test -n "$shlibpath_var"; then + # get the directories listed in $shlibpath_var + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` + else + shlib_search_path= + fi + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + + func_dirname "$output" "/" "" + output_objdir=$func_dirname_result$objdir + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + + # Determine the type of output + case $output in + "") + func_fatal_help "you must specify an output file" + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; + *.la) linkmode=lib ;; + *) linkmode=prog ;; # Anything else should be a program. + esac + + specialdeplibs= + + libs= + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do + if $opt_preserve_dup_deps; then + case "$libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append libs " $deplib" + done + + if test lib = "$linkmode"; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac + func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= + fi + + deplibs= + newdependency_libs= + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries + + case $linkmode in + lib) + passes="conv dlpreopen link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" + ;; + esac + done + ;; + prog) + compile_deplibs= + finalize_deplibs= + alldeplibs=false + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" + ;; + *) passes="conv" + ;; + esac + + for pass in $passes; do + # The preopen pass in lib mode reverses $deplibs; put it back here + # so that -L comes before libs that need it for instance... + if test lib,link = "$linkmode,$pass"; then + ## FIXME: Find the place where the list is rebuilt in the wrong + ## order, and fix it there properly + tmp_deplibs= + for deplib in $deplibs; do + tmp_deplibs="$deplib $tmp_deplibs" + done + deplibs=$tmp_deplibs + fi + + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs + deplibs= + fi + if test prog = "$linkmode"; then + case $pass in + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; + esac + fi + if test lib,dlpreopen = "$linkmode,$pass"; then + # Collect and forward deplibs of preopened libtool libs + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= + func_resolve_sysroot "$lib" + case $lib in + *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library + # has declared as weak libs + for deplib in $dependency_libs; do + func_basename "$deplib" + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; + *) func_append deplibs " $deplib" ;; + esac + done + done + libs=$dlprefiles + fi + if test dlopen = "$pass"; then + # Collect dlpreopened libraries + save_deplibs=$deplibs + deplibs= + fi + + for deplib in $libs; do + lib= + found=false + case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append compiler_flags " $deplib" + if test lib = "$linkmode"; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -l*) + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" + continue + fi + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test lib = "$linkmode"; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib=$searchdir/lib$name$search_ext + if test -f "$lib"; then + if test .la = "$search_ext"; then + found=: + else + found=false + fi + break 2 + fi + done + done + if $found; then + # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll=$l + done + if test "X$ll" = "X$old_library"; then # only static version available + found=false + func_dirname "$lib" "" "." + ladir=$func_dirname_result + lib=$ladir/$old_library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + ;; # -l + *.ltframework) + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + if test lib = "$linkmode"; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test conv = "$pass" && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test conv = "$pass"; then + deplibs="$deplib $deplibs" + continue + fi + if test scan = "$pass"; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "'-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test link = "$pass"; then + func_stripname '-R' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; + *.$libext) + if test conv = "$pass"; then + deplibs="$deplib $deplibs" + continue + fi + case $linkmode in + lib) + # Linking convenience modules into shared libraries is allowed, + # but linking other static libraries is non-portable. + case " $dlpreconveniencelibs " in + *" $deplib "*) ;; + *) + valid_a_lib=false + case $deplibs_check_method in + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + valid_a_lib=: + fi + ;; + pass_all) + valid_a_lib=: + ;; + esac + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else + echo + $ECHO "*** Warning: Trying to link with static lib archive $deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." + fi + ;; + esac + continue + ;; + prog) + if test link != "$pass"; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + continue + ;; + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) + if test conv = "$pass"; then + deplibs="$deplib $deplibs" + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append newdlfiles " $deplib" + fi + fi + continue + ;; + %DEPLIBS%) + alldeplibs=: + continue + ;; + esac # case $deplib + + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$lib" \ + || func_fatal_error "'$lib' is not a valid libtool archive" + + func_dirname "$lib" "" "." + ladir=$func_dirname_result + + dlname= + dlopen= + dlpreopen= + libdir= + library_names= + old_library= + inherited_linker_flags= + # If the library was installed with an old release of libtool, + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no + avoidtemprpath= + + + # Read the .la file + func_source "$lib" + + # Convert "-framework foo" to "foo.ltframework" + if test -n "$inherited_linker_flags"; then + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test conv = "$pass"; then + # Only check for convenience libraries + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then + func_fatal_error "cannot find name of link library for '$lib'" + fi + # It is a libtool convenience library, so add in its objects. + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" + fi + continue + fi # $pass = conv + + + # Get the name of the library we link against. + linklib= + if test -n "$old_library" && + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do + linklib=$l + done + fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for '$lib'" + fi + + # This library was specified with -dlopen. + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" + if test -z "$dlname" || + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. + func_append dlprefiles " $lib $dependency_libs" + else + func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen + + # We need an absolute path. + case $ladir in + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then + func_warning "cannot determine absolute directory name of '$ladir'" + func_warning "passing it literally to the linker, although it might fail" + abs_ladir=$ladir + fi + ;; + esac + func_basename "$lib" + laname=$func_basename_result + + # Find the relevant object directory and library name. + if test yes = "$installed"; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir + else + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir + fi + test yes = "$hardcode_automatic" && avoidtemprpath=yes + else + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir=$ladir + absdir=$abs_ladir + # Remove this search path later + func_append notinst_path " $abs_ladir" + else + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir + # Remove this search path later + func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" + name=$func_stripname_result + + # This library was specified with -dlpreopen. + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" + fi + case $host in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then + # Link the convenience library + if test lib = "$linkmode"; then + deplibs="$dir/$old_library $deplibs" + elif test prog,link = "$linkmode,$pass"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else + deplibs="$lib $deplibs" # used for prog,scan pass + fi + continue + fi + + + if test prog = "$linkmode" && test link != "$pass"; then + func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: + fi + + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? + if $linkalldeplibs; then + deplibs="$deplib $deplibs" + else + # Need to hardcode shared library paths + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... + + if test prog,link = "$linkmode,$pass"; then + if test -n "$library_names" && + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || + test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then + # Make sure the rpath contains only unique directories. + case $temp_rpath: in + *"$absdir:"*) ;; + *) func_append temp_rpath "$absdir:" ;; + esac + fi + + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi # $linkmode,$pass = prog,link... + + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + fi + + link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test built = "$use_static_libs" && test yes = "$installed"; then + use_static_libs=no + fi + if test -n "$library_names" && + { test no = "$use_static_libs" || test -z "$old_library"; }; then + case $host in + *cygwin* | *mingw* | *cegcc* | *os2*) + # No point in relinking DLLs because paths are not encoded + func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test no = "$installed"; then + func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; + esac + # This is a shared library + + # Warn about portability, can't link against -module's on some + # systems (darwin). Don't bleat about dlopened modules though! + dlopenmodule= + for dlpremoduletest in $dlprefiles; do + if test "X$dlpremoduletest" = "X$lib"; then + dlopenmodule=$dlpremoduletest + break + fi + done + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then + echo + if test prog = "$linkmode"; then + $ECHO "*** Warning: Linking the executable $output against the loadable module" + else + $ECHO "*** Warning: Linking the shared library $output against the loadable module" + fi + $ECHO "*** $linklib is not portable!" + fi + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi + + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names + shift + realname=$1 + shift + libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname=$dlname + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin* | mingw* | *cegcc* | *os2*) + func_arith $current - $age + major=$func_arith_result + versuffix=-$major + ;; + esac + eval soname=\"$soname_spec\" + else + soname=$realname + fi + + # Make a new name for the extract_expsyms_cmds to use + soroot=$soname + func_basename "$soroot" + soname=$func_basename_result + func_stripname 'lib' '.dll' "$soname" + newlib=libimp-$func_stripname_result.a + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else + func_verbose "extracting exported symbol list from '$soname'" + func_execute_cmds "$extract_expsyms_cmds" 'exit $?' + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else + func_verbose "generating import library for '$soname'" + func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + + if test prog = "$linkmode" || test relink != "$opt_mode"; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) + if test no = "$hardcode_direct"; then + add=$dir/$linklib + case $host in + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir=-L$dir ;; + *-*-darwin* ) + # if the lib is a (non-dlopened) module then we cannot + # link against it, someone is ignoring the earlier warnings + if /usr/bin/file -L $add 2> /dev/null | + $GREP ": [^:]* bundle" >/dev/null; then + if test "X$dlopenmodule" != "X$lib"; then + $ECHO "*** Warning: lib $linklib is a module, not a shared library" + if test -z "$old_library"; then + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" + else + add=$dir/$old_library + fi + elif test -n "$old_library"; then + add=$dir/$old_library + fi + fi + esac + elif test no = "$hardcode_minus_L"; then + case $host in + *-*-sunos*) add_shlibpath=$dir ;; + esac + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name + else + lib_linked=no + fi + ;; + relink) + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name + else + lib_linked=no + fi + ;; + *) lib_linked=no ;; + esac + + if test yes != "$lib_linked"; then + func_fatal_configuration "unsupported hardcode properties" + fi + + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test prog = "$linkmode"; then + test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" + test -n "$add" && compile_deplibs="$add $compile_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + + if test prog = "$linkmode" || test relink = "$opt_mode"; then + add_shlibpath= + add_dir= + add= + # Finalize command for both is simple: just hardcode it. + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + add=-l$name + elif test yes = "$hardcode_automatic"; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib + else + add=$libdir/$linklib + fi + else + # We cannot seem to hardcode it, guess we'll fake it. + add_dir=-L$libdir + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add=-l$name + fi + + if test prog = "$linkmode"; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + fi + fi + elif test prog = "$linkmode"; then + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library + compile_deplibs="$dir/$linklib $compile_deplibs" + finalize_deplibs="$dir/$linklib $finalize_deplibs" + else + compile_deplibs="-l$name -L$dir $compile_deplibs" + finalize_deplibs="-l$name -L$dir $finalize_deplibs" + fi + elif test yes = "$build_libtool_libs"; then + # Not a shared library + if test pass_all != "$deplibs_check_method"; then + # We're trying link a shared library against a static one + # but the system doesn't support it. + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. + echo + $ECHO "*** Warning: This system cannot link to static lib archive $lib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + if test yes = "$module"; then + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** 'nm' from GNU binutils and a full rebuild may help." + fi + if test no = "$build_old_libs"; then + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + else + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test lib = "$linkmode"; then + if test -n "$dependency_libs" && + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in + -R*) func_stripname '-R' '' "$libdir" + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) func_append xrpath " $temp_xrpath";; + esac;; + *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs=$temp_deplibs + fi + + func_append newlib_search_path " $absdir" + # Link against this library + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi + func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test no != "$link_all_deplibs"; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + path= + case $deplib in + -L*) path=$deplib ;; + *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." + dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir + fi + ;; + esac + if $GREP "^installed=no" $deplib > /dev/null; then + case $host in + *-*-darwin*) + depdepl= + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do + depdepl=$tmp + done + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -z "$darwin_install_name"; then + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" + path= + fi + fi + ;; + *) + path=-L$absdir/$objdir + ;; + esac + else + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "'$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ + func_warning "'$deplib' seems to be moved" + + path=-L$absdir + fi + ;; + esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs + if test link = "$pass"; then + if test prog = "$linkmode"; then + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" + finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" + else + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + fi + fi + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then + # Link the dlpreopened libraries before other libraries + for deplib in $save_deplibs; do + deplibs="$deplib $deplibs" + done + fi + if test dlopen != "$pass"; then + test conv = "$pass" || { + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; + *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= + } + + if test prog,link = "$linkmode,$pass"; then + vars="compile_deplibs finalize_deplibs" + else + vars=deplibs + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order + eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: + case $deplib in + -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; + *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. + case " $specialdeplibs " in + *" $deplib "*) new_libs="$deplib $new_libs" ;; + *) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$deplib $new_libs" ;; + esac + ;; + esac + ;; + esac + done + tmp_libs= + for deplib in $new_libs; do + case $deplib in + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; + *) func_append tmp_libs " $deplib" ;; + esac + ;; + *) func_append tmp_libs " $deplib" ;; + esac + done + eval $var=\"$tmp_libs\" + done # for var + fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i= + ;; + esac + if test -n "$i"; then + func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs + done # for pass + if test prog = "$linkmode"; then + dlfiles=$newdlfiles + fi + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles + fi + + case $linkmode in + oldlib) + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "'-l' and '-L' are ignored for archives" ;; + esac + + test -n "$rpath" && \ + func_warning "'-rpath' is ignored for archives" + + test -n "$xrpath" && \ + func_warning "'-R' is ignored for archives" + + test -n "$vinfo" && \ + func_warning "'-version-info/-version-number' is ignored for archives" + + test -n "$release" && \ + func_warning "'-release' is ignored for archives" + + test -n "$export_symbols$export_symbols_regex" && \ + func_warning "'-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs=$output + func_append objs "$old_deplibs" + ;; + + lib) + # Make sure we only generate libraries of the form 'libNAME.la'. + case $outputname in + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" + + if test no != "$need_lib_prefix"; then + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result + fi + ;; + esac + + if test -n "$objs"; then + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" + else + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" + func_append libobjs " $objs" + fi + fi + + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" + + set dummy $rpath + shift + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" + + install_libdir=$1 + + oldlibs= + if test -z "$rpath"; then + if test yes = "$build_libtool_libs"; then + # Building a libtool convenience library. + # Some compilers have problems with a '.al' extension so + # convenience libraries should have the same extension an + # archive normally would. + oldlibs="$output_objdir/$libname.$libext $oldlibs" + build_libtool_libs=convenience + build_old_libs=yes + fi + + test -n "$vinfo" && \ + func_warning "'-version-info/-version-number' is ignored for convenience libraries" + + test -n "$release" && \ + func_warning "'-release' is ignored for convenience libraries" + else + + # Parse the version information argument. + save_ifs=$IFS; IFS=: + set dummy $vinfo 0 0 0 + shift + IFS=$save_ifs + + test -n "$7" && \ + func_fatal_help "too many parameters to '-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + number_major=$1 + number_minor=$2 + number_revision=$3 + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix + # that has an extra 1 added just for fun + # + case $version_type in + # correct linux to gnu/linux during the next big refactor + darwin|freebsd-elf|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age=$number_minor + revision=$number_revision + ;; + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 + ;; + irix|nonstopux) + func_arith $number_major + $number_minor + current=$func_arith_result + age=$number_minor + revision=$number_minor + lt_irix_increment=no + ;; + *) + func_fatal_configuration "$modename: unknown library version type '$version_type'" + ;; + esac + ;; + no) + current=$1 + revision=$2 + age=$3 + ;; + esac + + # Check that each of the things are valid numbers. + case $current in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" + ;; + esac + + case $revision in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" + ;; + esac + + case $age in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" + ;; + esac + + if test "$age" -gt "$current"; then + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case $version_type in + none) ;; + + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision + # Darwin ld doesn't like 0 for these options... + func_arith $current + 1 + minor_current=$func_arith_result + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac + ;; + + freebsd-aout) + major=.$current + versuffix=.$current.$revision + ;; + + freebsd-elf) + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision + ;; + + irix | nonstopux) + if test no = "$lt_irix_increment"; then + func_arith $current - $age + else + func_arith $current - $age + 1 + fi + major=$func_arith_result + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac + verstring=$verstring_prefix$major.$revision + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test 0 -ne "$loop"; do + func_arith $revision - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring=$verstring_prefix$major.$iface:$verstring + done + + # Before this point, $major must not contain '.'. + major=.$major + versuffix=$major.$revision + ;; + + linux) # correct to gnu/linux during the next big refactor + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision + ;; + + osf) + func_arith $current - $age + major=.$func_arith_result + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision + + # Add in all the interfaces that we are compatible with. + loop=$age + while test 0 -ne "$loop"; do + func_arith $current - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring=$verstring:$iface.0 + done + + # Make executables depend on our current version. + func_append verstring ":$current.0" + ;; + + qnx) + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current + ;; + + sunos) + major=.$current + versuffix=.$current.$revision + ;; + + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 file systems. + func_arith $current - $age + major=$func_arith_result + versuffix=-$major + ;; + + *) + func_fatal_configuration "unknown library version type '$version_type'" + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring= + ;; + *) + verstring=0.0 + ;; + esac + if test no = "$need_version"; then + versuffix= + else + versuffix=.0.0 + fi + fi + + # Remove version info from name if versioning should be avoided + if test yes,no = "$avoid_version,$need_version"; then + major= + versuffix= + verstring= + fi + + # Check to see if the archive will have undefined symbols. + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi + fi + else + # Don't allow undefined symbols. + allow_undefined_flag=$no_undefined_flag + fi + + fi + + func_generate_dlsyms "$libname" "$libname" : + func_append libobjs " $symfileobj" + test " " = "$libobjs" && libobjs= + + if test relink != "$opt_mode"; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then + if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi + func_append removelist " $p" + ;; + *) ;; + esac + done + test -n "$removelist" && \ + func_show_eval "${RM}r \$removelist" + fi + + # Now set the variables for building old libraries. + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then + func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. + #for path in $notinst_path; do + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` + #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened + old_dlfiles=$dlfiles + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; + *) func_append dlfiles " $lib" ;; + esac + done + + # Make sure dlprefiles contains only unique files + old_dlprefiles=$dlprefiles + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; + *) func_append dlprefiles " $lib" ;; + esac + done + + if test yes = "$build_libtool_libs"; then + if test -n "$rpath"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test yes = "$build_libtool_need_lc"; then + func_append deplibs " -lc" + fi + ;; + esac + fi + + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? + release= + versuffix= + major= + newdeplibs= + droppeddeps=no + case $deplibs_check_method in + pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behavior. + newdeplibs=$deplibs + ;; + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $opt_dry_run || $RM conftest.c + cat > conftest.c </dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | + $GREP " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib=$potent_lib + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` + case $potliblink in + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; + esac + done + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib= + break 2 + fi + done + done + fi + if test -n "$a_deplib"; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib"; then + $ECHO "*** with $libname but no candidates were found. (...for file magic test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a file magic. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + for a_deplib in $deplibs; do + case $a_deplib in + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + case " $predeps $postdeps " in + *" $a_deplib "*) + func_append newdeplibs " $a_deplib" + a_deplib= + ;; + esac + fi + if test -n "$a_deplib"; then + libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib=$potent_lib # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib= + break 2 + fi + done + done + fi + if test -n "$a_deplib"; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib"; then + $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a regex pattern. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + none | unknown | *) + newdeplibs= + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do + # can't use Xsed below, because $i might contain '/' + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` + done + fi + case $tmp_deplibs in + *[!\ \ ]*) + echo + if test none = "$deplibs_check_method"; then + echo "*** Warning: inter-library dependencies are not supported in this platform." + else + echo "*** Warning: inter-library dependencies are not known to be supported." + fi + echo "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + ;; + esac + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library with the System framework + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + if test yes = "$droppeddeps"; then + if test yes = "$module"; then + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO "*** dependencies of module $libname. Therefore, libtool will create" + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** 'nm' from GNU binutils and a full rebuild may help." + fi + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + else + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." + + if test no = "$allow_undefined"; then + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + fi + fi + # Done checking deplibs! + deplibs=$newdeplibs + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + case $host in + *-*-darwin*) + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + deplibs=$new_libs + + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + dlname= + + # Test again, we may have decided not to build it any more + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac + if test yes = "$hardcode_into_libs"; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs=$libdir + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir=$hardcode_libdirs + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. + eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname=$1 + shift + + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname=$realname + fi + if test -z "$dlname"; then + dlname=$soname + fi + + lib=$output_objdir/$realname + linknames= + for link + do + func_append linknames " $link" + done + + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` + test "X$libobjs" = "X " && libobjs= + + delfiles= + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp + func_append delfiles " $export_symbols" + fi + + orig_export_symbols= + case $host_os in + cygwin* | mingw* | cegcc*) + if test -n "$export_symbols" && test -z "$export_symbols_regex"; then + # exporting using user supplied symfile + func_dll_def_p "$export_symbols" || { + # and it's NOT already a .def file. Must figure out + # which of the given symbols are data symbols and tag + # them as such. So, trigger use of export_symbols_cmds. + # export_symbols gets reassigned inside the "prepare + # the list of exported symbols" if statement, so the + # include_expsyms logic still works. + orig_export_symbols=$export_symbols + export_symbols= + always_export_symbols=yes + } + fi + ;; + esac + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs=$IFS; IFS='~' + for cmd1 in $cmds; do + IFS=$save_ifs + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test yes = "$try_normal_branch" \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=$output_objdir/$output_la.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. + func_verbose "using reloadable object file for export list..." + skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break + fi + done + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + fi + + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands, which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + func_append tmp_deplibs " $test_deplib" + ;; + esac + done + deplibs=$tmp_deplibs + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec" && + test yes = "$compiler_needs_object" && + test -z "$libobjs"; then + # extract the archives, so we have objects to list. + # TODO: could optimize this to just extract one archive. + whole_archive_flag_spec= + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $convenience + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking + if test relink = "$opt_mode"; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test yes = "$module" && test -n "$module_cmds"; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi + + if test : != "$skipped_export" && + func_len " $test_cmds" && + len=$func_len_result && + test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise + # or, if using GNU ld and skipped_export is not :, use a linker + # script. + + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + func_basename "$output" + output_la=$func_basename_result + + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + last_robj= + k=1 + + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript + func_verbose "creating GNU ld script: $output" + echo 'INPUT (' > $output + for obj in $save_libobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk + func_verbose "creating linker input file list: $output" + : > $output + set x $save_libobjs + shift + firstobj= + if test yes = "$compiler_needs_object"; then + firstobj="$1 " + shift + fi + for obj + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-$k.$objext + eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + if test -z "$objlist" || + test "$len" -lt "$max_cmd_len"; then + func_append objlist " $obj" + else + # The command $test_cmds is almost too long, add a + # command to the queue. + if test 1 -eq "$k"; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-$k.$objext + func_arith $k + 1 + k=$func_arith_result + output=$output_objdir/$output_la-$k.$objext + objlist=" $obj" + func_len " $last_robj" + func_arith $len0 + $func_len_result + len=$func_arith_result + fi + done + # Handle the remaining objects by creating one last + # reloadable object file. All subsequent reloadable object + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + func_append delfiles " $output" + + else + output= + fi + + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp + $opt_dry_run || $RM $export_symbols + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + } + + test -n "$save_libobjs" && + func_verbose "creating a temporary reloadable object file: $output" + + # Loop through the commands generated above and execute them. + save_ifs=$IFS; IFS='~' + for cmd in $concat_cmds; do + IFS=$save_ifs + $opt_quiet || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test relink = "$opt_mode"; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS=$save_ifs + + if test -n "$export_symbols_regex" && ${skipped_export-false}; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + + ${skipped_export-false} && { + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands, which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + } + + libobjs=$output + # Restore the value of output. + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. + if test yes = "$module" && test -n "$module_cmds"; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds + else + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi + fi + fi + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. + eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs=$IFS; IFS='~' + for cmd in $cmds; do + IFS=$sp$nl + eval cmd=\"$cmd\" + IFS=$save_ifs + $opt_quiet || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test relink = "$opt_mode"; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS=$save_ifs + + # Restore the uninstalled library and exit + if test relink = "$opt_mode"; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + func_show_eval '${RM}r "$gentop"' + fi + fi + + exit $EXIT_SUCCESS + fi + + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + fi + done + + # If -module or -export-dynamic was specified, set the dlname. + if test yes = "$module" || test yes = "$export_dynamic"; then + # On all known operating systems, these are identical. + dlname=$soname + fi + fi + ;; + + obj) + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "'-l' and '-L' are ignored for objects" ;; + esac + + test -n "$rpath" && \ + func_warning "'-rpath' is ignored for objects" + + test -n "$xrpath" && \ + func_warning "'-R' is ignored for objects" + + test -n "$vinfo" && \ + func_warning "'-version-info' is ignored for objects" + + test -n "$release" && \ + func_warning "'-release' is ignored for objects" + + case $output in + *.lo) + test -n "$objs$old_deplibs" && \ + func_fatal_error "cannot build library object '$output' from non-libtool objects" + + libobj=$output + func_lo2o "$libobj" + obj=$func_lo2o_result + ;; + *) + libobj= + obj=$output + ;; + esac + + # Delete the old objects. + $opt_dry_run || $RM $obj $libobj + + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags + else + gentop=$output_objdir/${obj}x + func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + + # If we're not building shared, we need to use non_pic_objs + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects + + # Create the old-style object. + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs + + output=$obj + func_execute_cmds "$reload_cmds" 'exit $?' + + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS + fi + + test yes = "$build_libtool_libs" || { + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + } + + if test -n "$pic_flag" || test default != "$pic_mode"; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output=$libobj + func_execute_cmds "$reload_cmds" 'exit $?' + fi + + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS + ;; + + prog) + case $host in + *cygwin*) func_stripname '' '.exe' "$output" + output=$func_stripname_result.exe;; + esac + test -n "$vinfo" && \ + func_warning "'-version-info' is ignored for programs" + + test -n "$release" && \ + func_warning "'-release' is ignored for programs" + + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + case $host in + *-*-darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + # But is supposedly fixed on 10.4 or later (yay!). + if test CXX = "$tagname"; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" + ;; + esac + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs=$new_libs + + + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + fi + + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs=$libdir + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; + *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir=$hardcode_libdirs + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath=$rpath + + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs=$libdir + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir=$hardcode_libdirs + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath=$rpath + + if test -n "$libobjs" && test yes = "$build_old_libs"; then + # Transform all the library objects into standard objects. + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + fi + + func_generate_dlsyms "$outputname" "@PROGRAM@" false + + # template prelinking step + if test -n "$prelink_cmds"; then + func_execute_cmds "$prelink_cmds" 'exit $?' + fi + + wrappers_required=: + case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=false + ;; + *cygwin* | *mingw* ) + test yes = "$build_libtool_libs" || wrappers_required=false + ;; + *) + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false + fi + ;; + esac + $wrappers_required || { + # Replace the output file specification. + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + link_command=$compile_command$compile_rpath + + # We have no uninstalled library dependencies, so finalize right now. + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' + fi + + exit $exit_status + } + + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi + + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + fi + + if test yes = "$no_install"; then + # We don't need to create a wrapper script. + link_command=$compile_var$compile_command$compile_rpath + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + exit $EXIT_SUCCESS + fi + + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac + + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + + # Delete the old output files. + $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname + + func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + # Now create the wrapper script. + func_verbose "creating $output" + + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + fi + + # Only actually do things if not in dry run mode. + $opt_dry_run || { + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) func_stripname '' '.exe' "$output" + output=$func_stripname_result ;; + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) + exeext=.exe + func_stripname '' '.exe' "$outputname" + outputname=$func_stripname_result ;; + *) exeext= ;; + esac + case $host in + *cygwin* | *mingw* ) + func_dirname_and_basename "$output" "" "." + output_name=$func_basename_result + output_path=$func_dirname_result + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe + $RM $cwrappersource $cwrapper + trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + func_emit_cwrapperexe_src > $cwrappersource + + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. + $opt_dry_run || { + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + $STRIP $cwrapper + } + + # Now, create the wrapper script for func_source use: + func_ltwrapper_scriptname $cwrapper + $RM $func_ltwrapper_scriptname_result + trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 + $opt_dry_run || { + # note: this script will not be executed, so do not chmod. + if test "x$build" = "x$host"; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi + } + ;; + * ) + $RM $output + trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 + + func_emit_wrapper no > $output + chmod +x $output + ;; + esac + } + exit $EXIT_SUCCESS + ;; + esac + + # See if we need to build an old-fashioned archive. + for oldlib in $oldlibs; do + + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience + build_libtool_libs=no + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) + oldobjs="$old_deplibs $non_pic_objects" + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac + + if test -n "$addlibs"; then + gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $addlibs + func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then + cmds=$old_archive_from_new_cmds + else + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles + func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + func_basename "$obj" + $ECHO "$func_basename_result" + done | sort | sort -uc >/dev/null 2>&1); then + : + else + echo "copying selected object files to avoid basename conflicts..." + gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + func_basename "$obj" + objbase=$func_basename_result + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + func_arith $counter + 1 + counter=$func_arith_result + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" + ;; + *) func_append oldobjs " $obj" ;; + esac + done + fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + oldobjs= + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + for obj in $save_oldobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + func_append objlist " $obj" + if test "$len" -lt "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj"; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" + objlist= + len=$len0 + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test -z "$oldobjs"; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + func_execute_cmds "$cmds" 'exit $?' + done + + test -n "$generated" && \ + func_show_eval "${RM}r$generated" + + # Now create the libtool archive. + case $output in + *.la) + old_library= + test yes = "$build_old_libs" && old_library=$libname.$libext + func_verbose "creating $output" + + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + # Quote the link command for shipping. + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + if test yes = "$hardcode_automatic"; then + relink_command= + fi + + # Only create the output if not a dry run. + $opt_dry_run || { + for installed in no yes; do + if test yes = "$installed"; then + if test -z "$install_libdir"; then + break + fi + output=$output_objdir/${outputname}i + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do + case $deplib in + *.la) + func_basename "$deplib" + name=$func_basename_result + func_resolve_sysroot "$deplib" + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "'$deplib' is not a valid libtool archive" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs=$newdependency_libs + newdlfiles= + + for lib in $dlfiles; do + case $lib in + *.la) + func_basename "$lib" + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "'$lib' is not a valid libtool archive" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; + *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles=$newdlfiles + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + *.la) + # Only pass preopened files to the pseudo-archive (for + # eventual linking with the app. that links it) if we + # didn't already link the preopened objects directly into + # the library: + func_basename "$lib" + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "'$lib' is not a valid libtool archive" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done + dlprefiles=$newdlprefiles + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlfiles " $abs" + done + dlfiles=$newdlfiles + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlprefiles " $abs" + done + dlprefiles=$newdlprefiles + fi + $RM $output + # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test -n "$bindir"; then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result/$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; + esac + $ECHO > $output "\ +# $outputname - a libtool library file +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='$tdlname' + +# Names of this library. +library_names='$library_names' + +# The name of the static archive. +old_library='$old_library' + +# Linker flags that cannot go in dependency_libs. +inherited_linker_flags='$new_inherited_linker_flags' + +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' + +# Names of additional weak libraries provided by this library +weak_library_names='$weak_libs' + +# Version information for $libname. +current=$current +age=$age +revision=$revision + +# Is this an already installed library? +installed=$installed + +# Should we warn about portability when linking against -modules? +shouldnotlink=$module + +# Files to dlopen/dlpreopen +dlopen='$dlfiles' +dlpreopen='$dlprefiles' + +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + if test no,yes = "$installed,$need_relink"; then + $ECHO >> $output "\ +relink_command=\"$relink_command\"" + fi + done + } + + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' + ;; + esac + exit $EXIT_SUCCESS +} + +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi + + +# func_mode_uninstall arg... +func_mode_uninstall () +{ + $debug_cmd + + RM=$nonopt + files= + rmforce=false + exit_status=0 + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic=$magic + + for arg + do + case $arg in + -f) func_append RM " $arg"; rmforce=: ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; + esac + done + + test -z "$RM" && \ + func_fatal_help "you must specify an RM program" + + rmdirs= + + for file in $files; do + func_dirname "$file" "" "." + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir + else + odir=$dir/$objdir + fi + func_basename "$file" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir + + # Remember odir for removal later, being careful to avoid duplicates + if test clean = "$opt_mode"; then + case " $rmdirs " in + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; + esac + fi + + # Don't error if the file doesn't exist and rm -f was used. + if { test -L "$file"; } >/dev/null 2>&1 || + { test -h "$file"; } >/dev/null 2>&1 || + test -f "$file"; then + : + elif test -d "$file"; then + exit_status=1 + continue + elif $rmforce; then + continue + fi + + rmfiles=$file + + case $name in + *.la) + # Possibly a libtool archive, so verify it. + if func_lalib_p "$file"; then + func_source $dir/$name + + # Delete the libtool libraries and symlinks. + for n in $library_names; do + func_append rmfiles " $odir/$n" + done + test -n "$old_library" && func_append rmfiles " $odir/$old_library" + + case $opt_mode in + clean) + case " $library_names " in + *" $dlname "*) ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then + # Do each command in the postuninstall commands. + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' + fi + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' + fi + # FIXME: should reinstall the best remaining shared library. + ;; + esac + fi + ;; + + *.lo) + # Possibly a libtool object, so verify it. + if func_lalib_p "$file"; then + + # Read the .lo file + func_source $dir/$name + + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && test none != "$pic_object"; then + func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && test none != "$non_pic_object"; then + func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) + if test clean = "$opt_mode"; then + noexename=$name + case $file in + *.exe) + func_stripname '' '.exe' "$file" + file=$func_stripname_result + func_stripname '' '.exe' "$name" + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe + func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. + if func_ltwrapper_p "$file"; then + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result + func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename + fi + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then + func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" + fi + fi + fi + ;; + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done + + # Try to remove the $objdir's in the directories where we deleted files + for dir in $rmdirs; do + if test -d "$dir"; then + func_show_eval "rmdir $dir >/dev/null 2>&1" + fi + done + + exit $exit_status +} + +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi + +test -z "$opt_mode" && { + help=$generic_help + func_fatal_help "you must specify a MODE" +} + +test -z "$exec_cmd" && \ + func_fatal_help "invalid operation mode '$opt_mode'" + +if test -n "$exec_cmd"; then + eval exec "$exec_cmd" + exit $EXIT_FAILURE +fi + +exit $exit_status + + +# The TAGs below are defined such that we never get into a situation +# where we disable both kinds of libraries. Given conflicting +# choices, we go for a static library, that is the most portable, +# since we can't tell whether shared libraries were disabled because +# the user asked for that or because the platform doesn't support +# them. This is particularly important on AIX, because we don't +# support having both static and shared libraries enabled at the same +# time on that platform, so we default to a shared-only configuration. +# If a disable-shared tag is given, we'll fallback to a static-only +# configuration. But we'll never go from static-only to shared-only. + +# ### BEGIN LIBTOOL TAG CONFIG: disable-shared +build_libtool_libs=no +build_old_libs=yes +# ### END LIBTOOL TAG CONFIG: disable-shared + +# ### BEGIN LIBTOOL TAG CONFIG: disable-static +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` +# ### END LIBTOOL TAG CONFIG: disable-static + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: diff --git a/xorg/xf86-video-dummy/v0.3.8/missing b/xorg/xf86-video-dummy/v0.3.8/missing new file mode 100755 index 00000000..cdea5149 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/missing @@ -0,0 +1,215 @@ +#! /bin/sh +# Common wrapper for a few potentially missing GNU programs. + +scriptversion=2012-06-26.16; # UTC + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try '$0 --help' for more information" + exit 1 +fi + +case $1 in + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + +Supported PROGRAM values: + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man + +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. + +Send bug reports to ." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + +esac + +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/xorg/xf86-video-dummy/v0.3.8/src/Makefile.am b/xorg/xf86-video-dummy/v0.3.8/src/Makefile.am new file mode 100644 index 00000000..da1dd9a9 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/src/Makefile.am @@ -0,0 +1,44 @@ +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +# this is obnoxious: +# -module lets us name the module exactly how we want +# -avoid-version prevents gratuitous .0.0.0 version numbers on the end +# _ladir passes a dummy rpath to libtool so the thing will actually link +# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. + +AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) + +dummy_drv_la_LTLIBRARIES = dummy_drv.la +dummy_drv_la_LDFLAGS = -module -avoid-version +dummy_drv_la_LIBADD = $(XORG_LIBS) +dummy_drv_ladir = @moduledir@/drivers + +dummy_drv_la_SOURCES = \ + compat-api.h \ + dummy_cursor.c \ + dummy_driver.c \ + dummy.h + +if DGA +dummy_drv_la_SOURCES += \ + dummy_dga.c +endif diff --git a/xorg/xf86-video-dummy/v0.3.8/src/Makefile.in b/xorg/xf86-video-dummy/v0.3.8/src/Makefile.in new file mode 100644 index 00000000..4562a081 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/src/Makefile.in @@ -0,0 +1,707 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# this is obnoxious: +# -module lets us name the module exactly how we want +# -avoid-version prevents gratuitous .0.0.0 version numbers on the end +# _ladir passes a dummy rpath to libtool so the thing will actually link +# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@DGA_TRUE@am__append_1 = \ +@DGA_TRUE@ dummy_dga.c + +subdir = src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(dummy_drv_ladir)" +LTLIBRARIES = $(dummy_drv_la_LTLIBRARIES) +am__DEPENDENCIES_1 = +dummy_drv_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__dummy_drv_la_SOURCES_DIST = compat-api.h dummy_cursor.c \ + dummy_driver.c dummy.h dummy_dga.c +@DGA_TRUE@am__objects_1 = dummy_dga.lo +am_dummy_drv_la_OBJECTS = dummy_cursor.lo dummy_driver.lo \ + $(am__objects_1) +dummy_drv_la_OBJECTS = $(am_dummy_drv_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +dummy_drv_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(dummy_drv_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(dummy_drv_la_SOURCES) +DIST_SOURCES = $(am__dummy_drv_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DGA = @DGA@ +DLLTOOL = @DLLTOOL@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +DRIVER_NAME = @DRIVER_NAME@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +VERSION = @VERSION@ +XORG_CFLAGS = @XORG_CFLAGS@ +XORG_LIBS = @XORG_LIBS@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) +dummy_drv_la_LTLIBRARIES = dummy_drv.la +dummy_drv_la_LDFLAGS = -module -avoid-version +dummy_drv_la_LIBADD = $(XORG_LIBS) +dummy_drv_ladir = @moduledir@/drivers +dummy_drv_la_SOURCES = compat-api.h dummy_cursor.c dummy_driver.c \ + dummy.h $(am__append_1) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-dummy_drv_laLTLIBRARIES: $(dummy_drv_la_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(dummy_drv_la_LTLIBRARIES)'; test -n "$(dummy_drv_ladir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(dummy_drv_ladir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dummy_drv_ladir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(dummy_drv_ladir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(dummy_drv_ladir)"; \ + } + +uninstall-dummy_drv_laLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(dummy_drv_la_LTLIBRARIES)'; test -n "$(dummy_drv_ladir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(dummy_drv_ladir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(dummy_drv_ladir)/$$f"; \ + done + +clean-dummy_drv_laLTLIBRARIES: + -test -z "$(dummy_drv_la_LTLIBRARIES)" || rm -f $(dummy_drv_la_LTLIBRARIES) + @list='$(dummy_drv_la_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +dummy_drv.la: $(dummy_drv_la_OBJECTS) $(dummy_drv_la_DEPENDENCIES) $(EXTRA_dummy_drv_la_DEPENDENCIES) + $(AM_V_CCLD)$(dummy_drv_la_LINK) -rpath $(dummy_drv_ladir) $(dummy_drv_la_OBJECTS) $(dummy_drv_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_cursor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_dga.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_driver.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(dummy_drv_ladir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-dummy_drv_laLTLIBRARIES clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dummy_drv_laLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dummy_drv_laLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-dummy_drv_laLTLIBRARIES clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dummy_drv_laLTLIBRARIES \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-dummy_drv_laLTLIBRARIES + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/xorg/xf86-video-dummy/v0.3.8/src/compat-api.h b/xorg/xf86-video-dummy/v0.3.8/src/compat-api.h new file mode 100644 index 00000000..b74a5826 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/src/compat-api.h @@ -0,0 +1,101 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Dave Airlie + */ + +/* this file provides API compat between server post 1.13 and pre it, + it should be reused inside as many drivers as possible */ +#ifndef COMPAT_API_H +#define COMPAT_API_H + +#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR +#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] +#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p +#endif + +#ifndef XF86_HAS_SCRN_CONV +#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] +#endif + +#ifndef XF86_SCRN_INTERFACE + +#define SCRN_ARG_TYPE int +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] + +#define SCREEN_ARG_TYPE int +#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] + +#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS scrnIndex, pScreen + +#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags +#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 + +#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags +#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 + +#define FREE_SCREEN_ARGS_DECL int arg, int flags +#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 + +#define VT_FUNC_ARGS_DECL int arg, int flags +#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags) + +#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) +#else +#define SCRN_ARG_TYPE ScrnInfoPtr +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) + +#define SCREEN_ARG_TYPE ScreenPtr +#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) + +#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS pScreen + +#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y +#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y + +#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode +#define SWITCH_MODE_ARGS(arg, m) arg, m + +#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg +#define FREE_SCREEN_ARGS(x) (x) + +#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg +#define VT_FUNC_ARGS(flags) pScrn + +#define XF86_ENABLEDISABLEFB_ARG(x) (x) + +#endif + +#endif diff --git a/xorg/xf86-video-dummy/v0.3.8/src/dummy.h b/xorg/xf86-video-dummy/v0.3.8/src/dummy.h new file mode 100644 index 00000000..c3fdd6ef --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/src/dummy.h @@ -0,0 +1,79 @@ + +/* All drivers should typically include these */ +#include "xf86.h" +#include "xf86_OSproc.h" + +#include "xf86Cursor.h" + +#ifdef XvExtension +#include "xf86xv.h" +#include +#endif +#include + +#include "compat-api.h" + +/* Supported chipsets */ +typedef enum { + DUMMY_CHIP +} DUMMYType; + +/* function prototypes */ + +extern Bool DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL); +extern void DUMMYAdjustFrame(ADJUST_FRAME_ARGS_DECL); + +/* in dummy_cursor.c */ +extern Bool DUMMYCursorInit(ScreenPtr pScrn); +extern void DUMMYShowCursor(ScrnInfoPtr pScrn); +extern void DUMMYHideCursor(ScrnInfoPtr pScrn); + +/* in dummy_dga.c */ +Bool DUMMYDGAInit(ScreenPtr pScreen); + +/* in dummy_video.c */ +extern void DUMMYInitVideo(ScreenPtr pScreen); + +/* globals */ +typedef struct _color +{ + int red; + int green; + int blue; +} dummy_colors; + +typedef struct dummyRec +{ + DGAModePtr DGAModes; + int numDGAModes; + Bool DGAactive; + int DGAViewportStatus; + /* options */ + OptionInfoPtr Options; + Bool swCursor; + /* proc pointer */ + CloseScreenProcPtr CloseScreen; + xf86CursorInfoPtr CursorInfo; + + Bool DummyHWCursorShown; + int cursorX, cursorY; + int cursorFG, cursorBG; + + Bool screenSaver; + Bool video; +#ifdef XvExtension + XF86VideoAdaptorPtr overlayAdaptor; +#endif + int overlay; + int overlay_offset; + int videoKey; + int interlace; + dummy_colors colors[256]; + pointer* FBBase; + Bool (*CreateWindow)() ; /* wrapped CreateWindow */ + Bool prop; +} DUMMYRec, *DUMMYPtr; + +/* The privates of the DUMMY driver */ +#define DUMMYPTR(p) ((DUMMYPtr)((p)->driverPrivate)) + diff --git a/xorg/xf86-video-dummy/v0.3.8/src/dummy_cursor.c b/xorg/xf86-video-dummy/v0.3.8/src/dummy_cursor.c new file mode 100644 index 00000000..07a89bf2 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/src/dummy_cursor.c @@ -0,0 +1,104 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +/* All drivers should typically include these */ +#include "xf86.h" +#include "xf86_OSproc.h" + +#include "xf86Cursor.h" +#include "cursorstr.h" +/* Driver specific headers */ +#include "dummy.h" + +static void +dummyShowCursor(ScrnInfoPtr pScrn) +{ + DUMMYPtr dPtr = DUMMYPTR(pScrn); + + /* turn cursor on */ + dPtr->DummyHWCursorShown = TRUE; +} + +static void +dummyHideCursor(ScrnInfoPtr pScrn) +{ + DUMMYPtr dPtr = DUMMYPTR(pScrn); + + /* + * turn cursor off + * + */ + dPtr->DummyHWCursorShown = FALSE; +} + +#define MAX_CURS 64 + +static void +dummySetCursorPosition(ScrnInfoPtr pScrn, int x, int y) +{ + DUMMYPtr dPtr = DUMMYPTR(pScrn); + +/* unsigned char *_dest = ((unsigned char *)dPtr->FBBase + */ +/* pScrn->videoRam * 1024 - 1024); */ + dPtr->cursorX = x; + dPtr->cursorY = y; +} + +static void +dummySetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) +{ + DUMMYPtr dPtr = DUMMYPTR(pScrn); + + dPtr->cursorFG = fg; + dPtr->cursorBG = bg; +} + +static void +dummyLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src) +{ +} + +static Bool +dummyUseHWCursor(ScreenPtr pScr, CursorPtr pCurs) +{ + DUMMYPtr dPtr = DUMMYPTR(xf86ScreenToScrn(pScr)); + return(!dPtr->swCursor); +} + +#if 0 +static unsigned char* +dummyRealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs) +{ + return NULL; +} +#endif + +Bool +DUMMYCursorInit(ScreenPtr pScreen) +{ + DUMMYPtr dPtr = DUMMYPTR(xf86ScreenToScrn(pScreen)); + + xf86CursorInfoPtr infoPtr; + infoPtr = xf86CreateCursorInfoRec(); + if(!infoPtr) return FALSE; + + dPtr->CursorInfo = infoPtr; + + infoPtr->MaxHeight = 64; + infoPtr->MaxWidth = 64; + infoPtr->Flags = HARDWARE_CURSOR_TRUECOLOR_AT_8BPP; + + infoPtr->SetCursorColors = dummySetCursorColors; + infoPtr->SetCursorPosition = dummySetCursorPosition; + infoPtr->LoadCursorImage = dummyLoadCursorImage; + infoPtr->HideCursor = dummyHideCursor; + infoPtr->ShowCursor = dummyShowCursor; + infoPtr->UseHWCursor = dummyUseHWCursor; +/* infoPtr->RealizeCursor = dummyRealizeCursor; */ + + return(xf86InitCursor(pScreen, infoPtr)); +} + + + diff --git a/xorg/xf86-video-dummy/v0.3.8/src/dummy_dga.c b/xorg/xf86-video-dummy/v0.3.8/src/dummy_dga.c new file mode 100644 index 00000000..d16d09f1 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/src/dummy_dga.c @@ -0,0 +1,175 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "xf86.h" +#include "xf86_OSproc.h" +#include "dgaproc.h" +#include "dummy.h" + +static Bool DUMMY_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, + int *, int *, int *); +static Bool DUMMY_SetMode(ScrnInfoPtr, DGAModePtr); +static int DUMMY_GetViewport(ScrnInfoPtr); +static void DUMMY_SetViewport(ScrnInfoPtr, int, int, int); + +static +DGAFunctionRec DUMMYDGAFuncs = { + DUMMY_OpenFramebuffer, + NULL, + DUMMY_SetMode, + DUMMY_SetViewport, + DUMMY_GetViewport, + NULL, + NULL, + NULL, +#if 0 + DUMMY_BlitTransRect +#else + NULL +#endif +}; + +Bool +DUMMYDGAInit(ScreenPtr pScreen) +{ + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + DUMMYPtr pDUMMY = DUMMYPTR(pScrn); + DGAModePtr modes = NULL, newmodes = NULL, currentMode; + DisplayModePtr pMode, firstMode; + int Bpp = pScrn->bitsPerPixel >> 3; + int num = 0, imlines, pixlines; + + imlines = (pScrn->videoRam * 1024) / + (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)); + + pixlines = imlines; + + pMode = firstMode = pScrn->modes; + + while(pMode) { + + newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec)); + + if(!newmodes) { + free(modes); + return FALSE; + } + modes = newmodes; + + currentMode = modes + num; + num++; + + currentMode->mode = pMode; + currentMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE; + if(pMode->Flags & V_DBLSCAN) + currentMode->flags |= DGA_DOUBLESCAN; + if(pMode->Flags & V_INTERLACE) + currentMode->flags |= DGA_INTERLACED; + currentMode->byteOrder = pScrn->imageByteOrder; + currentMode->depth = pScrn->depth; + currentMode->bitsPerPixel = pScrn->bitsPerPixel; + currentMode->red_mask = pScrn->mask.red; + currentMode->green_mask = pScrn->mask.green; + currentMode->blue_mask = pScrn->mask.blue; + currentMode->visualClass = (Bpp == 1) ? PseudoColor : TrueColor; + currentMode->viewportWidth = pMode->HDisplay; + currentMode->viewportHeight = pMode->VDisplay; + currentMode->xViewportStep = 1; + currentMode->yViewportStep = 1; + currentMode->viewportFlags = DGA_FLIP_RETRACE; + currentMode->offset = 0; + currentMode->address = (unsigned char *)pDUMMY->FBBase; + + currentMode->bytesPerScanline = + ((pScrn->displayWidth * Bpp) + 3) & ~3L; + currentMode->imageWidth = pScrn->displayWidth; + currentMode->imageHeight = imlines; + currentMode->pixmapWidth = currentMode->imageWidth; + currentMode->pixmapHeight = pixlines; + currentMode->maxViewportX = currentMode->imageWidth - + currentMode->viewportWidth; + currentMode->maxViewportY = currentMode->imageHeight - + currentMode->viewportHeight; + + pMode = pMode->next; + if(pMode == firstMode) + break; + } + + pDUMMY->numDGAModes = num; + pDUMMY->DGAModes = modes; + + return DGAInit(pScreen, &DUMMYDGAFuncs, modes, num); +} + +static DisplayModePtr DUMMYSavedDGAModes[MAXSCREENS]; + +static Bool +DUMMY_SetMode( + ScrnInfoPtr pScrn, + DGAModePtr pMode +){ + int index = pScrn->pScreen->myNum; + DUMMYPtr pDUMMY = DUMMYPTR(pScrn); + + if(!pMode) { /* restore the original mode */ + if(pDUMMY->DGAactive) { + pScrn->currentMode = DUMMYSavedDGAModes[index]; + DUMMYSwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)); + DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0)); + pDUMMY->DGAactive = FALSE; + } + } else { + if(!pDUMMY->DGAactive) { /* save the old parameters */ + DUMMYSavedDGAModes[index] = pScrn->currentMode; + pDUMMY->DGAactive = TRUE; + } + + DUMMYSwitchMode(SWITCH_MODE_ARGS(pScrn, pMode->mode)); + } + + return TRUE; +} + +static int +DUMMY_GetViewport( + ScrnInfoPtr pScrn +){ + DUMMYPtr pDUMMY = DUMMYPTR(pScrn); + + return pDUMMY->DGAViewportStatus; +} + +static void +DUMMY_SetViewport( + ScrnInfoPtr pScrn, + int x, int y, + int flags +){ + DUMMYPtr pDUMMY = DUMMYPTR(pScrn); + + DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, x, y)); + pDUMMY->DGAViewportStatus = 0; +} + + +static Bool +DUMMY_OpenFramebuffer( + ScrnInfoPtr pScrn, + char **name, + unsigned char **mem, + int *size, + int *offset, + int *flags +){ + DUMMYPtr pDUMMY = DUMMYPTR(pScrn); + + *name = NULL; /* no special device */ + *mem = (unsigned char*)pDUMMY->FBBase; + *size = pScrn->videoRam * 1024; + *offset = 0; + *flags = DGA_NEED_ROOT; + + return TRUE; +} diff --git a/xorg/xf86-video-dummy/v0.3.8/src/dummy_driver.c b/xorg/xf86-video-dummy/v0.3.8/src/dummy_driver.c new file mode 100644 index 00000000..26566028 --- /dev/null +++ b/xorg/xf86-video-dummy/v0.3.8/src/dummy_driver.c @@ -0,0 +1,761 @@ + +/* + * Copyright 2002, SuSE Linux AG, Author: Egbert Eich + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +/* All drivers should typically include these */ +#include "xf86.h" +#include "xf86_OSproc.h" + +/* All drivers initialising the SW cursor need this */ +#include "mipointer.h" + +/* All drivers using the mi colormap manipulation need this */ +#include "micmap.h" + +/* identifying atom needed by magnifiers */ +#include +#include "property.h" + +#include "xf86cmap.h" + +#include "xf86fbman.h" + +#include "fb.h" + +#include "picturestr.h" + +#ifdef XvExtension +#include "xf86xv.h" +#include +#endif + +/* + * Driver data structures. + */ +#include "dummy.h" + +/* These need to be checked */ +#include +#include +#include "scrnintstr.h" +#include "servermd.h" +#ifdef USE_DGA +#define _XF86DGA_SERVER_ +#include +#endif + +/* Mandatory functions */ +static const OptionInfoRec * DUMMYAvailableOptions(int chipid, int busid); +static void DUMMYIdentify(int flags); +static Bool DUMMYProbe(DriverPtr drv, int flags); +static Bool DUMMYPreInit(ScrnInfoPtr pScrn, int flags); +static Bool DUMMYScreenInit(SCREEN_INIT_ARGS_DECL); +static Bool DUMMYEnterVT(VT_FUNC_ARGS_DECL); +static void DUMMYLeaveVT(VT_FUNC_ARGS_DECL); +static Bool DUMMYCloseScreen(CLOSE_SCREEN_ARGS_DECL); +static Bool DUMMYCreateWindow(WindowPtr pWin); +static void DUMMYFreeScreen(FREE_SCREEN_ARGS_DECL); +static ModeStatus DUMMYValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, + Bool verbose, int flags); +static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode); + +/* Internally used functions */ +static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, + pointer ptr); + + +/* static void DUMMYDisplayPowerManagementSet(ScrnInfoPtr pScrn, */ +/* int PowerManagementMode, int flags); */ + +#define DUMMY_VERSION 4000 +#define DUMMY_NAME "DUMMY" +#define DUMMY_DRIVER_NAME "dummy" + +#define DUMMY_MAJOR_VERSION PACKAGE_VERSION_MAJOR +#define DUMMY_MINOR_VERSION PACKAGE_VERSION_MINOR +#define DUMMY_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL + +#define DUMMY_MAX_WIDTH 32767 +#define DUMMY_MAX_HEIGHT 32767 + +/* + * This is intentionally screen-independent. It indicates the binding + * choice made in the first PreInit. + */ +static int pix24bpp = 0; + + +/* + * This contains the functions needed by the server after loading the driver + * module. It must be supplied, and gets passed back by the SetupProc + * function in the dynamic case. In the static case, a reference to this + * is compiled in, and this requires that the name of this DriverRec be + * an upper-case version of the driver name. + */ + +_X_EXPORT DriverRec DUMMY = { + DUMMY_VERSION, + DUMMY_DRIVER_NAME, + DUMMYIdentify, + DUMMYProbe, + DUMMYAvailableOptions, + NULL, + 0, + dummyDriverFunc +}; + +static SymTabRec DUMMYChipsets[] = { + { DUMMY_CHIP, "dummy" }, + { -1, NULL } +}; + +typedef enum { + OPTION_SW_CURSOR +} DUMMYOpts; + +static const OptionInfoRec DUMMYOptions[] = { + { OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE }, + { -1, NULL, OPTV_NONE, {0}, FALSE } +}; + +#ifdef XFree86LOADER + +static MODULESETUPPROTO(dummySetup); + +static XF86ModuleVersionInfo dummyVersRec = +{ + "dummy", + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, + XORG_VERSION_CURRENT, + DUMMY_MAJOR_VERSION, DUMMY_MINOR_VERSION, DUMMY_PATCHLEVEL, + ABI_CLASS_VIDEODRV, + ABI_VIDEODRV_VERSION, + MOD_CLASS_VIDEODRV, + {0,0,0,0} +}; + +/* + * This is the module init data. + * Its name has to be the driver name followed by ModuleData + */ +_X_EXPORT XF86ModuleData dummyModuleData = { &dummyVersRec, dummySetup, NULL }; + +static pointer +dummySetup(pointer module, pointer opts, int *errmaj, int *errmin) +{ + static Bool setupDone = FALSE; + + if (!setupDone) { + setupDone = TRUE; + xf86AddDriver(&DUMMY, module, HaveDriverFuncs); + + /* + * Modules that this driver always requires can be loaded here + * by calling LoadSubModule(). + */ + + /* + * The return value must be non-NULL on success even though there + * is no TearDownProc. + */ + return (pointer)1; + } else { + if (errmaj) *errmaj = LDR_ONCEONLY; + return NULL; + } +} + +#endif /* XFree86LOADER */ + +static Bool +DUMMYGetRec(ScrnInfoPtr pScrn) +{ + /* + * Allocate a DUMMYRec, and hook it into pScrn->driverPrivate. + * pScrn->driverPrivate is initialised to NULL, so we can check if + * the allocation has already been done. + */ + if (pScrn->driverPrivate != NULL) + return TRUE; + + pScrn->driverPrivate = xnfcalloc(sizeof(DUMMYRec), 1); + + if (pScrn->driverPrivate == NULL) + return FALSE; + return TRUE; +} + +static void +DUMMYFreeRec(ScrnInfoPtr pScrn) +{ + if (pScrn->driverPrivate == NULL) + return; + free(pScrn->driverPrivate); + pScrn->driverPrivate = NULL; +} + +static const OptionInfoRec * +DUMMYAvailableOptions(int chipid, int busid) +{ + return DUMMYOptions; +} + +/* Mandatory */ +static void +DUMMYIdentify(int flags) +{ + xf86PrintChipsets(DUMMY_NAME, "Driver for Dummy chipsets", + DUMMYChipsets); +} + +/* Mandatory */ +static Bool +DUMMYProbe(DriverPtr drv, int flags) +{ + Bool foundScreen = FALSE; + int numDevSections, numUsed; + GDevPtr *devSections; + int i; + + if (flags & PROBE_DETECT) + return FALSE; + /* + * Find the config file Device sections that match this + * driver, and return if there are none. + */ + if ((numDevSections = xf86MatchDevice(DUMMY_DRIVER_NAME, + &devSections)) <= 0) { + return FALSE; + } + + numUsed = numDevSections; + + if (numUsed > 0) { + + for (i = 0; i < numUsed; i++) { + ScrnInfoPtr pScrn = NULL; + int entityIndex = + xf86ClaimNoSlot(drv,DUMMY_CHIP,devSections[i],TRUE); + /* Allocate a ScrnInfoRec and claim the slot */ + if ((pScrn = xf86AllocateScreen(drv,0 ))) { + xf86AddEntityToScreen(pScrn,entityIndex); + pScrn->driverVersion = DUMMY_VERSION; + pScrn->driverName = DUMMY_DRIVER_NAME; + pScrn->name = DUMMY_NAME; + pScrn->Probe = DUMMYProbe; + pScrn->PreInit = DUMMYPreInit; + pScrn->ScreenInit = DUMMYScreenInit; + pScrn->SwitchMode = DUMMYSwitchMode; + pScrn->AdjustFrame = DUMMYAdjustFrame; + pScrn->EnterVT = DUMMYEnterVT; + pScrn->LeaveVT = DUMMYLeaveVT; + pScrn->FreeScreen = DUMMYFreeScreen; + pScrn->ValidMode = DUMMYValidMode; + + foundScreen = TRUE; + } + } + } + return foundScreen; +} + +# define RETURN \ + { DUMMYFreeRec(pScrn);\ + return FALSE;\ + } + +/* Mandatory */ +Bool +DUMMYPreInit(ScrnInfoPtr pScrn, int flags) +{ + ClockRangePtr clockRanges; + int i; + DUMMYPtr dPtr; + int maxClock = 300000; + GDevPtr device = xf86GetEntityInfo(pScrn->entityList[0])->device; + + if (flags & PROBE_DETECT) + return TRUE; + + /* Allocate the DummyRec driverPrivate */ + if (!DUMMYGetRec(pScrn)) { + return FALSE; + } + + dPtr = DUMMYPTR(pScrn); + + pScrn->chipset = (char *)xf86TokenToString(DUMMYChipsets, + DUMMY_CHIP); + + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Chipset is a DUMMY\n"); + + pScrn->monitor = pScrn->confScreen->monitor; + + if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb)) + return FALSE; + else { + /* Check that the returned depth is one we support */ + switch (pScrn->depth) { + case 8: + case 15: + case 16: + case 24: + break; + default: + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Given depth (%d) is not supported by this driver\n", + pScrn->depth); + return FALSE; + } + } + + xf86PrintDepthBpp(pScrn); + if (pScrn->depth == 8) + pScrn->rgbBits = 8; + + /* Get the depth24 pixmap format */ + if (pScrn->depth == 24 && pix24bpp == 0) + pix24bpp = xf86GetBppFromDepth(pScrn, 24); + + /* + * This must happen after pScrn->display has been set because + * xf86SetWeight references it. + */ + if (pScrn->depth > 8) { + /* The defaults are OK for us */ + rgb zeros = {0, 0, 0}; + + if (!xf86SetWeight(pScrn, zeros, zeros)) { + return FALSE; + } else { + /* XXX check that weight returned is supported */ + ; + } + } + + if (!xf86SetDefaultVisual(pScrn, -1)) + return FALSE; + + if (pScrn->depth > 1) { + Gamma zeros = {0.0, 0.0, 0.0}; + + if (!xf86SetGamma(pScrn, zeros)) + return FALSE; + } + + xf86CollectOptions(pScrn, device->options); + /* Process the options */ + if (!(dPtr->Options = malloc(sizeof(DUMMYOptions)))) + return FALSE; + memcpy(dPtr->Options, DUMMYOptions, sizeof(DUMMYOptions)); + + xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, dPtr->Options); + + xf86GetOptValBool(dPtr->Options, OPTION_SW_CURSOR,&dPtr->swCursor); + + if (device->videoRam != 0) { + pScrn->videoRam = device->videoRam; + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "VideoRAM: %d kByte\n", + pScrn->videoRam); + } else { + pScrn->videoRam = 4096; + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "VideoRAM: %d kByte\n", + pScrn->videoRam); + } + + if (device->dacSpeeds[0] != 0) { + maxClock = device->dacSpeeds[0]; + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Max Clock: %d kHz\n", + maxClock); + } else { + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Max Clock: %d kHz\n", + maxClock); + } + + pScrn->progClock = TRUE; + /* + * Setup the ClockRanges, which describe what clock ranges are available, + * and what sort of modes they can be used for. + */ + clockRanges = (ClockRangePtr)xnfcalloc(sizeof(ClockRange), 1); + clockRanges->next = NULL; + clockRanges->ClockMulFactor = 1; + clockRanges->minClock = 11000; /* guessed §§§ */ + clockRanges->maxClock = maxClock; + clockRanges->clockIndex = -1; /* programmable */ + clockRanges->interlaceAllowed = TRUE; + clockRanges->doubleScanAllowed = TRUE; + + /* Subtract memory for HW cursor */ + + + { + int apertureSize = (pScrn->videoRam * 1024); + i = xf86ValidateModes(pScrn, pScrn->monitor->Modes, + pScrn->display->modes, clockRanges, + NULL, 256, DUMMY_MAX_WIDTH, + (8 * pScrn->bitsPerPixel), + 128, DUMMY_MAX_HEIGHT, pScrn->display->virtualX, + pScrn->display->virtualY, apertureSize, + LOOKUP_BEST_REFRESH); + + if (i == -1) + RETURN; + } + + /* Prune the modes marked as invalid */ + xf86PruneDriverModes(pScrn); + + if (i == 0 || pScrn->modes == NULL) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes found\n"); + RETURN; + } + + /* + * Set the CRTC parameters for all of the modes based on the type + * of mode, and the chipset's interlace requirements. + * + * Calling this is required if the mode->Crtc* values are used by the + * driver and if the driver doesn't provide code to set them. They + * are not pre-initialised at all. + */ + xf86SetCrtcForModes(pScrn, 0); + + /* Set the current mode to the first in the list */ + pScrn->currentMode = pScrn->modes; + + /* Print the list of modes being used */ + xf86PrintModes(pScrn); + + /* If monitor resolution is set on the command line, use it */ + xf86SetDpi(pScrn, 0, 0); + + if (xf86LoadSubModule(pScrn, "fb") == NULL) { + RETURN; + } + + if (!dPtr->swCursor) { + if (!xf86LoadSubModule(pScrn, "ramdac")) + RETURN; + } + + /* We have no contiguous physical fb in physical memory */ + pScrn->memPhysBase = 0; + pScrn->fbOffset = 0; + + return TRUE; +} +#undef RETURN + +/* Mandatory */ +static Bool +DUMMYEnterVT(VT_FUNC_ARGS_DECL) +{ + return TRUE; +} + +/* Mandatory */ +static void +DUMMYLeaveVT(VT_FUNC_ARGS_DECL) +{ +} + +static void +DUMMYLoadPalette( + ScrnInfoPtr pScrn, + int numColors, + int *indices, + LOCO *colors, + VisualPtr pVisual +){ + int i, index, shift, Gshift; + DUMMYPtr dPtr = DUMMYPTR(pScrn); + + switch(pScrn->depth) { + case 15: + shift = Gshift = 1; + break; + case 16: + shift = 0; + Gshift = 0; + break; + default: + shift = Gshift = 0; + break; + } + + for(i = 0; i < numColors; i++) { + index = indices[i]; + dPtr->colors[index].red = colors[index].red << shift; + dPtr->colors[index].green = colors[index].green << Gshift; + dPtr->colors[index].blue = colors[index].blue << shift; + } + +} + +static ScrnInfoPtr DUMMYScrn; /* static-globalize it */ + +/* Mandatory */ +static Bool +DUMMYScreenInit(SCREEN_INIT_ARGS_DECL) +{ + ScrnInfoPtr pScrn; + DUMMYPtr dPtr; + int ret; + VisualPtr visual; + + /* + * we need to get the ScrnInfoRec for this screen, so let's allocate + * one first thing + */ + pScrn = xf86ScreenToScrn(pScreen); + dPtr = DUMMYPTR(pScrn); + DUMMYScrn = pScrn; + + + if (!(dPtr->FBBase = malloc(pScrn->videoRam * 1024))) + return FALSE; + + /* + * Reset visual list. + */ + miClearVisualTypes(); + + /* Setup the visuals we support. */ + + if (!miSetVisualTypes(pScrn->depth, + miGetDefaultVisualMask(pScrn->depth), + pScrn->rgbBits, pScrn->defaultVisual)) + return FALSE; + + if (!miSetPixmapDepths ()) return FALSE; + + /* + * Call the framebuffer layer's ScreenInit function, and fill in other + * pScreen fields. + */ + ret = fbScreenInit(pScreen, dPtr->FBBase, + pScrn->virtualX, pScrn->virtualY, + pScrn->xDpi, pScrn->yDpi, + pScrn->displayWidth, pScrn->bitsPerPixel); + if (!ret) + return FALSE; + + if (pScrn->depth > 8) { + /* Fixup RGB ordering */ + visual = pScreen->visuals + pScreen->numVisuals; + while (--visual >= pScreen->visuals) { + if ((visual->class | DynamicClass) == DirectColor) { + visual->offsetRed = pScrn->offset.red; + visual->offsetGreen = pScrn->offset.green; + visual->offsetBlue = pScrn->offset.blue; + visual->redMask = pScrn->mask.red; + visual->greenMask = pScrn->mask.green; + visual->blueMask = pScrn->mask.blue; + } + } + } + + /* must be after RGB ordering fixed */ + fbPictureInit(pScreen, 0, 0); + + xf86SetBlackWhitePixels(pScreen); + +#ifdef USE_DGA + DUMMYDGAInit(pScreen); +#endif + + if (dPtr->swCursor) + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Using Software Cursor.\n"); + + { + + + BoxRec AvailFBArea; + int lines = pScrn->videoRam * 1024 / + (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)); + AvailFBArea.x1 = 0; + AvailFBArea.y1 = 0; + AvailFBArea.x2 = pScrn->displayWidth; + AvailFBArea.y2 = lines; + xf86InitFBManager(pScreen, &AvailFBArea); + + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Using %i scanlines of offscreen memory \n" + , lines - pScrn->virtualY); + } + + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + + /* Initialise cursor functions */ + miDCInitialize (pScreen, xf86GetPointerScreenFuncs()); + + + if (!dPtr->swCursor) { + /* HW cursor functions */ + if (!DUMMYCursorInit(pScreen)) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Hardware cursor initialization failed\n"); + return FALSE; + } + } + + /* Initialise default colourmap */ + if(!miCreateDefColormap(pScreen)) + return FALSE; + + if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, + DUMMYLoadPalette, NULL, + CMAP_PALETTED_TRUECOLOR + | CMAP_RELOAD_ON_MODE_SWITCH)) + return FALSE; + +/* DUMMYInitVideo(pScreen); */ + + pScreen->SaveScreen = DUMMYSaveScreen; + + + /* Wrap the current CloseScreen function */ + dPtr->CloseScreen = pScreen->CloseScreen; + pScreen->CloseScreen = DUMMYCloseScreen; + + /* Wrap the current CreateWindow function */ + dPtr->CreateWindow = pScreen->CreateWindow; + pScreen->CreateWindow = DUMMYCreateWindow; + + /* Report any unused options (only for the first generation) */ + if (serverGeneration == 1) { + xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); + } + + return TRUE; +} + +/* Mandatory */ +Bool +DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL) +{ + return TRUE; +} + +/* Mandatory */ +void +DUMMYAdjustFrame(ADJUST_FRAME_ARGS_DECL) +{ +} + +/* Mandatory */ +static Bool +DUMMYCloseScreen(CLOSE_SCREEN_ARGS_DECL) +{ + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + DUMMYPtr dPtr = DUMMYPTR(pScrn); + + if(pScrn->vtSema){ + free(dPtr->FBBase); + } + + if (dPtr->CursorInfo) + xf86DestroyCursorInfoRec(dPtr->CursorInfo); + + pScrn->vtSema = FALSE; + pScreen->CloseScreen = dPtr->CloseScreen; + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); +} + +/* Optional */ +static void +DUMMYFreeScreen(FREE_SCREEN_ARGS_DECL) +{ + SCRN_INFO_PTR(arg); + DUMMYFreeRec(pScrn); +} + +static Bool +DUMMYSaveScreen(ScreenPtr pScreen, int mode) +{ + ScrnInfoPtr pScrn = NULL; + DUMMYPtr dPtr; + + if (pScreen != NULL) { + pScrn = xf86ScreenToScrn(pScreen); + dPtr = DUMMYPTR(pScrn); + + dPtr->screenSaver = xf86IsUnblank(mode); + } + return TRUE; +} + +/* Optional */ +static ModeStatus +DUMMYValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) +{ + return(MODE_OK); +} + +Atom VFB_PROP = 0; +#define VFB_PROP_NAME "VFB_IDENT" + +static Bool +DUMMYCreateWindow(WindowPtr pWin) +{ + ScreenPtr pScreen = pWin->drawable.pScreen; + DUMMYPtr dPtr = DUMMYPTR(DUMMYScrn); + WindowPtr pWinRoot; + int ret; + + pScreen->CreateWindow = dPtr->CreateWindow; + ret = pScreen->CreateWindow(pWin); + dPtr->CreateWindow = pScreen->CreateWindow; + pScreen->CreateWindow = DUMMYCreateWindow; + + if(ret != TRUE) + return(ret); + + if(dPtr->prop == FALSE) { +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8 + pWinRoot = WindowTable[DUMMYScrn->pScreen->myNum]; +#else + pWinRoot = DUMMYScrn->pScreen->root; +#endif + if (! ValidAtom(VFB_PROP)) + VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1); + + ret = dixChangeWindowProperty(serverClient, pWinRoot, VFB_PROP, + XA_STRING, 8, PropModeReplace, + (int)4, (pointer)"TRUE", FALSE); + if( ret != Success) + ErrorF("Could not set VFB root window property"); + dPtr->prop = TRUE; + + return TRUE; + } + return TRUE; +} + +#ifndef HW_SKIP_CONSOLE +#define HW_SKIP_CONSOLE 4 +#endif + +static Bool +dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr) +{ + CARD32 *flag; + + switch (op) { + case GET_REQUIRED_HW_INTERFACES: + flag = (CARD32*)ptr; + (*flag) = HW_SKIP_CONSOLE; + return TRUE; + default: + return FALSE; + } +} From 670b8ec5a7706149c82d4aec07caf64686ab0c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 26 Jan 2024 18:54:40 +0100 Subject: [PATCH 870/876] upgrade go deps. --- go.mod | 44 ++--- go.sum | 538 +++++---------------------------------------------------- 2 files changed, 61 insertions(+), 521 deletions(-) diff --git a/go.mod b/go.mod index d82c858e..eb971ff6 100644 --- a/go.mod +++ b/go.mod @@ -8,15 +8,15 @@ require ( github.com/go-chi/cors v1.2.1 github.com/gorilla/websocket v1.5.1 github.com/kataras/go-events v0.0.3 - github.com/pion/ice/v2 v2.3.11 + github.com/pion/ice/v2 v2.3.12 github.com/pion/interceptor v0.1.25 github.com/pion/logging v0.2.2 - github.com/pion/rtcp v1.2.10 - github.com/pion/webrtc/v3 v3.2.21 - github.com/prometheus/client_golang v1.17.0 + github.com/pion/rtcp v1.2.13 + github.com/pion/webrtc/v3 v3.2.24 + github.com/prometheus/client_golang v1.18.0 github.com/rs/zerolog v1.31.0 github.com/spf13/cobra v1.8.0 - github.com/spf13/viper v1.17.0 + github.com/spf13/viper v1.18.2 ) require ( @@ -24,51 +24,45 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.4.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/pelletier/go-toml/v2 v2.1.1 // indirect github.com/pion/datachannel v1.5.5 // indirect - github.com/pion/dtls/v2 v2.2.7 // indirect + github.com/pion/dtls/v2 v2.2.9 // indirect github.com/pion/mdns v0.0.9 // indirect github.com/pion/randutil v0.1.0 // indirect - github.com/pion/rtp v1.8.2 // indirect + github.com/pion/rtp v1.8.3 // indirect github.com/pion/sctp v1.8.9 // indirect github.com/pion/sdp/v3 v3.0.6 // indirect - github.com/pion/srtp/v2 v2.0.17 // indirect + github.com/pion/srtp/v2 v2.0.18 // indirect github.com/pion/stun v0.6.1 // indirect github.com/pion/transport/v2 v2.2.4 // indirect github.com/pion/turn/v2 v2.1.4 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.45.0 // indirect + github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/sagikazarmark/locafero v0.3.0 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/sourcegraph/conc v0.3.0 // indirect - github.com/spf13/afero v1.10.0 // indirect - github.com/spf13/cast v1.5.1 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.6.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/objx v0.5.0 // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/subosito/gotenv v1.6.0 // indirect - go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.14.0 // indirect - golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/crypto v0.18.0 // indirect + golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index f36bf30c..84008d03 100644 --- a/go.sum +++ b/go.sum @@ -1,177 +1,56 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/PaesslerAG/gval v1.2.2 h1:Y7iBzhgE09IGTt5QgGQ2IdaYYYOU134YGHBThD+wm9E= github.com/PaesslerAG/gval v1.2.2/go.mod h1:XRFLwvmkTEdYziLdaCeCa5ImcGVrfQbeNUbVR+C6xac= github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= -github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= github.com/go-chi/chi v1.5.5 h1:vOB/HbEMt9QqBqErz07QehcOKHaWFtuj87tTDVz2qXE= github.com/go-chi/chi v1.5.5/go.mod h1:C9JqLr3tIYjDOZpzn+BCuxY8z8vmca43EeMgyZt7irw= github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4= github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4= github.com/kataras/go-events v0.0.3/go.mod h1:bFBgtzwwzrag7kQmGuU1ZaVxhK2qseYPQomXoVEMsj4= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -181,19 +60,12 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= -github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= @@ -205,109 +77,76 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= -github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= +github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= -github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8= github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= -github.com/pion/ice/v2 v2.3.9 h1:7yZpHf3PhPxJGT4JkMj1Y8Rl5cQ6fB709iz99aeMd/U= -github.com/pion/ice/v2 v2.3.9/go.mod h1:lT3kv5uUIlHfXHU/ZRD7uKD/ufM202+eTa3C/umgGf4= -github.com/pion/ice/v2 v2.3.11 h1:rZjVmUwyT55cmN8ySMpL7rsS8KYsJERsrxJLLxpKhdw= +github.com/pion/dtls/v2 v2.2.9 h1:K+D/aVf9/REahQvqk6G5JavdrD8W1PWDKC11UlwN7ts= +github.com/pion/dtls/v2 v2.2.9/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= github.com/pion/ice/v2 v2.3.11/go.mod h1:hPcLC3kxMa+JGRzMHqQzjoSj3xtE9F+eoncmXLlCL4E= -github.com/pion/interceptor v0.1.17 h1:prJtgwFh/gB8zMqGZoOgJPHivOwVAp61i2aG61Du/1w= -github.com/pion/interceptor v0.1.17/go.mod h1:SY8kpmfVBvrbUzvj2bsXz7OJt5JvmVNZ+4Kjq7FcwrI= -github.com/pion/interceptor v0.1.18/go.mod h1:tpvvF4cPM6NGxFA1DUMbhabzQBxdWMATDGEUYOR9x6I= +github.com/pion/ice/v2 v2.3.12 h1:NWKW2b3+oSZS3klbQMIEWQ0i52Kuo0KBg505a5kQv4s= +github.com/pion/ice/v2 v2.3.12/go.mod h1:hPcLC3kxMa+JGRzMHqQzjoSj3xtE9F+eoncmXLlCL4E= github.com/pion/interceptor v0.1.25 h1:pwY9r7P6ToQ3+IF0bajN0xmk/fNw/suTgaTdlwTDmhc= github.com/pion/interceptor v0.1.25/go.mod h1:wkbPYAak5zKsfpVDYMtEfWEy8D4zL+rpxCxPImLOg3Y= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= -github.com/pion/mdns v0.0.7 h1:P0UB4Sr6xDWEox0kTVxF0LmQihtCbSAdW0H2nEgkA3U= -github.com/pion/mdns v0.0.7/go.mod h1:4iP2UbeFhLI/vWju/bw6ZfwjJzk0z8DNValjGxR/dD8= github.com/pion/mdns v0.0.8/go.mod h1:hYE72WX8WDveIhg7fmXgMKivD3Puklk0Ymzog0lSyaI= github.com/pion/mdns v0.0.9 h1:7Ue5KZsqq8EuqStnpPWV33vYYEH0+skdDN5L7EiEsI4= github.com/pion/mdns v0.0.9/go.mod h1:2JA5exfxwzXiCihmxpTKgFUpiQws2MnipoPK09vecIc= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc= github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I= -github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= -github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.8.1/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= -github.com/pion/rtp v1.8.2 h1:oKMM0K1/QYQ5b5qH+ikqDSZRipP5mIxPJcgcvw5sH0w= +github.com/pion/rtcp v1.2.12/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4= +github.com/pion/rtcp v1.2.13 h1:+EQijuisKwm/8VBs8nWllr0bIndR7Lf7cZG200mpbNo= +github.com/pion/rtcp v1.2.13/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4= github.com/pion/rtp v1.8.2/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= +github.com/pion/rtp v1.8.3 h1:VEHxqzSVQxCkKDSHro5/4IUUG1ea+MFdqR2R3xSpNU8= +github.com/pion/rtp v1.8.3/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= -github.com/pion/sctp v1.8.7 h1:JnABvFakZueGAn4KU/4PSKg+GWbF6QWbKTWZOSGJjXw= -github.com/pion/sctp v1.8.7/go.mod h1:g1Ul+ARqZq5JEmoFy87Q/4CePtKnTJ1QCL9dBBdN6AU= github.com/pion/sctp v1.8.8/go.mod h1:igF9nZBrjh5AtmKc7U30jXltsFHicFCXSmWA2GWRaWs= github.com/pion/sctp v1.8.9 h1:TP5ZVxV5J7rz7uZmbyvnUvsn7EJ2x/5q9uhsTtXbI3g= github.com/pion/sctp v1.8.9/go.mod h1:cMLT45jqw3+jiJCrtHVwfQLnfR0MGZ4rgOJwUOIqLkI= github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw= github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= -github.com/pion/srtp/v2 v2.0.15 h1:+tqRtXGsGwHC0G0IUIAzRmdkHvriF79IHVfZGfHrQoA= -github.com/pion/srtp/v2 v2.0.15/go.mod h1:b/pQOlDrbB0HEH5EUAQXzSYxikFbNcNuKmF8tM0hCtw= -github.com/pion/srtp/v2 v2.0.17 h1:ECuOk+7uIpY6HUlTb0nXhfvu4REG2hjtC4ronYFCZE4= -github.com/pion/srtp/v2 v2.0.17/go.mod h1:y5WSHcJY4YfNB/5r7ca5YjHeIr1H3LM1rKArGGs8jMc= +github.com/pion/srtp/v2 v2.0.18 h1:vKpAXfawO9RtTRKZJbG4y0v1b11NZxQnxRl85kGuUlo= +github.com/pion/srtp/v2 v2.0.18/go.mod h1:0KJQjA99A6/a0DOVTu1PhDSw0CXF2jTkqOoMg3ODqdA= github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4= github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8= github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40= github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI= -github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc= -github.com/pion/transport/v2 v2.1.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ= -github.com/pion/transport/v2 v2.2.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ= -github.com/pion/transport/v2 v2.2.1 h1:7qYnCBlpgSJNYMbLCKuSY9KbQdBFoETvPNETv0y4N7c= github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g= github.com/pion/transport/v2 v2.2.2/go.mod h1:OJg3ojoBJopjEeECq2yJdXH9YVrUJ1uQ++NjXLOUorc= github.com/pion/transport/v2 v2.2.3/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= github.com/pion/transport/v2 v2.2.4 h1:41JJK6DZQYSeVLxILA2+F4ZkKb4Xd/tFJZRFZQ9QAlo= github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= +github.com/pion/transport/v3 v3.0.1 h1:gDTlPJwROfSfz6QfSi0ZmeCSkFcnWWiiR9ES0ouANiM= github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0= -github.com/pion/turn/v2 v2.1.2 h1:wj0cAoGKltaZ790XEGW9HwoUewqjliwmhtxCuB2ApyM= -github.com/pion/turn/v2 v2.1.2/go.mod h1:1kjnPkBcex3dhCU2Am+AAmxDcGhLX3WnMfmkNpvSTQU= github.com/pion/turn/v2 v2.1.3/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY= github.com/pion/turn/v2 v2.1.4 h1:2xn8rduI5W6sCZQkEnIUDAkrBQNl2eYIBCHMZ3QMmP8= github.com/pion/turn/v2 v2.1.4/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY= -github.com/pion/webrtc/v3 v3.2.12 h1:pVqz5NdtTqyhKIhMcXR8bPp709kCf9blyAhDjoVRLvA= -github.com/pion/webrtc/v3 v3.2.12/go.mod h1:/Oz6K95CGWaN+3No+Z0NYvgOPOr3aY8UyTlMm/dec3A= -github.com/pion/webrtc/v3 v3.2.21 h1:c8fy5JcqJkAQBwwy3Sk9huQLTBUSqaggyRlv9Lnh2zY= -github.com/pion/webrtc/v3 v3.2.21/go.mod h1:vVURQTBOG5BpWKOJz3nlr23NfTDeyKVmubRNqzQp+Tg= +github.com/pion/webrtc/v3 v3.2.24 h1:MiFL5DMo2bDaaIFWr0DDpwiV/L4EGbLZb+xoRvfEo1Y= +github.com/pion/webrtc/v3 v3.2.24/go.mod h1:1CaT2fcZzZ6VZA+O1i9yK2DU4EOcXVvSbWG9pr5jefs= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= -github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= -github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= -github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= -github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= -github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= -github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= -github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= -github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= -github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk= -github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= +github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= -github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ= -github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= @@ -315,228 +154,88 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= -github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= -github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= -github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= -github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= -github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= -github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= -github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI= -github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI= +github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= +github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= -github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= -go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= -golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -545,197 +244,54 @@ golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -747,13 +303,3 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= From 45ca1b7b6c6aa4cefec0f8d2ead77f9247992f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 26 Jan 2024 19:33:52 +0100 Subject: [PATCH 871/876] fix docker nvidia. --- Dockerfile.nvidia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index 46072763..8edc4b2d 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -193,7 +193,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ wget ca-certificates supervisor \ pulseaudio dbus-x11 xserver-xorg-video-dummy \ - libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 libx264-155 libvo-aacenc0 librtmp1 libxcvt0 \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 libx264-155 libvo-aacenc0 librtmp1 \ libgtk-3-bin software-properties-common cabextract aptitude vim curl \ # # needed for profile upload preStop hook From 9353773bfb1d1949cd09231312dcf90371319700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 26 Jan 2024 19:34:09 +0100 Subject: [PATCH 872/876] fix vscode settings. --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 8645d8f0..c405326e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,7 +8,7 @@ "[go]": { "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.organizeImports": true + "source.organizeImports": "explicit" } } } From ce3830f6a0583944477fff36bc2c2c41213e1434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 14 Feb 2024 21:45:04 +0100 Subject: [PATCH 873/876] fix: base64 password hash in file members provider to avoid json issues. --- internal/member/file/provider.go | 4 ++- internal/member/file/provider_test.go | 48 +++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 internal/member/file/provider_test.go diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index ed5c1e71..a7a95c6c 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -2,6 +2,7 @@ package file import ( "crypto/sha256" + "encoding/base64" "encoding/json" "io" "os" @@ -27,7 +28,8 @@ func (provider *MemberProviderCtx) hash(password string) string { sha256 := sha256.New() sha256.Write([]byte(password)) - return string(sha256.Sum(nil)) + hashedPassword := sha256.Sum(nil) + return base64.StdEncoding.EncodeToString(hashedPassword) } func (provider *MemberProviderCtx) Connect() error { diff --git a/internal/member/file/provider_test.go b/internal/member/file/provider_test.go new file mode 100644 index 00000000..7e25439b --- /dev/null +++ b/internal/member/file/provider_test.go @@ -0,0 +1,48 @@ +package file + +import ( + "encoding/json" + "testing" + + "github.com/demodesk/neko/pkg/utils" +) + +// Ensure that hashes are the same after encoding and decoding using json +func TestMemberProviderCtx_hash(t *testing.T) { + provider := &MemberProviderCtx{ + config: Config{ + Hash: true, + }, + } + + // generate random strings + passwords := []string{} + for i := 0; i < 10; i++ { + password, err := utils.NewUID(32) + if err != nil { + t.Errorf("utils.NewUID() returned error: %s", err) + } + passwords = append(passwords, password) + } + + for _, password := range passwords { + hashedPassword := provider.hash(password) + + // json encode password hash + hashedPasswordJSON, err := json.Marshal(hashedPassword) + if err != nil { + t.Errorf("json.Marshal() returned error: %s", err) + } + + // json decode password hash json + var hashedPasswordStr string + err = json.Unmarshal(hashedPasswordJSON, &hashedPasswordStr) + if err != nil { + t.Errorf("json.Unmarshal() returned error: %s", err) + } + + if hashedPasswordStr != hashedPassword { + t.Errorf("hashedPasswordStr: %s != hashedPassword: %s", hashedPasswordStr, hashedPassword) + } + } +} From 5a16143cfeddd1fcce153cac7980cfa6df390790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 20 Feb 2024 18:15:22 +0100 Subject: [PATCH 874/876] fix mode info memory leak. --- pkg/xorg/xorg.c | 56 +++++++++++++++++++------------------------------ pkg/xorg/xorg.h | 2 +- 2 files changed, 23 insertions(+), 35 deletions(-) diff --git a/pkg/xorg/xorg.c b/pkg/xorg/xorg.c index d94b7118..e2c04dcc 100644 --- a/pkg/xorg/xorg.c +++ b/pkg/xorg/xorg.c @@ -306,40 +306,28 @@ void XCreateScreenMode(int width, int height, short rate) { Display *display = getXDisplay(); Window root = DefaultRootWindow(display); - char name[128]; - XRRModeInfo mode; - mode = XCreateScreenModeInfo(width, height, rate); - - snprintf(name, sizeof name, "%dx%d_%d", width, height, rate); - mode.nameLength = strlen(name); - mode.name = name; + // create new mode info + XRRModeInfo *mode_info = XCreateScreenModeInfo(width, height, rate); // create new mode - XRRCreateMode(display, root, &mode); + RRMode mode = XRRCreateMode(display, root, mode_info); XSync(display, 0); - // find newly created mode in resources - RRMode mode_id; - XRRScreenResources *resources = XRRGetScreenResources(display, root); - for (int i = 0; i < resources->nmode; ++i) { - if (strcmp(resources->modes[i].name, mode.name) == 0) { - mode_id = resources->modes[i].id; - break; - } - } - // add new mode to all outputs + XRRScreenResources *resources = XRRGetScreenResources(display, root); for (int i = 0; i < resources->noutput; ++i) { - XRRAddOutputMode(display, resources->outputs[i], mode_id); + XRRAddOutputMode(display, resources->outputs[i], mode); } XRRFreeScreenResources(resources); + XRRFreeModeInfo(mode_info); } // Inspired by https://fossies.org/linux/xwayland/hw/xwayland/xwayland-cvt.c -XRRModeInfo XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh) { - XRRModeInfo modeinfo; - memset(&modeinfo, 0, sizeof modeinfo); +XRRModeInfo *XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh) { + char name[128]; + snprintf(name, sizeof name, "%dx%d_%d", hdisplay, vdisplay, vrefresh); + XRRModeInfo *modeinfo = XRRAllocModeInfo(name, strlen(name)); #ifdef _LIBCVT_H_ struct libxcvt_mode_info *mode_info; @@ -347,22 +335,22 @@ XRRModeInfo XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh) { // get screen mode from libxcvt, if available mode_info = libxcvt_gen_mode_info(hdisplay, vdisplay, vrefresh, false, false); - modeinfo.width = mode_info->hdisplay; - modeinfo.height = mode_info->vdisplay; - modeinfo.dotClock = mode_info->dot_clock * 1000; - modeinfo.hSyncStart = mode_info->hsync_start; - modeinfo.hSyncEnd = mode_info->hsync_end; - modeinfo.hTotal = mode_info->htotal; - modeinfo.vSyncStart = mode_info->vsync_start; - modeinfo.vSyncEnd = mode_info->vsync_end; - modeinfo.vTotal = mode_info->vtotal; - modeinfo.modeFlags = mode_info->mode_flags; + modeinfo->width = mode_info->hdisplay; + modeinfo->height = mode_info->vdisplay; + modeinfo->dotClock = mode_info->dot_clock * 1000; + modeinfo->hSyncStart = mode_info->hsync_start; + modeinfo->hSyncEnd = mode_info->hsync_end; + modeinfo->hTotal = mode_info->htotal; + modeinfo->vSyncStart = mode_info->vsync_start; + modeinfo->vSyncEnd = mode_info->vsync_end; + modeinfo->vTotal = mode_info->vtotal; + modeinfo->modeFlags = mode_info->mode_flags; free(mode_info); #else // fallback to a simple mode without refresh rate - modeinfo.width = hdisplay; - modeinfo.height = vdisplay; + modeinfo->width = hdisplay; + modeinfo->height = vdisplay; #endif return modeinfo; diff --git a/pkg/xorg/xorg.h b/pkg/xorg/xorg.h index 23bca9a9..781bcef8 100644 --- a/pkg/xorg/xorg.h +++ b/pkg/xorg/xorg.h @@ -40,7 +40,7 @@ Status XSetScreenConfiguration(int width, int height, short rate); void XGetScreenConfiguration(int *width, int *height, short *rate); void XGetScreenConfigurations(); void XCreateScreenMode(int width, int height, short rate); -XRRModeInfo XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh); +XRRModeInfo *XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh); void XSetKeyboardModifier(unsigned char mod, int on); unsigned char XGetKeyboardModifiers(); From 8981051945b2d7ecd1216493cabd7cc609ab222f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 20 Feb 2024 18:16:02 +0100 Subject: [PATCH 875/876] remove webrtc.iceservers from flags. --- internal/config/webrtc.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 40fad4bd..f3023007 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -65,10 +65,11 @@ func (WebRTC) Init(cmd *cobra.Command) error { return err } - cmd.PersistentFlags().String("webrtc.iceservers", "[]", "Global STUN and TURN servers in JSON format with `urls`, `username` and `credential` keys") - if err := viper.BindPFlag("webrtc.iceservers", cmd.PersistentFlags().Lookup("webrtc.iceservers")); err != nil { - return err - } + // Looks like this is conflicting with the frontend and backend ICE servers since latest versions + //cmd.PersistentFlags().String("webrtc.iceservers", "[]", "Global STUN and TURN servers in JSON format with `urls`, `username` and `credential` keys") + //if err := viper.BindPFlag("webrtc.iceservers", cmd.PersistentFlags().Lookup("webrtc.iceservers")); err != nil { + // return err + //} cmd.PersistentFlags().String("webrtc.iceservers.frontend", "[]", "Frontend only STUN and TURN servers in JSON format with `urls`, `username` and `credential` keys") if err := viper.BindPFlag("webrtc.iceservers.frontend", cmd.PersistentFlags().Lookup("webrtc.iceservers.frontend")); err != nil { From 00c7e6dfb2a0faae0ad076e801f09eec5379309e Mon Sep 17 00:00:00 2001 From: tt2468 Date: Wed, 27 Mar 2024 13:38:33 -0700 Subject: [PATCH 876/876] Move X11 error handler registration to before screen sets (#62) If X11 throws an error during screen config get/set, the default error handler at the time will be one which causes a program exit. This splits the error handler registration in xevent into its own call, allowing us to register our error handler earlier on. This results in the safe error handling logic actually being called instead of a full program exit. --- internal/desktop/manager.go | 3 +++ pkg/xevent/xevent.c | 5 ++++- pkg/xevent/xevent.go | 4 ++++ pkg/xevent/xevent.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index dad4dd2d..da998df2 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -50,6 +50,9 @@ func (manager *DesktopManagerCtx) Start() { manager.logger.Panic().Str("display", manager.config.Display).Msg("unable to open display") } + // X11 can throw errors below, and the default error handler exits + xevent.SetupErrorHandler() + xorg.GetScreenConfigurations() screenSize, err := xorg.ChangeScreenSize(manager.config.ScreenSize) diff --git a/pkg/xevent/xevent.c b/pkg/xevent/xevent.c index 991f6987..1d75422c 100644 --- a/pkg/xevent/xevent.c +++ b/pkg/xevent/xevent.c @@ -14,6 +14,10 @@ static int XEventError(Display *display, XErrorEvent *event) { return 1; } +void XSetupErrorHandler() { + XSetErrorHandler(XEventError); +} + void XEventLoop(char *name) { Display *display = XOpenDisplay(name); Window root = DefaultRootWindow(display); @@ -33,7 +37,6 @@ void XEventLoop(char *name) { XSelectInput(display, root, SubstructureNotifyMask); XSync(display, 0); - XSetErrorHandler(XEventError); while (goXEventActive()) { XEvent event; diff --git a/pkg/xevent/xevent.go b/pkg/xevent/xevent.go index 53b820e9..b2fd9d4f 100644 --- a/pkg/xevent/xevent.go +++ b/pkg/xevent/xevent.go @@ -23,6 +23,10 @@ func init() { Emmiter = events.New() } +func SetupErrorHandler() { + C.XSetupErrorHandler() +} + func EventLoop(display string) { displayUnsafe := C.CString(display) defer C.free(unsafe.Pointer(displayUnsafe)) diff --git a/pkg/xevent/xevent.h b/pkg/xevent/xevent.h index 801e0e6e..c3924dae 100644 --- a/pkg/xevent/xevent.h +++ b/pkg/xevent/xevent.h @@ -17,6 +17,7 @@ extern void goXEventError(XErrorEvent *event, char *message); extern int goXEventActive(); static int XEventError(Display *display, XErrorEvent *event); +void XSetupErrorHandler(); void XEventLoop(char *display); static void XWindowManagerStateEvent(Display *display, Window window, ulong action, ulong first, ulong second);